Menu
▾
▴
mp-plugins-svn — SVN Update mailing list
You can subscribe to this list here.
| 2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
| 2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
| 2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
| 2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
| 2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
| 2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
| 2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
|
From: <nor...@us...> - 2007-08-20 08:53:12
|
Revision: 848
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=848&view=rev
Author: northern_sky
Date: 2007-08-20 01:53:11 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
fixed some validate stuff
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -145,6 +145,7 @@
{
fileListView.EndUpdate();
}
+ SetupFileView();
SyncListViewButtons();
SyncFilePath();
}
@@ -661,7 +662,7 @@
private void AppFilesView_Load(object sender, EventArgs e)
{
- toolTip.SetToolTip(fileDirTextBox, "Directorys to display in MediaPortal,seperate with ; \r\n(mandatory)");
+ toolTip.SetToolTip(fileDirTextBox, "Directorys where to look for files ,seperate with ; \r\n(mandatory)");
toolTip.SetToolTip(fileExtensionsTextBox, "Only files with matching extensions will be displayed. \r\nSeparate several extension" +
"s by a ; (.zip;.txt)\r\n(mandatory)");
toolTip.SetToolTip(imageDirsTextBox, "Optional directory where MediaPortal searches for matching images. \r\n MediaPort" +
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -81,7 +81,7 @@
}
- public override bool EntriesOK(ApplicationItem curApp)
+ public override bool ValidateEntries(ApplicationItem curApp)
{
conditionChecker.Clear();
conditionChecker.DoCheck(titleTextBox.Text != "", "No title entered!");
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -80,13 +80,15 @@
}
- public override bool EntriesOK(ApplicationItem curApp)
+ public override bool ValidateEntries(ApplicationItem curApp)
{
conditionChecker.Clear();
- conditionChecker.DoCheck(this.titleTextBox.Text != "", "No title entered!");
+
+ conditionChecker.DoCheck(titleTextBox.Text != "", "No title entered!");
+
if (this.applicationExeTextBox.Text == "")
{
- conditionChecker.DoCheck(this.shellexecuteCheckBox.Checked, "No launching filename entered!");
+ conditionChecker.DoCheck(shellexecuteCheckBox.Checked, "No launching filename entered!");
}
if (!conditionChecker.IsOk)
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -59,7 +59,28 @@
curApp.RefreshGUIAllowed = true;
}
+ public override bool ValidateEntries(ApplicationItem curApp)
+ {
+ conditionChecker.Clear();
+ conditionChecker.DoCheck(titleTextBox.Text != "", "No title entered!");
+
+ if (this.applicationExeTextBox.Text == "")
+ {
+ conditionChecker.DoCheck(shellexecuteCheckBox.Checked, "No launching filename entered!");
+ }
+
+ if (!conditionChecker.IsOk)
+ {
+ string strHeader = "The following entries are invalid: \r\n\r\n";
+ string strFooter = "\r\n\r\n(Click DELETE to remove this item)";
+ MessageBox.Show(strHeader + conditionChecker.Problems + strFooter, "Invalid Entries");
+ }
+ else
+ { }
+ return conditionChecker.IsOk;
+ }
+
void catverLink_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
{
LaunchLink(catverLink.Text);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -63,9 +63,9 @@
//Log.Debug("{0}: SaveSettings()", this.ToString());
}
- public virtual bool EntriesOK(ApplicationItem curApp)
+ public virtual bool ValidateEntries(ApplicationItem curApp)
{
- //Log.Debug("{0}: EntriesOK()", this.ToString());
+ //Log.Debug("{0}: ValidateEntries()", this.ToString());
return true;
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.Designer.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.Designer.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -28,441 +28,443 @@
/// </summary>
private void InitializeComponent()
{
- System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode( "Applications" );
- this.menuStrip = new System.Windows.Forms.MenuStrip();
- this.addDeleteApplicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.addApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.applicationWithFiledirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.addGroupnodeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.extendedApplicationItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.mameImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.importGamebaseItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.deleteApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolsStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.premadeConfigurationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.emulatorSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.treeView = new System.Windows.Forms.TreeView();
- this.tabControl = new System.Windows.Forms.TabControl();
- this.detailsTabPage = new System.Windows.Forms.TabPage();
- this.directoryTabPage = new System.Windows.Forms.TabPage();
- this.viewTabPage = new System.Windows.Forms.TabPage();
- this.dbOptionsTabPage = new System.Windows.Forms.TabPage();
- this.generalFileItemOptionsGroupBox = new System.Windows.Forms.GroupBox();
- this.removePlatformComboBox = new System.Windows.Forms.ComboBox();
- this.removePlatformLabel = new System.Windows.Forms.Label();
- this.removePlatformButton = new System.Windows.Forms.Button();
- this.addPlatformLabel = new System.Windows.Forms.Label();
- this.addPlatformTextBox = new System.Windows.Forms.TextBox();
- this.addPlatformButton = new System.Windows.Forms.Button();
- this.removeManufacturerComboBox = new System.Windows.Forms.ComboBox();
- this.removeManufacturerLabel = new System.Windows.Forms.Label();
- this.removeManufacturerButton = new System.Windows.Forms.Button();
- this.addManufacturerLabel = new System.Windows.Forms.Label();
- this.addManufacturerTextBox = new System.Windows.Forms.TextBox();
- this.addManufacturerButton = new System.Windows.Forms.Button();
- this.removeGenreComboBox = new System.Windows.Forms.ComboBox();
- this.removeGenreLabel = new System.Windows.Forms.Label();
- this.removeGenreButton = new System.Windows.Forms.Button();
- this.addGenreLabel = new System.Windows.Forms.Label();
- this.addGenreTextBox = new System.Windows.Forms.TextBox();
- this.addGenreButton = new System.Windows.Forms.Button();
- this.menuStrip.SuspendLayout();
- this.tabControl.SuspendLayout();
- this.dbOptionsTabPage.SuspendLayout();
- this.generalFileItemOptionsGroupBox.SuspendLayout();
- this.SuspendLayout();
- //
- // menuStrip
- //
- this.menuStrip.Items.AddRange( new System.Windows.Forms.ToolStripItem[] {
+ System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("Applications");
+ this.menuStrip = new System.Windows.Forms.MenuStrip();
+ this.addDeleteApplicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.addApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.applicationWithFiledirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.addGroupnodeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.extendedApplicationItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mameImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.importGamebaseItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.deleteApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolsStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.premadeConfigurationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.emulatorSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.treeView = new System.Windows.Forms.TreeView();
+ this.tabControl = new System.Windows.Forms.TabControl();
+ this.detailsTabPage = new System.Windows.Forms.TabPage();
+ this.directoryTabPage = new System.Windows.Forms.TabPage();
+ this.viewTabPage = new System.Windows.Forms.TabPage();
+ this.dbOptionsTabPage = new System.Windows.Forms.TabPage();
+ this.generalFileItemOptionsGroupBox = new System.Windows.Forms.GroupBox();
+ this.removePlatformComboBox = new System.Windows.Forms.ComboBox();
+ this.removePlatformLabel = new System.Windows.Forms.Label();
+ this.removePlatformButton = new System.Windows.Forms.Button();
+ this.addPlatformLabel = new System.Windows.Forms.Label();
+ this.addPlatformTextBox = new System.Windows.Forms.TextBox();
+ this.addPlatformButton = new System.Windows.Forms.Button();
+ this.removeManufacturerComboBox = new System.Windows.Forms.ComboBox();
+ this.removeManufacturerLabel = new System.Windows.Forms.Label();
+ this.removeManufacturerButton = new System.Windows.Forms.Button();
+ this.addManufacturerLabel = new System.Windows.Forms.Label();
+ this.addManufacturerTextBox = new System.Windows.Forms.TextBox();
+ this.addManufacturerButton = new System.Windows.Forms.Button();
+ this.removeGenreComboBox = new System.Windows.Forms.ComboBox();
+ this.removeGenreLabel = new System.Windows.Forms.Label();
+ this.removeGenreButton = new System.Windows.Forms.Button();
+ this.addGenreLabel = new System.Windows.Forms.Label();
+ this.addGenreTextBox = new System.Windows.Forms.TextBox();
+ this.addGenreButton = new System.Windows.Forms.Button();
+ this.menuStrip.SuspendLayout();
+ this.tabControl.SuspendLayout();
+ this.dbOptionsTabPage.SuspendLayout();
+ this.generalFileItemOptionsGroupBox.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // menuStrip
+ //
+ this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.addDeleteApplicationsToolStripMenuItem,
- this.toolsStripMenuItem} );
- this.menuStrip.Location = new System.Drawing.Point( 0, 0 );
- this.menuStrip.Name = "menuStrip";
- this.menuStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
- this.menuStrip.Size = new System.Drawing.Size( 747, 24 );
- this.menuStrip.TabIndex = 0;
- this.menuStrip.Text = "menuStrip";
- //
- // addDeleteApplicationsToolStripMenuItem
- //
- this.addDeleteApplicationsToolStripMenuItem.DropDownItems.AddRange( new System.Windows.Forms.ToolStripItem[] {
+ this.toolsStripMenuItem});
+ this.menuStrip.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip.Name = "menuStrip";
+ this.menuStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+ this.menuStrip.Size = new System.Drawing.Size(747, 24);
+ this.menuStrip.TabIndex = 0;
+ this.menuStrip.Text = "menuStrip";
+ //
+ // addDeleteApplicationsToolStripMenuItem
+ //
+ this.addDeleteApplicationsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.addApplicationToolStripMenuItem,
- this.deleteApplicationToolStripMenuItem} );
- this.addDeleteApplicationsToolStripMenuItem.Name = "addDeleteApplicationsToolStripMenuItem";
- this.addDeleteApplicationsToolStripMenuItem.Size = new System.Drawing.Size( 132, 20 );
- this.addDeleteApplicationsToolStripMenuItem.Text = "Add/Delete applications";
- //
- // addApplicationToolStripMenuItem
- //
- this.addApplicationToolStripMenuItem.DropDownItems.AddRange( new System.Windows.Forms.ToolStripItem[] {
+ this.deleteApplicationToolStripMenuItem});
+ this.addDeleteApplicationsToolStripMenuItem.Name = "addDeleteApplicationsToolStripMenuItem";
+ this.addDeleteApplicationsToolStripMenuItem.Size = new System.Drawing.Size(146, 20);
+ this.addDeleteApplicationsToolStripMenuItem.Text = "Add/Delete applications";
+ //
+ // addApplicationToolStripMenuItem
+ //
+ this.addApplicationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.applicationWithFiledirectoryToolStripMenuItem,
this.addGroupnodeToolStripMenuItem,
- this.extendedApplicationItemToolStripMenuItem} );
- this.addApplicationToolStripMenuItem.Name = "addApplicationToolStripMenuItem";
- this.addApplicationToolStripMenuItem.Size = new System.Drawing.Size( 170, 22 );
- this.addApplicationToolStripMenuItem.Text = "Add application";
- //
- // applicationWithFiledirectoryToolStripMenuItem
- //
- this.applicationWithFiledirectoryToolStripMenuItem.Name = "applicationWithFiledirectoryToolStripMenuItem";
- this.applicationWithFiledirectoryToolStripMenuItem.Size = new System.Drawing.Size( 207, 22 );
- this.applicationWithFiledirectoryToolStripMenuItem.Text = "Applicationitem";
- this.applicationWithFiledirectoryToolStripMenuItem.Click += new System.EventHandler( this.applicationWithFiledirectoryToolStripMenuItem_Click );
- //
- // addGroupnodeToolStripMenuItem
- //
- this.addGroupnodeToolStripMenuItem.Name = "addGroupnodeToolStripMenuItem";
- this.addGroupnodeToolStripMenuItem.Size = new System.Drawing.Size( 207, 22 );
- this.addGroupnodeToolStripMenuItem.Text = "Groupingtem";
- this.addGroupnodeToolStripMenuItem.Click += new System.EventHandler( this.addGroupnodeToolStripMenuItem_Click );
- //
- // extendedApplicationItemToolStripMenuItem
- //
- this.extendedApplicationItemToolStripMenuItem.DropDownItems.AddRange( new System.Windows.Forms.ToolStripItem[] {
+ this.extendedApplicationItemToolStripMenuItem});
+ this.addApplicationToolStripMenuItem.Name = "addApplicationToolStripMenuItem";
+ this.addApplicationToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
+ this.addApplicationToolStripMenuItem.Text = "Add application";
+ //
+ // applicationWithFiledirectoryToolStripMenuItem
+ //
+ this.applicationWithFiledirectoryToolStripMenuItem.Name = "applicationWithFiledirectoryToolStripMenuItem";
+ this.applicationWithFiledirectoryToolStripMenuItem.Size = new System.Drawing.Size(208, 22);
+ this.applicationWithFiledirectoryToolStripMenuItem.Text = "Applicationitem";
+ this.applicationWithFiledirectoryToolStripMenuItem.Click += new System.EventHandler(this.applicationWithFiledirectoryToolStripMenuItem_Click);
+ //
+ // addGroupnodeToolStripMenuItem
+ //
+ this.addGroupnodeToolStripMenuItem.Name = "addGroupnodeToolStripMenuItem";
+ this.addGroupnodeToolStripMenuItem.Size = new System.Drawing.Size(208, 22);
+ this.addGroupnodeToolStripMenuItem.Text = "Groupingtem";
+ this.addGroupnodeToolStripMenuItem.Click += new System.EventHandler(this.addGroupnodeToolStripMenuItem_Click);
+ //
+ // extendedApplicationItemToolStripMenuItem
+ //
+ this.extendedApplicationItemToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mameImportToolStripMenuItem,
- this.importGamebaseItemToolStripMenuItem} );
- this.extendedApplicationItemToolStripMenuItem.Name = "extendedApplicationItemToolStripMenuItem";
- this.extendedApplicationItemToolStripMenuItem.Size = new System.Drawing.Size( 207, 22 );
- this.extendedApplicationItemToolStripMenuItem.Text = "Extended applicationItem";
- //
- // mameImportToolStripMenuItem
- //
- this.mameImportToolStripMenuItem.Name = "mameImportToolStripMenuItem";
- this.mameImportToolStripMenuItem.Size = new System.Drawing.Size( 170, 22 );
- this.mameImportToolStripMenuItem.Text = "Import Mame";
- this.mameImportToolStripMenuItem.Click += new System.EventHandler( this.mameImportToolStripMenuItem_Click );
- //
- // importGamebaseItemToolStripMenuItem
- //
- this.importGamebaseItemToolStripMenuItem.Name = "importGamebaseItemToolStripMenuItem";
- this.importGamebaseItemToolStripMenuItem.Size = new System.Drawing.Size( 170, 22 );
- this.importGamebaseItemToolStripMenuItem.Text = "Import Gamebase";
- this.importGamebaseItemToolStripMenuItem.Click += new System.EventHandler( this.importGamebaseItemToolStripMenuItem_Click );
- //
- // deleteApplicationToolStripMenuItem
- //
- this.deleteApplicationToolStripMenuItem.Image = global::GUIPrograms.Properties.Resources.deleteButton_Image;
- this.deleteApplicationToolStripMenuItem.Name = "deleteApplicationToolStripMenuItem";
- this.deleteApplicationToolStripMenuItem.Size = new System.Drawing.Size( 170, 22 );
- this.deleteApplicationToolStripMenuItem.Text = "Delete application";
- this.deleteApplicationToolStripMenuItem.Click += new System.EventHandler( this.deleteApplicationToolStripMenuItem_Click );
- //
- // toolsStripMenuItem
- //
- this.toolsStripMenuItem.DropDownItems.AddRange( new System.Windows.Forms.ToolStripItem[] {
- this.premadeConfigurationsToolStripMenuItem} );
- this.toolsStripMenuItem.Name = "toolsStripMenuItem";
- this.toolsStripMenuItem.Size = new System.Drawing.Size( 44, 20 );
- this.toolsStripMenuItem.Text = "Tools";
- //
- // premadeConfigurationsToolStripMenuItem
- //
- this.premadeConfigurationsToolStripMenuItem.DropDownItems.AddRange( new System.Windows.Forms.ToolStripItem[] {
- this.emulatorSetupToolStripMenuItem} );
- this.premadeConfigurationsToolStripMenuItem.Name = "premadeConfigurationsToolStripMenuItem";
- this.premadeConfigurationsToolStripMenuItem.Size = new System.Drawing.Size( 155, 22 );
- this.premadeConfigurationsToolStripMenuItem.Text = "Configurations";
- //
- // emulatorSetupToolStripMenuItem
- //
- this.emulatorSetupToolStripMenuItem.Name = "emulatorSetupToolStripMenuItem";
- this.emulatorSetupToolStripMenuItem.Size = new System.Drawing.Size( 158, 22 );
- this.emulatorSetupToolStripMenuItem.Text = "Emulator Setup";
- //
- // treeView
- //
- this.treeView.AllowDrop = true;
- this.treeView.HideSelection = false;
- this.treeView.HotTracking = true;
- this.treeView.LabelEdit = true;
- this.treeView.Location = new System.Drawing.Point( 0, 27 );
- this.treeView.Name = "treeView";
- treeNode1.Name = "applicationNode";
- treeNode1.Text = "Applications";
- this.treeView.Nodes.AddRange( new System.Windows.Forms.TreeNode[] {
- treeNode1} );
- this.treeView.Size = new System.Drawing.Size( 224, 576 );
- this.treeView.TabIndex = 8;
- this.treeView.DragDrop += new System.Windows.Forms.DragEventHandler( this.treeView_DragDrop );
- this.treeView.DragOver += new System.Windows.Forms.DragEventHandler( this.treeView_DragOver );
- this.treeView.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler( this.treeView_AfterLabelEdit );
- this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler( this.treeView_AfterSelect );
- this.treeView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler( this.treeView_NodeMouseClick );
- this.treeView.DragEnter += new System.Windows.Forms.DragEventHandler( this.treeView_DragEnter );
- this.treeView.BeforeLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler( this.treeView_BeforeLabelEdit );
- this.treeView.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler( this.treeView_BeforeSelect );
- this.treeView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler( this.treeView_ItemDrag );
- //
- // tabControl
- //
- this.tabControl.Controls.Add( this.detailsTabPage );
- this.tabControl.Controls.Add( this.directoryTabPage );
- this.tabControl.Controls.Add( this.viewTabPage );
- this.tabControl.Controls.Add( this.dbOptionsTabPage );
- this.tabControl.Location = new System.Drawing.Point( 230, 27 );
- this.tabControl.Name = "tabControl";
- this.tabControl.SelectedIndex = 0;
- this.tabControl.ShowToolTips = true;
- this.tabControl.Size = new System.Drawing.Size( 505, 577 );
- this.tabControl.TabIndex = 2;
- this.tabControl.Click += new System.EventHandler( this.dbOptionsTabPage_Click );
- this.tabControl.SelectedIndexChanged += new System.EventHandler( this.tabControl_SelectedIndexChanged );
- //
- // detailsTabPage
- //
- this.detailsTabPage.BackColor = System.Drawing.SystemColors.Control;
- this.detailsTabPage.Location = new System.Drawing.Point( 4, 22 );
- this.detailsTabPage.Name = "detailsTabPage";
- this.detailsTabPage.Padding = new System.Windows.Forms.Padding( 3 );
- this.detailsTabPage.Size = new System.Drawing.Size( 497, 551 );
- this.detailsTabPage.TabIndex = 0;
- this.detailsTabPage.Text = "Details";
- //
- // directoryTabPage
- //
- this.directoryTabPage.BackColor = System.Drawing.SystemColors.Control;
- this.directoryTabPage.Location = new System.Drawing.Point( 4, 22 );
- this.directoryTabPage.Name = "directoryTabPage";
- this.directoryTabPage.Padding = new System.Windows.Forms.Padding( 3 );
- this.directoryTabPage.Size = new System.Drawing.Size( 497, 551 );
- this.directoryTabPage.TabIndex = 1;
- this.directoryTabPage.Text = "Files";
- //
- // viewTabPage
- //
- this.viewTabPage.BackColor = System.Drawing.SystemColors.Control;
- this.viewTabPage.Location = new System.Drawing.Point( 4, 22 );
- this.viewTabPage.Name = "viewTabPage";
- this.viewTabPage.Padding = new System.Windows.Forms.Padding( 3 );
- this.viewTabPage.Size = new System.Drawing.Size( 497, 551 );
- this.viewTabPage.TabIndex = 2;
- this.viewTabPage.Text = "Views";
- //
- // dbOptionsTabPage
- //
- this.dbOptionsTabPage.Controls.Add( this.generalFileItemOptionsGroupBox );
- this.dbOptionsTabPage.Location = new System.Drawing.Point( 4, 22 );
- this.dbOptionsTabPage.Name = "dbOptionsTabPage";
- this.dbOptionsTabPage.Padding = new System.Windows.Forms.Padding( 3 );
- this.dbOptionsTabPage.Size = new System.Drawing.Size( 497, 551 );
- this.dbOptionsTabPage.TabIndex = 3;
- this.dbOptionsTabPage.Text = "DB options";
- this.dbOptionsTabPage.UseVisualStyleBackColor = true;
- this.dbOptionsTabPage.Click += new System.EventHandler( this.dbOptionsTabPage_Click );
- //
- // generalFileItemOptionsGroupBox
- //
- this.generalFileItemOptionsGroupBox.Controls.Add( this.removePlatformComboBox );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.removePlatformLabel );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.removePlatformButton );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.addPlatformLabel );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.addPlatformTextBox );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.addPlatformButton );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.removeManufacturerComboBox );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.removeManufacturerLabel );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.removeManufacturerButton );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.addManufacturerLabel );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.addManufacturerTextBox );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.addManufacturerButton );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.removeGenreComboBox );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.removeGenreLabel );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.removeGenreButton );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.addGenreLabel );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.addGenreTextBox );
- this.generalFileItemOptionsGroupBox.Controls.Add( this.addGenreButton );
- this.generalFileItemOptionsGroupBox.Location = new System.Drawing.Point( 3, 6 );
- this.generalFileItemOptionsGroupBox.Name = "generalFileItemOptionsGroupBox";
- this.generalFileItemOptionsGroupBox.Size = new System.Drawing.Size( 488, 496 );
- this.generalFileItemOptionsGroupBox.TabIndex = 79;
- this.generalFileItemOptionsGroupBox.TabStop = false;
- //
- // removePlatformComboBox
- //
- this.removePlatformComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.removePlatformComboBox.FormattingEnabled = true;
- this.removePlatformComboBox.Location = new System.Drawing.Point( 99, 249 );
- this.removePlatformComboBox.Name = "removePlatformComboBox";
- this.removePlatformComboBox.Size = new System.Drawing.Size( 306, 21 );
- this.removePlatformComboBox.TabIndex = 92;
- //
- // removePlatformLabel
- //
- this.removePlatformLabel.AutoSize = true;
- this.removePlatformLabel.Location = new System.Drawing.Point( 6, 252 );
- this.removePlatformLabel.Name = "removePlatformLabel";
- this.removePlatformLabel.Size = new System.Drawing.Size( 87, 13 );
- this.removePlatformLabel.TabIndex = 91;
- this.removePlatformLabel.Text = "Remove platform";
- //
- // removePlatformButton
- //
- this.removePlatformButton.Location = new System.Drawing.Point( 411, 249 );
- this.removePlatformButton.Name = "removePlatformButton";
- this.removePlatformButton.Size = new System.Drawing.Size( 62, 23 );
- this.removePlatformButton.TabIndex = 90;
- this.removePlatformButton.Text = "Remove..";
- this.removePlatformButton.UseVisualStyleBackColor = true;
- this.removePlatformButton.Click += new System.EventHandler( this.removePlatformButton_Click );
- //
- // addPlatformLabel
- //
- this.addPlatformLabel.AutoSize = true;
- this.addPlatformLabel.Location = new System.Drawing.Point( 6, 216 );
- this.addPlatformLabel.Name = "addPlatformLabel";
- this.addPlatformLabel.Size = new System.Drawing.Size( 72, 13 );
- this.addPlatformLabel.TabIndex = 87;
- this.addPlatformLabel.Text = "Add platform..";
- //
- // addPlatformTextBox
- //
- this.addPlatformTextBox.Location = new System.Drawing.Point( 99, 213 );
- this.addPlatformTextBox.Name = "addPlatformTextBox";
- this.addPlatformTextBox.Size = new System.Drawing.Size( 306, 20 );
- this.addPlatformTextBox.TabIndex = 88;
- //
- // addPlatformButton
- //
- this.addPlatformButton.Location = new System.Drawing.Point( 411, 213 );
- this.addPlatformButton.Name = "addPlatformButton";
- this.addPlatformButton.Size = new System.Drawing.Size( 62, 23 );
- this.addPlatformButton.TabIndex = 89;
- this.addPlatformButton.Text = "Add..";
- this.addPlatformButton.UseVisualStyleBackColor = true;
- this.addPlatformButton.Click += new System.EventHandler( this.addPlatformButton_Click );
- //
- // removeManufacturerComboBox
- //
- this.removeManufacturerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.removeManufacturerComboBox.FormattingEnabled = true;
- this.removeManufacturerComboBox.Location = new System.Drawing.Point( 99, 165 );
- this.removeManufacturerComboBox.Name = "removeManufacturerComboBox";
- this.removeManufacturerComboBox.Size = new System.Drawing.Size( 306, 21 );
- this.removeManufacturerComboBox.TabIndex = 86;
- //
- // removeManufacturerLabel
- //
- this.removeManufacturerLabel.Location = new System.Drawing.Point( 6, 157 );
- this.removeManufacturerLabel.Name = "removeManufacturerLabel";
- this.removeManufacturerLabel.Size = new System.Drawing.Size( 82, 29 );
- this.removeManufacturerLabel.TabIndex = 85;
- this.removeManufacturerLabel.Text = "Remove Manufacturer";
- //
- // removeManufacturerButton
- //
- this.removeManufacturerButton.Location = new System.Drawing.Point( 411, 165 );
- this.removeManufacturerButton.Name = "removeManufacturerButton";
- this.removeManufacturerButton.Size = new System.Drawing.Size( 62, 23 );
- this.removeManufacturerButton.TabIndex = 84;
- this.removeManufacturerButton.Text = "Remove..";
- this.removeManufacturerButton.UseVisualStyleBackColor = true;
- this.removeManufacturerButton.Click += new System.EventHandler( this.removeManufacturerButton_Click );
- //
- // addManufacturerLabel
- //
- this.addManufacturerLabel.Location = new System.Drawing.Point( 6, 121 );
- this.addManufacturerLabel.Name = "addManufacturerLabel";
- this.addManufacturerLabel.Size = new System.Drawing.Size( 82, 36 );
- this.addManufacturerLabel.TabIndex = 81;
- this.addManufacturerLabel.Text = "Add Manufacturer..";
- //
- // addManufacturerTextBox
- //
- this.addManufacturerTextBox.Location = new System.Drawing.Point( 99, 129 );
- this.addManufacturerTextBox.Name = "addManufacturerTextBox";
- this.addManufacturerTextBox.Size = new System.Drawing.Size( 306, 20 );
- this.addManufacturerTextBox.TabIndex = 82;
- //
- // addManufacturerButton
- //
- this.addManufacturerButton.Location = new System.Drawing.Point( 411, 129 );
- this.addManufacturerButton.Name = "addManufacturerButton";
- this.addManufacturerButton.Size = new System.Drawing.Size( 62, 23 );
- this.addManufacturerButton.TabIndex = 83;
- this.addManufacturerButton.Text = "Add..";
- this.addManufacturerButton.UseVisualStyleBackColor = true;
- this.addManufacturerButton.Click += new System.EventHandler( this.addManufacturerButton_Click );
- //
- // removeGenreComboBox
- //
- this.removeGenreComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.removeGenreComboBox.FormattingEnabled = true;
- this.removeGenreComboBox.Location = new System.Drawing.Point( 99, 70 );
- this.removeGenreComboBox.Name = "removeGenreComboBox";
- this.removeGenreComboBox.Size = new System.Drawing.Size( 306, 21 );
- this.removeGenreComboBox.TabIndex = 80;
- //
- // removeGenreLabel
- //
- this.removeGenreLabel.AutoSize = true;
- this.removeGenreLabel.Location = new System.Drawing.Point( 6, 73 );
- this.removeGenreLabel.Name = "removeGenreLabel";
- this.removeGenreLabel.Size = new System.Drawing.Size( 77, 13 );
- this.removeGenreLabel.TabIndex = 79;
- this.removeGenreLabel.Text = "Remove genre";
- //
- // removeGenreButton
- //
- this.removeGenreButton.Location = new System.Drawing.Point( 411, 70 );
- this.removeGenreButton.Name = "removeGenreButton";
- this.removeGenreButton.Size = new System.Drawing.Size( 62, 23 );
- this.removeGenreButton.TabIndex = 78;
- this.removeGenreButton.Text = "Remove..";
- this.removeGenreButton.UseVisualStyleBackColor = true;
- this.removeGenreButton.Click += new System.EventHandler( this.removeGenreButton_Click );
- //
- // addGenreLabel
- //
- this.addGenreLabel.AutoSize = true;
- this.addGenreLabel.Location = new System.Drawing.Point( 6, 37 );
- this.addGenreLabel.Name = "addGenreLabel";
- this.addGenreLabel.Size = new System.Drawing.Size( 62, 13 );
- this.addGenreLabel.TabIndex = 74;
- this.addGenreLabel.Text = "Add genre..";
- //
- // addGenreTextBox
- //
- this.addGenreTextBox.Location = new System.Drawing.Point( 99, 34 );
- this.addGenreTextBox.Name = "addGenreTextBox";
- this.addGenreTextBox.Size = new System.Drawing.Size( 306, 20 );
- this.addGenreTextBox.TabIndex = 75;
- //
- // addGenreButton
- //
- this.addGenreButton.Location = new System.Drawing.Point( 411, 34 );
- this.addGenreButton.Name = "addGenreButton";
- this.addGenreButton.Size = new System.Drawing.Size( 62, 23 );
- this.addGenreButton.TabIndex = 76;
- this.addGenreButton.Text = "Add..";
- this.addGenreButton.UseVisualStyleBackColor = true;
- this.addGenreButton.Click += new System.EventHandler( this.addGenreButton_Click );
- //
- // SetupForm
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF( 6F, 13F );
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size( 747, 609 );
- this.Controls.Add( this.tabControl );
- this.Controls.Add( this.treeView );
- this.Controls.Add( this.menuStrip );
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.MainMenuStrip = this.menuStrip;
- this.Name = "SetupForm";
- this.ShowIcon = false;
- this.ShowInTaskbar = false;
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "SetupForm";
- this.FormClosed += new System.Windows.Forms.FormClosedEventHandler( this.SetupForm_FormClosed );
- this.Load += new System.EventHandler( this.SetupForm_Load );
- this.menuStrip.ResumeLayout( false );
- this.menuStrip.PerformLayout();
- this.tabControl.ResumeLayout( false );
- this.dbOptionsTabPage.ResumeLayout( false );
- this.generalFileItemOptionsGroupBox.ResumeLayout( false );
- this.generalFileItemOptionsGroupBox.PerformLayout();
- this.ResumeLayout( false );
- this.PerformLayout();
+ this.importGamebaseItemToolStripMenuItem});
+ this.extendedApplicationItemToolStripMenuItem.Name = "extendedApplicationItemToolStripMenuItem";
+ this.extendedApplicationItemToolStripMenuItem.Size = new System.Drawing.Size(208, 22);
+ this.extendedApplicationItemToolStripMenuItem.Text = "Extended applicationItem";
+ //
+ // mameImportToolStripMenuItem
+ //
+ this.mameImportToolStripMenuItem.Name = "mameImportToolStripMenuItem";
+ this.mameImportToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
+ this.mameImportToolStripMenuItem.Text = "Import Mame";
+ this.mameImportToolStripMenuItem.Click += new System.EventHandler(this.mameImportToolStripMenuItem_Click);
+ //
+ // importGamebaseItemToolStripMenuItem
+ //
+ this.importGamebaseItemToolStripMenuItem.Name = "importGamebaseItemToolStripMenuItem";
+ this.importGamebaseItemToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
+ this.importGamebaseItemToolStripMenuItem.Text = "Import Gamebase";
+ this.importGamebaseItemToolStripMenuItem.Click += new System.EventHandler(this.importGamebaseItemToolStripMenuItem_Click);
+ //
+ // deleteApplicationToolStripMenuItem
+ //
+ this.deleteApplicationToolStripMenuItem.Image = global::GUIPrograms.Properties.Resources.deleteButton_Image;
+ this.deleteApplicationToolStripMenuItem.Name = "deleteApplicationToolStripMenuItem";
+ this.deleteApplicationToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
+ this.deleteApplicationToolStripMenuItem.Text = "Delete application";
+ this.deleteApplicationToolStripMenuItem.Click += new System.EventHandler(this.deleteApplicationToolStripMenuItem_Click);
+ //
+ // toolsStripMenuItem
+ //
+ this.toolsStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.premadeConfigurationsToolStripMenuItem});
+ this.toolsStripMenuItem.Name = "toolsStripMenuItem";
+ this.toolsStripMenuItem.Size = new System.Drawing.Size(48, 20);
+ this.toolsStripMenuItem.Text = "Tools";
+ //
+ // premadeConfigurationsToolStripMenuItem
+ //
+ this.premadeConfigurationsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.emulatorSetupToolStripMenuItem});
+ this.premadeConfigurationsToolStripMenuItem.Name = "premadeConfigurationsToolStripMenuItem";
+ this.premadeConfigurationsToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
+ this.premadeConfigurationsToolStripMenuItem.Text = "Configurations";
+ //
+ // emulatorSetupToolStripMenuItem
+ //
+ this.emulatorSetupToolStripMenuItem.Name = "emulatorSetupToolStripMenuItem";
+ this.emulatorSetupToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
+ this.emulatorSetupToolStripMenuItem.Text = "Emulator Setup";
+ //
+ // treeView
+ //
+ this.treeView.AllowDrop = true;
+ this.treeView.HideSelection = false;
+ this.treeView.HotTracking = true;
+ this.treeView.LabelEdit = true;
+ this.treeView.Location = new System.Drawing.Point(0, 27);
+ this.treeView.Name = "treeView";
+ treeNode4.Name = "applicationNode";
+ treeNode4.Text = "Applications";
+ this.treeView.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
+ treeNode4});
+ this.treeView.Size = new System.Drawing.Size(224, 576);
+ this.treeView.TabIndex = 8;
+ this.treeView.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeView_DragDrop);
+ this.treeView.DragOver += new System.Windows.Forms.DragEventHandler(this.treeView_DragOver);
+ this.treeView.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.treeView_AfterLabelEdit);
+ this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect);
+ this.treeView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView_NodeMouseClick);
+ this.treeView.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeView_DragEnter);
+ this.treeView.BeforeLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.treeView_BeforeLabelEdit);
+ this.treeView.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeView_BeforeSelect);
+ this.treeView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.treeView_ItemDrag);
+ //
+ // tabControl
+ //
+ this.tabControl.Controls.Add(this.detailsTabPage);
+ this.tabControl.Controls.Add(this.directoryTabPage);
+ this.tabControl.Controls.Add(this.viewTabPage);
+ this.tabControl.Controls.Add(this.dbOptionsTabPage);
+ this.tabControl.Location = new System.Drawing.Point(230, 27);
+ this.tabControl.Name = "tabControl";
+ this.tabControl.SelectedIndex = 0;
+ this.tabControl.ShowToolTips = true;
+ this.tabControl.Size = new System.Drawing.Size(505, 577);
+ this.tabControl.TabIndex = 2;
+ this.tabControl.Click += new System.EventHandler(this.dbOptionsTabPage_Click);
+ this.tabControl.Deselecting += new System.Windows.Forms.TabControlCancelEventHandler(this.tabControl_Deselecting);
+
+ //
+ // detailsTabPage
+ //
+ this.detailsTabPage.BackColor = System.Drawing.SystemColors.Control;
+ this.detailsTabPage.Location = new System.Drawing.Point(4, 22);
+ this.detailsTabPage.Name = "detailsTabPage";
+ this.detailsTabPage.Padding = new System.Windows.Forms.Padding(3);
+ this.detailsTabPage.Size = new System.Drawing.Size(497, 551);
+ this.detailsTabPage.TabIndex = 0;
+ this.detailsTabPage.Text = "Details";
+ //
+ // directoryTabPage
+ //
+ this.directoryTabPage.BackColor = System.Drawing.SystemColors.Control;
+ this.directoryTabPage.Location = new System.Drawing.Point(4, 22);
+ this.directoryTabPage.Name = "directoryTabPage";
+ this.directoryTabPage.Padding = new System.Windows.Forms.Padding(3);
+ this.directoryTabPage.Size = new System.Drawing.Size(497, 551);
+ this.directoryTabPage.TabIndex = 1;
+ this.directoryTabPage.Text = "Files";
+ //
+ // viewTabPage
+ //
+ this.viewTabPage.BackColor = System.Drawing.SystemColors.Control;
+ this.viewTabPage.Location = new System.Drawing.Point(4, 22);
+ this.viewTabPage.Name = "viewTabPage";
+ this.viewTabPage.Padding = new System.Windows.Forms.Padding(3);
+ this.viewTabPage.Size = new System.Drawing.Size(497, 551);
+ this.viewTabPage.TabIndex = 2;
+ this.viewTabPage.Text = "Views";
+ //
+ // dbOptionsTabPage
+ //
+ this.dbOptionsTabPage.Controls.Add(this.generalFileItemOptionsGroupBox);
+ this.dbOptionsTabPage.Location = new System.Drawing.Point(4, 22);
+ this.dbOptionsTabPage.Name = "dbOptionsTabPage";
+ this.dbOptionsTabPage.Padding = new System.Windows.Forms.Padding(3);
+ this.dbOptionsTabPage.Size = new System.Drawing.Size(497, 551);
+ this.dbOptionsTabPage.TabIndex = 3;
+ this.dbOptionsTabPage.Text = "DB options";
+ this.dbOptionsTabPage.UseVisualStyleBackColor = true;
+ this.dbOptionsTabPage.Click += new System.EventHandler(this.dbOptionsTabPage_Click);
+ //
+ // generalFileItemOptionsGroupBox
+ //
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.removePlatformComboBox);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.removePlatformLabel);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.removePlatformButton);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.addPlatformLabel);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.addPlatformTextBox);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.addPlatformButton);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.removeManufacturerComboBox);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.removeManufacturerLabel);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.removeManufacturerButton);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.addManufacturerLabel);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.addManufacturerTextBox);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.addManufacturerButton);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.removeGenreComboBox);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.removeGenreLabel);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.removeGenreButton);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.addGenreLabel);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.addGenreTextBox);
+ this.generalFileItemOptionsGroupBox.Controls.Add(this.addGenreButton);
+ this.generalFileItemOptionsGroupBox.Location = new System.Drawing.Point(3, 6);
+ this.generalFileItemOptionsGroupBox.Name = "generalFileItemOptionsGroupBox";
+ this.generalFileItemOptionsGroupBox.Size = new System.Drawing.Size(488, 496);
+ this.generalFileItemOptionsGroupBox.TabIndex = 79;
+ this.generalFileItemOptionsGroupBox.TabStop = false;
+ //
+ // removePlatformComboBox
+ //
+ this.removePlatformComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.removePlatformComboBox.FormattingEnabled = true;
+ this.removePlatformComboBox.Location = new System.Drawing.Point(99, 249);
+ this.removePlatformComboBox.Name = "removePlatformComboBox";
+ this.removePlatformComboBox.Size = new System.Drawing.Size(306, 21);
+ this.removePlatformComboBox.TabIndex = 92;
+ //
+ // removePlatformLabel
+ //
+ this.removePlatformLabel.AutoSize = true;
+ this.removePlatformLabel.Location = new System.Drawing.Point(6, 252);
+ this.removePlatformLabel.Name = "removePlatformLabel";
+ this.removePlatformLabel.Size = new System.Drawing.Size(87, 13);
+ this.removePlatformLabel.TabIndex = 91;
+ this.removePlatformLabel.Text = "Remove platform";
+ //
+ // removePlatformButton
+ //
+ this.removePlatformButton.Location = new System.Drawing.Point(411, 249);
+ this.removePlatformButton.Name = "removePlatformButton";
+ this.removePlatformButton.Size = new System.Drawing.Size(62, 23);
+ this.removePlatformButton.TabIndex = 90;
+ this.removePlatformButton.Text = "Remove..";
+ this.removePlatformButton.UseVisualStyleBackColor = true;
+ this.removePlatformButton.Click += new System.EventHandler(this.removePlatformButton_Click);
+ //
+ // addPlatformLabel
+ //
+ this.addPlatformLabel.AutoSize = true;
+ this.addPlatformLabel.Location = new System.Drawing.Point(6, 216);
+ this.addPlatformLabel.Name = "addPlatformLabel";
+ this.addPlatformLabel.Size = new System.Drawing.Size(72, 13);
+ this.addPlatformLabel.TabIndex = 87;
+ this.addPlatformLabel.Text = "Add platform..";
+ //
+ // addPlatformTextBox
+ //
+ this.addPlatformTextBox.Location = new System.Drawing.Point(99, 213);
+ this.addPlatformTextBox.Name = "addPlatformTextBox";
+ this.addPlatformTextBox.Size = new System.Drawing.Size(306, 20);
+ this.addPlatformTextBox.TabIndex = 88;
+ //
+ // addPlatformButton
+ //
+ this.addPlatformButton.Location = new System.Drawing.Point(411, 213);
+ this.addPlatformButton.Name = "addPlatformButton";
+ this.addPlatformButton.Size = new System.Drawing.Size(62, 23);
+ this.addPlatformButton.TabIndex = 89;
+ this.addPlatformButton.Text = "Add..";
+ this.addPlatformButton.UseVisualStyleBackColor = true;
+ this.addPlatformButton.Click += new System.EventHandler(this.addPlatformButton_Click);
+ //
+ // removeManufacturerComboBox
+ //
+ this.removeManufacturerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.removeManufacturerComboBox.FormattingEnabled = true;
+ this.removeManufacturerComboBox.Location = new System.Drawing.Point(99, 165);
+ this.removeManufacturerComboBox.Name = "removeManufacturerComboBox";
+ this.removeManufacturerComboBox.Size = new System.Drawing.Size(306, 21);
+ this.removeManufacturerComboBox.TabIndex = 86;
+ //
+ // removeManufacturerLabel
+ //
+ this.removeManufacturerLabel.Location = new System.Drawing.Point(6, 157);
+ this.removeManufacturerLabel.Name = "removeManufacturerLabel";
+ this.removeManufacturerLabel.Size = new System.Drawing.Size(82, 29);
+ this.removeManufacturerLabel.TabIndex = 85;
+ this.removeManufacturerLabel.Text = "Remove Manufacturer";
+ //
+ // removeManufacturerButton
+ //
+ this.removeManufacturerButton.Location = new System.Drawing.Point(411, 165);
+ this.removeManufacturerButton.Name = "removeManufacturerButton";
+ this.removeManufacturerButton.Size = new System.Drawing.Size(62, 23);
+ this.removeManufacturerButton.TabIndex = 84;
+ this.removeManufacturerButton.Text = "Remove..";
+ this.removeManufacturerButton.UseVisualStyleBackColor = true;
+ this.removeManufacturerButton.Click += new System.EventHandler(this.removeManufacturerButton_Click);
+ //
+ // addManufacturerLabel
+ //
+ this.addManufacturerLabel.Location = new System.Drawing.Point(6, 121);
+ this.addManufacturerLabel.Name = "addManufacturerLabel";
+ this.addManufacturerLabel.Size = new System.Drawing.Size(82, 36);
+ this.addManufacturerLabel.TabIndex = 81;
+ this.addManufacturerLabel.Text = "Add Manufacturer..";
+ //
+ // addManufacturerTextBox
+ //
+ this.addManufacturerTextBox.Location = new System.Drawing.Point(99, 129);
+ this.addManufacturerTextBox.Name = "addManufacturerTextBox";
+ this.addManufacturerTextBox.Size = new System.Drawing.Size(306, 20);
+ this.addManufacturerTextBox.TabIndex = 82;
+ //
+ // addManufacturerButton
+ //
+ this.addManufacturerButton.Location = new System.Drawing.Point(411, 129);
+ this.addManufacturerButton.Name = "addManufacturerButton";
+ this.addManufacturerButton.Size = new System.Drawing.Size(62, 23);
+ this.addManufacturerButton.TabIndex = 83;
+ this.addManufacturerButton.Text = "Add..";
+ this.addManufacturerButton.UseVisualStyleBackColor = true;
+ this.addManufacturerButton.Click += new System.EventHandler(this.addManufacturerButton_Click);
+ //
+ // removeGenreComboBox
+ //
+ this.removeGenreComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.removeGenreComboBox.FormattingEnabled = true;
+ this.removeGenreComboBox.Location = new System.Drawing.Point(99, 70);
+ this.removeGenreComboBox.Name = "removeGenreComboBox";
+ this.removeGenreComboBox.Size = new System.Drawing.Size(306, 21);
+ this.removeGenreComboBox.TabIndex = 80;
+ //
+ // removeGenreLabel
+ //
+ this.removeGenreLabel.AutoSize = true;
+ this.removeGenreLabel.Location = new System.Drawing.Point(6, 73);
+ this.removeGenreLabel.Name = "removeGenreLabel";
+ this.removeGenreLabel.Size = new System.Drawing.Size(77, 13);
+ this.removeGenreLabel.TabIndex = 79;
+ this.removeGenreLabel.Text = "Remove genre";
+ //
+ // removeGenreButton
+ //
+ this.removeGenreButton.Location = new System.Drawing.Point(411, 70);
+ this.removeGenreButton.Name = "removeGenreButton";
+ this.removeGenreButton.Size = new System.Drawing.Size(62, 23);
+ this.removeGenreButton.TabIndex = 78;
+ this.removeGenreButton.Text = "Remove..";
+ this.removeGenreButton.UseVisualStyleBackColor = true;
+ this.removeGenreButton.Click += new System.EventHandler(this.removeGenreButton_Click);
+ //
+ // addGenreLabel
+ //
+ this.addGenreLabel.AutoSize = true;
+ this.addGenreLabel.Location = new System.Drawing.Point(6, 37);
+ this.addGenreLabel.Name = "addGenreLabel";
+ this.addGenreLabel.Size = new System.Drawing.Size(62, 13);
+ this.addGenreLabel.TabIndex = 74;
+ this.addGenreLabel.Text = "Add genre..";
+ //
+ // addGenreTextBox
+ //
+ this.addGenreTextBox.Location = new System.Drawing.Point(99, 34);
+ this.addGenreTextBox.Name = "addGenreTextBox";
+ this.addGenreTextBox.Size = new System.Drawing.Size(306, 20);
+ this.addGenreTextBox.TabIndex = 75;
+ //
+ // addGenreButton
+ //
+ this.addGenreButton.Location = new System.Drawing.Point(411, 34);
+ this.addGenreButton.Name = "addGenreButton";
+ this.addGenreButton.Size = new System.Drawing.Size(62, 23);
+ this.addGenreButton.TabIndex = 76;
+ this.addGenreButton.Text = "Add..";
+ this.addGenreButton.UseVisualStyleBackColor = true;
+ this.addGenreButton.Click += new System.EventHandler(this.addGenreButton_Click);
+ //
+ // SetupForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(747, 609);
+ this.Controls.Add(this.tabControl);
+ this.Controls.Add(this.treeView);
+ this.Controls.Add(this.menuStrip);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.MainMenuStrip = this.menuStrip;
+ this.Name = "SetupForm";
+ this.ShowIcon = false;
+ this.ShowInTaskbar = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "SetupForm";
+ this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.SetupForm_FormClosed);
+ this.Load += new System.EventHandler(this.SetupForm_Load);
+ this.menuStrip.ResumeLayout(false);
+ this.menuStrip.PerformLayout();
+ this.tabControl.ResumeLayout(false);
+ this.dbOptionsTabPage.ResumeLayout(false);
+ this.generalFileItemOptionsGroupBox.ResumeLayout(false);
+ this.generalFileItemOptionsGroupBox.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
}
#endregion
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -43,6 +43,7 @@
private bool profilesIsLoaded = false;
private const string ROOTNODENAME = "Applications";
private const int POSITIONHOLDER = 10;
+ private int previousSelectedTabIndex = 0;
#endregion
@@ -470,7 +471,7 @@
return false;
}
- if (pageCurrentSettings.EntriesOK(currentApplication))
+ if (pageCurrentSettings.ValidateEntries(currentApplication))
{
if (appSettingsFileEditView.EntriesOK())
{
@@ -696,8 +697,6 @@
private void SetupForm_Load(object sender, EventArgs e)
{
-
-
AttachFilesView();
AttachProgramsView();
UpdateTree();
@@ -893,24 +892,7 @@
treeView.SelectedNode = treeView.GetNodeAt(targetPoint);
}
- private void tabControl_SelectedIndexChanged(object sender, EventArgs e)
- {
- // save current applicationItem if switching to file-tab
- if (tabControl.SelectedIndex == 1)
- {
- appSettingsFileEditView.SetupFileView();
- if (!SaveAppItem())
- {
- tabControl.SelectedIndex = 0;
- }
- }
- // save current applicationItem if switching from filesview to file-tab
- if (tabControl.SelectedIndex == 0)
- {
- SaveAppItem();
- }
- }
private void SetupForm_FormClosed(object sender, FormClosedEventArgs e)
{
@@ -918,7 +900,7 @@
pageCurrentSettings = GetCurrentSettingsPage();
if (pageCurrentSettings != null)
{
- if (pageCurrentSettings.EntriesOK(currentApplication))
+ if (pageCurrentSettings.ValidateEntries(currentApplication))
{
pageCurrentSettings.SaveSettings(currentApplication);
if (currentApplication != null)
@@ -1161,6 +1143,18 @@
UpdateComboBoxes();
}
-
+
+
+ private void tabControl_Deselecting(object sender, TabControlCancelEventArgs e)
+ {
+ // validate when leaving
+ if (tabControl.SelectedIndex == 0)
+ {
+ if (!SaveAppItem())
+ {
+ e.Cancel = true;
+ }
+ }
+ }
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -30,7 +30,6 @@
OnReadNewFile -= new MyEventHandler(applicationItem.ReadNewFile);
}
-
private void ImportFileItem(FileInfo fileInfo)
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -72,7 +72,6 @@
public MameImport(ApplicationItem applicationItem)
{
-
currentApplication = applicationItem;
OnReadNewFile += new MyEventHandler(currentApplication.ReadNewFile);
}
@@ -324,8 +323,6 @@
int LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblManufacturer", "manufacturer", match.Groups["manufacturer"].Value);
curFile.ManufacturerId = LexiconId;
-
-
}
mameHistoryNode = null;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -68,7 +68,6 @@
public override void Refresh(bool mpGuiMode)
{
- base.Refresh(mpGuiMode);
Import(mpGuiMode);
FixFileLinks();
LoadFiles();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -77,7 +77,6 @@
public override void Refresh(bool bGUIMode)
{
- base.Refresh(bGUIMode);
DeleteFiles();
Import(bGUIMode);
FixFileLinks();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -88,9 +88,9 @@
}
+
public override void Refresh(bool bGUIMode)
{
- base.Refresh(bGUIMode);
DeleteFiles();
Import(bGUIMode);
FixFileLinks();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-19 23:23:20 UTC (rev 847)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-20 08:53:11 UTC (rev 848)
@@ -78,36 +78,30 @@
public FileItem()
{
- SetDefaultValues();
+ fileID = -1;
+ appID = -1;
+ title = "";
+ filename = "";
+ imagefile = "";
+ genreId = 1;
+ genreStyleId = 1;
+ country = "";
+ manufacturer = "";
+ manufacturerId = 1;
+ year = 1900;
+ rating = 5;
+ overview = "";
+ platform = "";
+ platformId = 1;
+ //isFolder = false;
+ lastT...
[truncated message content] |
|
From: <nor...@us...> - 2007-08-19 23:23:23
|
Revision: 847
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=847&view=rev
Author: northern_sky
Date: 2007-08-19 16:23:20 -0700 (Sun, 19 Aug 2007)
Log Message:
-----------
misc cleanup, added abstract class for import, changed skin a bit,
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Properties/Resources.Designer.cs
Added Paths:
-----------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/ImportBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml
Removed Paths:
-------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myprograms.xml
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -445,8 +445,18 @@
}
}
+ public ApplicationItem GetAppByID(int targetAppID)
+ {
+ foreach (ApplicationItem curApp in globalApplicationItemList)
+ {
+ if (curApp.ApplicationItemId == targetAppID)
+ {
+ return curApp;
+ }
+ }
+ return null;
+ }
-
#endregion Public Methods
#region Private Methods
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -195,7 +195,7 @@
}
else
{
- string imageDirectorys = string.Join(";", currentApplication.imageDirs);
+ string imageDirectorys = string.Join(";", currentApplication.ImageDirsSplitted);
this.imageDirsTextBox.Text = imageDirectorys;
}
@@ -383,11 +383,11 @@
OnImageFolderSearch(this, null);
}
//get all imagedirs
- /* for (int i = 0; i < currentApplication.imageDirs.Length; i++)
+ /* for (int i = 0; i < currentApplication.imageDirsSplitted.Length; i++)
{
- if (!currentApplication.imageDirs[i].ToString().Equals(""))
+ if (!currentApplication.imageDirsSplitted[i].ToString().Equals(""))
{
- imageDirsList.Add(currentApplication.imageDirs[i]);
+ imageDirsList.Add(currentApplication.imageDirsSplitted[i]);
}
}
@@ -526,7 +526,7 @@
{
// if (file.IsFolder)
//{
- //ChangeFilePath(file.Filename); // filename becomes filepath in next view... :)
+ //ChangeFilePath(file.Executable); // executable becomes filepath in next view... :)
//}
//else
//{
@@ -578,7 +578,7 @@
foreach (ApplicationItem app in apps)
{
- if (app.SourceType == ItemType.GROUPER)
+ if (app.Item_Type == ItemType.GROUPER)
{
ToolStripMenuItem newMenu = new ToolStripMenuItem(app.Title);
newMenu.Tag = app.ApplicationItemId;
@@ -653,7 +653,7 @@
if ((currentApplication is ApplicationItemGameBase))
{
- applicationItem.Source = this.gamebaseDBTextBox.Text;
+ applicationItem.ApplicationItemSource = this.gamebaseDBTextBox.Text;
}
}
@@ -739,7 +739,7 @@
this.gamebaseDBTextBox.Visible = true;
this.gamebaseDBButton.Visible = true;
this.gamebaseLabel.Visible = true;
- this.gamebaseDBTextBox.Text = currentApplication.Source;
+ this.gamebaseDBTextBox.Text = currentApplication.ApplicationItemSource;
}
if ((currentApplication is ApplicationItemGrouper))
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -56,7 +56,7 @@
enabledCheckbox.Checked = curApp.Enabled;
titleTextBox.Text = curApp.Title;
- applicationExeTextBox.Text = curApp.Filename;
+ applicationExeTextBox.Text = curApp.Executable;
applicationArgumentsTextBox.Text = curApp.Arguments;
// Pre-Post-Launch
preCommandTextBox.Text = curApp.PreLaunch;
@@ -86,7 +86,7 @@
curApp.Enabled = enabledCheckbox.Checked;
curApp.Title = titleTextBox.Text;
- curApp.Filename = applicationExeTextBox.Text;
+ curApp.Executable = applicationExeTextBox.Text;
curApp.Arguments = applicationArgumentsTextBox.Text;
// Pre-Post-Launch
curApp.PreLaunch = preCommandTextBox.Text;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -75,7 +75,7 @@
curApp.UseShellExecute = shellexecuteCheckBox.Checked;
curApp.UseQuotes = quoteCheckBox.Checked;
curApp.WaitForExit = waitExitCheckBox.Checked;
- curApp.SourceType = ItemType.DIRCACHE;
+ curApp.Item_Type = ItemType.DIRCACHE;
curApp.RefreshGUIAllowed = allowRefreshCheckBox.Checked;
curApp.PlatformId = (int)platformComboBox.SelectedValue;
}
@@ -105,7 +105,7 @@
public override void LoadFromAppItem(ApplicationItem applicationItem)
{
titleTextBox.Text = applicationItem.Title;
- applicationExeTextBox.Text = applicationItem.Filename;
+ applicationExeTextBox.Text = applicationItem.Executable;
applicationArgumentsTextBox.Text = applicationItem.Arguments;
startupDirComboBox.Text = applicationItem.StartupDir;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -64,7 +64,7 @@
curApp.UseShellExecute = this.shellexecuteCheckBox.Checked;
curApp.UseQuotes = this.quoteCheckBox.Checked;
curApp.WaitForExit = this.waitExitCheckBox.Checked;
- curApp.SourceType = ItemType.GAMEBASE;
+ curApp.Item_Type = ItemType.GAMEBASE;
curApp.RefreshGUIAllowed = this.allowRefreshCheckBox.Checked;
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -53,7 +53,7 @@
{
base.SaveSettings(curApp);
- curApp.SourceType = ItemType.GROUPER;
+ curApp.Item_Type = ItemType.GROUPER;
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -55,7 +55,7 @@
{
base.SaveSettings(curApp);
- curApp.SourceType = ItemType.MAMEDIRECT;
+ curApp.Item_Type = ItemType.MAMEDIRECT;
curApp.RefreshGUIAllowed = true;
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -378,7 +378,7 @@
this.lblFilename.Name = "lblFilename";
this.lblFilename.Size = new System.Drawing.Size(52, 13);
this.lblFilename.TabIndex = 45;
- this.lblFilename.Text = "Filename:";
+ this.lblFilename.Text = "Executable:";
//
// btnFilename
//
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -216,7 +216,7 @@
{
conditionChecker.Clear();
conditionChecker.DoCheck(CurFile.Title != "", "No title entered!");
- //01.04.05 no filename is FINE :-) conditionChecker.DoCheck(CurFile.Filename != "", "No filename entered!");
+ //01.04.05 no executable is FINE :-) conditionChecker.DoCheck(CurFile.Executable != "", "No executable entered!");
if (!conditionChecker.IsOk)
{
string strHeader = "The following entries are invalid: \r\n\r\n";
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -343,7 +343,7 @@
ApplicationItem currentApplication = GetTreeNodeApplicationItem(treeView.SelectedNode);
if (currentApplication == null) return appSettingsRoot;
- switch (currentApplication.SourceType)
+ switch (currentApplication.Item_Type)
{
case ItemType.DIRCACHE:
return appSettingsDirCache;
@@ -528,7 +528,7 @@
else
{
ApplicationItem curApp = this.GetTreeNodeApplicationItem(treeView.SelectedNode);
- if ((curApp.SourceType == ItemType.MAMEDIRECT) || (curApp.SourceType == ItemType.GAMEBASE))
+ if ((curApp.Item_Type == ItemType.MAMEDIRECT) || (curApp.Item_Type == ItemType.GAMEBASE))
{
this.premadeConfigurationsToolStripMenuItem.Enabled = false;
}
@@ -661,7 +661,7 @@
{
newApplication.Title = "New item";
}
- newApplication.SourceType = newSourceType;
+ newApplication.Item_Type = newSourceType;
newApplication.InsertOrUpdateSettings();
dbHandlerInstance.LoadAllApplicationItems();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -446,7 +446,7 @@
{
LoadLastAppIDFromSettings(); // hacky load back the last applicationItem id, otherwise this can get lost from dx resets....
}
- lastApp = GetAppByID(mapSettings.LastAppID);
+ lastApp = this.dbHandlerInstance.GetAppByID(mapSettings.LastAppID);
if (lastApp != null)
{
prevFilepath = lastApp.DefaultFilepath();
@@ -591,7 +591,7 @@
public override bool Init()
{
- return Load(GUIGraphicsContext.Skin + @"\myprograms.xml");
+ return Load(GUIGraphicsContext.Skin + @"\myProgramsAlt.xml");
}
protected override void OnPageLoad()
@@ -926,7 +926,7 @@
lastApp.CurrentView = ViewHandler.CurrentView;
}
int totalFiles = 0;
- totalFiles = totalFiles + DisplayItemList(lastApp.filePath, lastApp.ItemList, facadeView);
+ totalFiles = totalFiles + DisplayItemList(lastApp.ItemList, facadeView);
return (totalFiles);
}
@@ -1048,7 +1048,7 @@
{
// back item in application list clicked
// go to father item
- lastApp = GetAppByID(lastApp.FatherID);
+ lastApp = this.dbHandlerInstance.GetAppByID(lastApp.FatherID);
if (lastApp != null)
{
mapSettings.LastAppID = lastApp.ApplicationItemId;
@@ -1114,21 +1114,11 @@
return res;
}
- public ApplicationItem GetAppByID(int targetAppID)
- {
- foreach (ApplicationItem curApp in globalApplicationList)
- {
- if (curApp.ApplicationItemId == targetAppID)
- {
- return curApp;
- }
- }
- return null;
- }
+
/* public ApplicationItem CloneAppItem(ApplicationItem sourceApp)
{
- ApplicationItem newApp = (ApplicationItem)ItemFactory.itemFactoryInstance.GetItem(sqlDB, sourceApp.SourceType, null, 0);
+ ApplicationItem newApp = (ApplicationItem)ItemFactory.itemFactoryInstance.GetItem(sqlDB, sourceApp.Item_Type, null, 0);
newApp.Assign(sourceApp);
newApp.ApplicationItemId = -1; // to force a sql INSERT when written
Add(newApp);
@@ -1304,7 +1294,7 @@
#region moved from BaseItem
- public int DisplayItemList(string filePath, List<object> dbItems, GUIFacadeControl facadeView)
+ public int DisplayItemList(List<object> dbItems, GUIFacadeControl facadeView)
{
int totalItems = 0;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj 2007-08-19 23:23:20 UTC (rev 847)
@@ -137,7 +137,9 @@
<Compile Include="GUIPrograms.cs" />
<Compile Include="GUIProgramsAltFileInfo.cs" />
<Compile Include="Imports\AllGameScraper.cs" />
+ <Compile Include="Imports\DirectoryImport.cs" />
<Compile Include="Imports\GamebaseImport.cs" />
+ <Compile Include="Imports\ImportBase.cs" />
<Compile Include="Imports\MameImport.cs" />
<Compile Include="Items\ApplicationItem.cs" />
<Compile Include="Items\ApplicationItemDirectoryCache.cs" />
@@ -161,7 +163,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="MetaData\myProgramsAltPreconfiguration.xml" />
- <Content Include="skin\BlueTwo\myprograms.xml" />
+ <Content Include="skin\BlueTwo\myprogramsAlt.xml" />
<Content Include="skin\BlueTwo\myProgramsAltFileInfo.xml" />
<Content Include="SqlNet\System.Data.SQLite.DLL" />
</ItemGroup>
Added: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs (rev 0)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using MediaPortal.GUI.Library;
+
+
+using GUIPrograms.Items;
+using GUIPrograms;
+using GUIPrograms.Database;
+using System.Data.SQLite;
+
+using System.IO;
+
+namespace GUIPrograms.Imports
+{
+ public class DirectoryImport: ImportBase
+ {
+ private ApplicationItem applicationItem = null;
+ private DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
+
+ public DirectoryImport(ApplicationItem objApp)
+ {
+ applicationItem = objApp;
+ OnReadNewFile += new MyEventHandler(applicationItem.ReadNewFile);
+ }
+
+ public void DeInit()
+ {
+ OnReadNewFile -= new MyEventHandler(applicationItem.ReadNewFile);
+ }
+
+
+
+ private void ImportFileItem(FileInfo fileInfo)
+ {
+ FileItem curFile = new FileItem();
+ curFile.FileID = -1; // to force an INSERT statement when writing the item
+ curFile.AppID = applicationItem.ApplicationItemId;
+ curFile.Title = Path.GetFileNameWithoutExtension(fileInfo.Name);
+ curFile.Filename = fileInfo.FullName;
+
+ //curFile.Imagefile = GetThumbsFile(fileInfo, curFile.Title);
+ curFile.Imagefile = ImportImageFiles(curFile.Filename, curFile.Title, applicationItem);
+
+ // not imported properties => set default values
+ curFile.LastTimeLaunched = DateTime.MinValue;
+ curFile.LaunchCount = 0;
+ curFile.Write();
+ }
+
+ private void DeleteOrphaned()
+ {
+ string TheFileName;
+ foreach (FileItem DBfile in applicationItem.ItemList)
+ {
+
+ TheFileName = DBfile.Filename;
+
+ //if (!DBfile.IsFolder)
+ //{
+ if (!File.Exists(TheFileName)) { DBfile.Delete(); }
+ //}
+ //else
+ //{
+ //if (!Directory.Exists(TheFileName)) { DBfile.Delete(); }
+
+ //}
+
+ }
+ }
+
+ private void ImportFile(string dirPath, bool mpGuiMode)
+ {
+
+ FileInfo fileInDir = null;
+ if (Directory.Exists(dirPath))
+ {
+ DirectoryInfo directoryInfo = new DirectoryInfo(dirPath);
+ FileSystemInfo[] allUnderLyingFiles = directoryInfo.GetFileSystemInfos();
+
+ for (int i = 0; i < allUnderLyingFiles.Length; i++)
+ {
+ if (allUnderLyingFiles[i] is FileInfo)
+ {
+ Boolean FileExists = false;
+
+ fileInDir = (FileInfo)allUnderLyingFiles[i];
+
+ foreach (FileItem DBfile in applicationItem.ItemList)
+ {
+ if (DBfile.Filename == fileInDir.FullName)
+ {
+ FileExists = true;
+ break;//ugly
+ }
+ }
+ if (!FileExists)
+ {
+ ImportFileItem(fileInDir);
+ //UpdateProgressDialog(fileInDir, mpGuiMode);
+ }
+ }//if dir found,, recurse
+ else if (allUnderLyingFiles[i] is DirectoryInfo)
+ {
+ DirectoryInfo directory = (DirectoryInfo)allUnderLyingFiles[i];
+ ImportFile(directory.FullName, mpGuiMode);
+ }
+ }
+ }
+ }
+
+ public void StartImport(string[] fileDirPaths, bool mpGuiMode)
+ {
+ using (SQLiteTransaction transaction = dbHandlerInstance.SqlLiteConn.BeginTransaction())
+ {
+ DeleteOrphaned();
+ //get all maindirs
+ foreach (string dirPath in fileDirPaths)
+ {
+ ImportFile(dirPath, mpGuiMode);
+ }
+ transaction.Commit();
+ }
+ }
+ }
+}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -40,28 +40,25 @@
/// <summary>
/// Summary description for GamebaseImport.
/// </summary>
- public class GamebaseImport
+ public class GamebaseImport : ImportBase
{
private ApplicationItem applicationItem = null;
-
- // event: read new file
- public delegate void MyEventHandler(string informationMessage, int progressBarCtr);
-
- public event MyEventHandler OnReadNewFile = null;
- public event MyEventHandler OnSendMessage = null;
-
-
public GamebaseImport(ApplicationItem objApp)
{
-
applicationItem = objApp;
+ OnReadNewFile += new MyEventHandler(applicationItem.ReadNewFile);
}
+ public void DeInit()
+ {
+ OnReadNewFile -= new MyEventHandler(applicationItem.ReadNewFile);
+ }
+
void DBImportGamebaseItem(OleDbDataReader myReader, string romFilename, string imgFilename, int curPos, int maxGames)
{
-
+
FileItem curFile = new FileItem();
curFile.FileID = -1; // to force an INSERT statement when writing the item
curFile.AppID = applicationItem.ApplicationItemId;
@@ -71,7 +68,7 @@
string strGenre1 = myReader["ParentGenre"].ToString();
string strGenre2 = myReader["Genre"].ToString();
- int LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblGenre", "genre", strGenre1);
+ int LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblGenre", "genre", strGenre1);
curFile.GenreId = LexiconId;
LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblGenre", "genre", strGenre2);
@@ -99,14 +96,15 @@
curFile.LaunchCount = 0;
curFile.Write();
//this.OnReadNewFile(curFile.Title, curPos, maxGames); // send event to whom it may concern....
- this.OnReadNewFile(curFile.Title, (int)(100 * (((double)curPos) / maxGames)));
+ //this.OnReadNewFile(curFile.Title, (int)(100 * (((double)curPos) / maxGames)));
+ SendDisplayText(curFile.Title, (int)(100 * (((double)curPos) / maxGames)));
return;
}
- public void Start()
+ public void StartImport()
{
// string strCon = "Provider=Microsoft.Jet.OLEDB.4.0 ;Data Source=C:\\media\\GameBase\\snes\\Snes.mdb";
- string strCon = String.Format("Provider=Microsoft.Jet.OLEDB.4.0 ;Data Source={0}", applicationItem.Source);
+ string strCon = String.Format("Provider=Microsoft.Jet.OLEDB.4.0 ;Data Source={0}", applicationItem.ApplicationItemSource);
//Make a Select Command for querying the gamebase-MDB-file
string sqlStrCount = "SELECT count(*) FROM Games";
@@ -144,69 +142,66 @@
{
using (OleDbConnection myCon = new OleDbConnection(strCon))
{
-
- using (OleDbCommand myCmd = new OleDbCommand(sqlStr, myCon))
- {
- using (SQLiteTransaction transaction = DatabaseHandler.DBHandlerInstance.SqlLiteConn.BeginTransaction())
-
- {
+ using (OleDbCommand myCmd = new OleDbCommand(sqlStr, myCon))
+ {
+
+ using (SQLiteTransaction transaction = DatabaseHandler.DBHandlerInstance.SqlLiteConn.BeginTransaction())
+ {
myCon.Open();
int maxGames = CountGames(myCon, sqlStrCount);
-
-
- using (OleDbDataReader myReader = myCmd.ExecuteReader())
- {
- int i = 0;
- while (myReader.Read())
- {
- i++;
- curRomname = myReader["Filename"].ToString();
- curFullRomname = applicationItem.FileDirectory + "\\" + curRomname;
- if (applicationItem.ImageDirectory != "")
- {
- curTitleImage = applicationItem.imageDirs[0] + "\\" + myReader["ScrnshotFilename"].ToString();
- }
- else
- {
- curTitleImage = "";
- }
+ using (OleDbDataReader myReader = myCmd.ExecuteReader())
+ {
- if (File.Exists(curFullRomname))
- {
- // rom-name from gamebase exists in users filedirectory
- // => ready to import item
- bDoImport = true;
+ int i = 0;
+ while (myReader.Read())
+ {
+ i++;
+ curRomname = myReader["Filename"].ToString();
+ curFullRomname = applicationItem.FileDirectory + "\\" + curRomname;
- if (applicationItem.ImportValidImagesOnly)
- {
- // skip item if no thumbnail image is found
- bDoImport = ((curTitleImage != null) && (curTitleImage != "") && (File.Exists(curTitleImage)));
- }
-
- if (bDoImport)
- {
- DBImportGamebaseItem(myReader, curFullRomname, curTitleImage, i, maxGames);
+ if (applicationItem.ImageDirectory != "")
+ {
+ curTitleImage = applicationItem.ImageDirsSplitted[0] + "\\" + myReader["ScrnshotFilename"].ToString();
+ }
+ else
+ {
+ curTitleImage = "";
+ }
- }
- else
- {
- Log.Info("*skipped* gamebase game {0} image{1}", curRomname, curTitleImage);
- }
+ if (File.Exists(curFullRomname))
+ {
+ // rom-name from gamebase exists in users filedirectory
+ // => ready to import item
+ bDoImport = true;
- }
- else
- {
- Log.Info("*missing* gamebase game {0}", curRomname);
- }
+ if (applicationItem.ImportValidImagesOnly)
+ {
+ // skip item if no thumbnail image is found
+ bDoImport = ((curTitleImage != null) && (curTitleImage != "") && (File.Exists(curTitleImage)));
}
+
+ if (bDoImport)
+ {
+ DBImportGamebaseItem(myReader, curFullRomname, curTitleImage, i, maxGames);
+
+ }
+ else
+ {
+ Log.Info("*skipped* gamebase game {0} image{1}", curRomname, curTitleImage);
+ }
+
}
- transaction.Commit();
+ else
+ {
+ Log.Info("*missing* gamebase game {0}", curRomname);
+ }
}
-
-
+ }
+ transaction.Commit();
+ }
}
}
}
@@ -216,14 +211,6 @@
}
}
- void SendText(string informationMessage, int progressBarCtr)
- {
- if (OnSendMessage != null)
- {
- OnSendMessage(informationMessage, progressBarCtr);
- }
- }
-
int CountGames(OleDbConnection myCon, string sqlStrCount)
{
int res = 0;
Added: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/ImportBase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/ImportBase.cs (rev 0)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/ImportBase.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using System.IO;
+using GUIPrograms.Items;
+
+namespace GUIPrograms.Imports
+{
+ public abstract class ImportBase
+ {
+ // event: read new file
+ protected delegate void MyEventHandler(string informationMessage, int progressBarCtr);
+
+ protected event MyEventHandler OnReadNewFile = null;
+
+ protected void SendDisplayText(string displayText, int progressBarCtr)
+ {
+ if (OnReadNewFile != null)
+ {
+ OnReadNewFile(displayText, progressBarCtr);
+ }
+ }
+
+ protected string ImportImageFiles(string fileName, string fileTitle,ApplicationItem applicationItem)
+ {
+ string thumb = "";
+
+ if (applicationItem.ImageDirsSplitted.Length > 0)
+ {
+ foreach (string imageDir in applicationItem.ImageDirsSplitted)
+ {
+ if (Directory.Exists(imageDir))
+ {
+ string[] matchesJPG = Directory.GetFiles(imageDir, Path.GetFileNameWithoutExtension(fileName) + ".jpg");
+ string[] matchesGIF = Directory.GetFiles(imageDir, Path.GetFileNameWithoutExtension(fileName) + ".gif");
+ string[] matchesPNG = Directory.GetFiles(imageDir, Path.GetFileNameWithoutExtension(fileName) + ".png");
+ if (matchesJPG.Length > 0)
+ {
+ thumb = matchesJPG[0];
+ }
+ else if (matchesGIF.Length > 0)
+ {
+ thumb = matchesGIF[0];
+ }
+ else if (matchesPNG.Length > 0)
+ {
+ thumb = matchesPNG[0];
+ }
+ else
+ {
+ matchesJPG = Directory.GetFiles(imageDir, Path.GetFileNameWithoutExtension(fileName) + "*.jpg");
+ matchesGIF = Directory.GetFiles(imageDir, Path.GetFileNameWithoutExtension(fileName) + "*.gif");
+ matchesPNG = Directory.GetFiles(imageDir, Path.GetFileNameWithoutExtension(fileName) + "*.png");
+ if (matchesJPG.Length > 0)
+ {
+ thumb = matchesJPG[0];
+ }
+ else if (matchesGIF.Length > 0)
+ {
+ thumb = matchesGIF[0];
+ }
+ else if (matchesPNG.Length > 0)
+ {
+ thumb = matchesPNG[0];
+ }
+
+ }
+ }
+ }
+ }
+ return thumb;
+ }
+
+ }
+}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -46,15 +46,10 @@
/// <summary>
/// Summary description for MameImport.
/// </summary>
- public class MameImport
+ public class MameImport : ImportBase
{
ApplicationItem currentApplication = null;
- // event: read new file
- public delegate void MyEventHandler(string informationMessage, int progressBarCtr);
-
- public event MyEventHandler OnReadNewFile = null;
- public event MyEventHandler OnSendMessage = null;
ConditionChecker Checker = new ConditionChecker();
Regex regexMameGameName = new Regex(@"(?<romName>\w+)\s+""(?<gameName>.+)""");
Regex regexMameCloneName = new Regex(@"(?<cloneName>\w+)\s+(?<orgGameName>\w+)");
@@ -79,19 +74,24 @@
{
currentApplication = applicationItem;
+ OnReadNewFile += new MyEventHandler(currentApplication.ReadNewFile);
}
+ public void DeInit()
+ {
+ OnReadNewFile -= new MyEventHandler(currentApplication.ReadNewFile);
+ }
void ReadListFull()
{
fullRomListDictionary.Clear();
string line = string.Empty;
- SendText("generating mame list (full)", 10);
+ SendDisplayText("generating mame list (full)", 10);
using (Process process = new Process())
{
- ProcessStartInfo processStartInfo = new ProcessStartInfo(currentApplication.Filename);
+ ProcessStartInfo processStartInfo = new ProcessStartInfo(currentApplication.Executable);
processStartInfo.Arguments = "-listfull";
processStartInfo.UseShellExecute = false;
processStartInfo.RedirectStandardOutput = true;
@@ -115,17 +115,16 @@
}
}
-
void ReadListClones()
{
string line;
if (((ApplicationItemMame)currentApplication).ImportOriginalsOnly)
{
- SendText("generating mame list (clones)", 20);
+ SendDisplayText("generating mame list (clones)", 20);
using (Process process = new Process())
{
- ProcessStartInfo myProcessStartInfo = new ProcessStartInfo(currentApplication.Filename);
+ ProcessStartInfo myProcessStartInfo = new ProcessStartInfo(currentApplication.Executable);
myProcessStartInfo.Arguments = "-listclones";
myProcessStartInfo.UseShellExecute = false;
myProcessStartInfo.RedirectStandardOutput = true;
@@ -192,7 +191,6 @@
}
}
-
void ReadCatverIni()
{
string line = string.Empty;
@@ -238,37 +236,33 @@
return mameHistoryContainer;
}
-
-
bool CheckPrerequisites()
{
char separator = ';';
Checker.Clear();
string[] fileDirs = currentApplication.FileDirectory.Split(separator);
-
-
- if (Checker.DoCheck(System.IO.File.Exists(currentApplication.Filename), "mame-application not found!"))
+ if (Checker.DoCheck(System.IO.File.Exists(currentApplication.Executable), "mame-application not found!"))
{
- mameDir = Path.GetDirectoryName(currentApplication.Filename);
+ mameDir = Path.GetDirectoryName(currentApplication.Executable);
catverIniFile = mameDir + "\\catver.ini";
historyDatFile = mameDir + "\\history.dat";
}
if (Checker.IsOk)
{
- SendText("Generating lists...", 0);
+ SendDisplayText("Generating lists...", 0);
ReadListFull();
- SendText("Generating lists.....", 0);
+ SendDisplayText("Generating lists.....", 0);
ReadListClones();
if (System.IO.File.Exists(catverIniFile))
{
- SendText("Reading catver.ini.......", 0);
+ SendDisplayText("Reading catver.ini.......", 0);
ReadCatverIni();
}
if (System.IO.File.Exists(historyDatFile))
{
- SendText("Reading history.dat............", 0);
+ SendDisplayText("Reading history.dat............", 0);
ReadHistoryDat();
}
@@ -287,25 +281,16 @@
return Checker.IsOk;
}
- void SendText(string informationMessage, int progressBarCtr)
- {
- if (OnSendMessage != null)
- {
- OnSendMessage(informationMessage, progressBarCtr);
- }
- }
- public void Start()
+ public void StartImport()
{
if (!CheckPrerequisites())
{
- OnSendMessage(Checker.Problems, 0);
+ SendDisplayText(Checker.Problems, 0);
Log.Info("MameImporter: import failed! Details: {0}", Checker.Problems);
return;
}
int i = 0;
- //trick to slow down progressbarimport..
- localRomNames.Reverse();
double total = localRomNames.Count;
@@ -318,8 +303,8 @@
}
transaction.Commit();
}
-
- SendText("Import done...................", 100);
+
+ SendDisplayText("Import done...................", 100);
}
@@ -367,11 +352,11 @@
FileItem curFile = new FileItem();
curFile.AppID = currentApplication.ApplicationItemId;
curFile.Filename = fullRomname;
- curFile.Imagefile = GetImageFile(curRomname);
+ curFile.Imagefile = ImportImageFiles(curFile.Filename, curFile.Title, currentApplication);
if ((curFile.Imagefile == "") && (currentApplication.ImportValidImagesOnly))
{
- this.SendText("", (int)(100 * (((double)count) / total)));
+ SendDisplayText("", (int)(100 * (((double)count) / total)));
return;
}
if (this.fullRomListDictionary.ContainsKey(curRomname))
@@ -419,7 +404,7 @@
ProcessFullEntry(curFile, fullEntry);
ProcessGenreEntry(curFile, genreEntry);
-
+
int LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblPlatform", "platform", "Arcade");
curFile.PlatformId = LexiconId;
@@ -427,7 +412,7 @@
curFile.Write();
// OnReadNewFile(curFile.Title, count, localRomNames.Length);
- this.SendText(curFile.Title, (int)(100 * (((double)count) / total)));
+ SendDisplayText(curFile.Title, (int)(100 * (((double)count) / total)));
}
}
@@ -435,11 +420,11 @@
}
else
{
- this.SendText("", (int)(100 * (((double)count) / total)));
+ SendDisplayText("", (int)(100 * (((double)count) / total)));
}
}
- void ProcessFullEntry(FileItem curFile, string fullEntry)
+ void ProcessFullEntry(FileItem curFile, string fullEntry)
{
// mspacman "Ms. Pac-Man"
Match m = regexMameGameName.Match(fullEntry);
@@ -483,45 +468,6 @@
}
// mspacman=Maze
}
-
-
- string GetImageFile(string curRomname)
- {
- string res = "";
- string imgFolder = "";
- int i = 0;
- while ((res == "") && (i < currentApplication.imageDirs.Length))
- {
- imgFolder = currentApplication.imageDirs[i];
- res = GetImageFileOfFolder(curRomname, imgFolder);
- i++;
- }
- return res;
- }
-
- string GetImageFileOfFolder(string curRomname, string imgFolder)
- {
- string res = "";
- if (Directory.Exists(imgFolder))
- {
- string filenameNoExtension = imgFolder + "\\" + curRomname;
- if (File.Exists(Path.ChangeExtension(filenameNoExtension, ".png")))
- {
- res = Path.ChangeExtension(filenameNoExtension, ".png");
- }
- else if (File.Exists(Path.ChangeExtension(filenameNoExtension, ".jpg")))
- {
- res = Path.ChangeExtension(filenameNoExtension, ".jpg");
- }
- else if (File.Exists(Path.ChangeExtension(filenameNoExtension, ".gif")))
- {
- res = Path.ChangeExtension(filenameNoExtension, ".gif");
- }
- }
- return res;
- }
-
-
public class MameHistoryContainer
{
@@ -549,6 +495,5 @@
}
}
-
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -37,6 +37,7 @@
using MediaPortal.GUI.Library;
using MediaPortal.Player;
using MediaPortal.Ripper;
+using MediaPortal.Dialogs;
using MediaPortal.Util;
using GUIPrograms;
@@ -65,10 +66,12 @@
protected int GetID = ProgramUtils.GetID;
protected DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
+ protected GUIDialogProgress progressDialog = null;
+
int appID;
int fatherID;
string title;
- string filename;
+ string executable;
string arguments;
ProcessWindowStyle windowStyle;
@@ -81,22 +84,22 @@
private List<ImportOption> importOptionList;
bool enabled;
int appPosition;
-
string currentView = "";
- public List<object> ItemList = new List<object>();
+ public List<object> ItemList = new List<object>();//fileitems or links
public bool filesAreLoaded = false; // load on demand....
public bool linksAreLoaded = false; // load on demand....
bool importMamePlaychoice10 = false;
bool importMameMahjong = false;
bool refreshGUIAllowed = false;
- public string filePath = "";
- ItemType sourceType;
- string sourceFile;
+ ItemType itemType;
+ string applicationItemSource;
string imageFile;
string imageDirectories; // in one string for sqlite db field
- public string[] imageDirs; // imageDirectories splitted
+ private string[] imageDirsSplitted; // imageDirectories splitted
+
+
string fileDirectory;
string validExtensions;
bool importValidImagesOnly;
@@ -134,10 +137,10 @@
set { title = value; }
}
- public string Filename
+ public string Executable
{
- get { return filename; }
- set { filename = value; }
+ get { return executable; }
+ set { executable = value; }
}
public string Imagefile
{
@@ -227,34 +230,39 @@
get { return fileDirectory; }
set { fileDirectory = value; }
}
+
public string ImageDirectory
{
get { return imageDirectories; }
- set { SetImageDirectory(value); }
- }
- private void SetImageDirectory(string value)
- {
- imageDirectories = value;
- imageDirs = imageDirectories.Split(';');
- for (int i = 0; i < imageDirs.Length; i++)
+ set
{
- imageDirs[i] = imageDirs[i].Trim();
- // hack the \n away....
- // imageDirs[i] = imageDirs[i].TrimStart('\n');
- // hack trailing backslashes away
- imageDirs[i] = imageDirs[i].TrimEnd('\\');
+ imageDirectories = value;
+
+ //also do the split
+ imageDirsSplitted = imageDirectories.Split(';');
+ for (int i = 0; i < imageDirsSplitted.Length; i++)
+ {
+ imageDirsSplitted[i] = imageDirsSplitted[i].Trim();
+ imageDirsSplitted[i] = imageDirsSplitted[i].TrimEnd('\\');
+ }
}
}
- public string Source
+
+ public string[] ImageDirsSplitted
{
- get { return sourceFile; }
- set { sourceFile = value; }
+ get { return imageDirsSplitted; }
}
- public ItemType SourceType
+
+ public string ApplicationItemSource
{
- get { return sourceType; }
- set { sourceType = value; }
+ get { return applicationItemSource; }
+ set { applicationItemSource = value; }
}
+ public ItemType Item_Type
+ {
+ get { return itemType; }
+ set { itemType = value; }
+ }
public string ValidExtensions
{
get { return validExtensions; }
@@ -271,6 +279,7 @@
get { return platformId; }
set { platformId = value; }
}
+
public string LaunchErrorMsg
{
get { return launchErrorMsg; }
@@ -288,15 +297,15 @@
appID = -1;
fatherID = -1;
title = "";
- filename = "";
+ executable = "";
arguments = "";
windowStyle = ProcessWindowStyle.Normal;
startupDir = "%FILEDIR%";
useShellExecute = false;
useQuotes = true;
enabled = true;
- sourceType = ItemType.UNKNOWN;
- sourceFile = "";
+ itemType = ItemType.UNKNOWN;
+ applicationItemSource = "";
imageFile = "";
fileDirectory = "";
imageDirectories = "";
@@ -315,16 +324,34 @@
#region protected methods
- protected void LaunchFilelink(FilelinkItem curLink, bool MPGUIMode)
+
+ protected void ShowProgressDialog(string headerText)
{
- /*ApplicationItem targetApp = GetAppByID(curLink.TargetAppID);
- if (targetApp != null)
+ progressDialog = (GUIDialogProgress)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_PROGRESS);
+ progressDialog.ShowWaitCursor = true;
+ progressDialog.SetHeading(headerText);
+ progressDialog.SetLine(0,headerText);
+ progressDialog.SetLine(1, "");
+ progressDialog.SetLine(2, "");
+ progressDialog.StartModal(GetID);
+ progressDialog.Progress();
+ }
+
+ public void ReadNewFile(string informationMessage, int progressBarCtr)
+ {
+ if (progressDialog != null)
{
- targetApp.LaunchFile(curLink, MPGUIMode);
- }*/
+ progressDialog.SetLine(2, String.Format("{0} {1}", GUILocalizeStrings.Get(13005), informationMessage)); // "last imported file {0}"
+ /* if ((curPos > 0) && (maxPos > 0))
+ {
+ int perc = 100 * curPos / maxPos;
+ guiDialogProgress.SetPercentage(perc);
+ }*/
+ progressDialog.Progress();
+ }
+ SendRefreshInfo(String.Format("{0} {1}", GUILocalizeStrings.Get(13005), informationMessage), progressBarCtr);
}
-
protected void SendRefreshInfo(string informationMessage, int progressBarCtr)
{
if (OnRefreshInfo != null)
@@ -398,11 +425,15 @@
}
}
+ protected virtual void Import(bool mpGUIMode)
+ {
+ //override
+ }
+
#endregion protected methods
#region Public Methods
-
public virtual string CurrentFilePath()
{
return this.FileDirectory;
@@ -414,14 +445,14 @@
this.ApplicationItemId = sourceApp.ApplicationItemId;
this.FatherID = sourceApp.FatherID;
this.Title = sourceApp.Title;
- this.Filename = sourceApp.Filename;
+ this.Executable = sourceApp.Executable;
this.Arguments = sourceApp.Arguments;
this.WindowStyle = sourceApp.WindowStyle;
this.StartupDir = sourceApp.StartupDir;
this.UseShellExecute = sourceApp.UseShellExecute;
this.UseQuotes = sourceApp.UseQuotes;
- this.SourceType = sourceApp.SourceType;
- this.Source = sourceApp.Source;
+ this.Item_Type = sourceApp.Item_Type;
+ this.ApplicationItemSource = sourceApp.ApplicationItemSource;
this.Imagefile = sourceApp.Imagefile;
this.FileDirectory = sourceApp.FileDirectory;
this.ImageDirectory = sourceApp.ImageDirectory;
@@ -432,7 +463,6 @@
this.PreLaunch = sourceApp.PreLaunch;
this.PostLaunch = sourceApp.PostLaunch;
this.PlatformId = sourceApp.PlatformId;
-
}
public FileItem PrevFile(FileItem curFile)
@@ -467,7 +497,6 @@
{
FileItem curFileItem = launchItem;
if (curFileItem == null) return;
-
this.LaunchFile(curFileItem, true);
}
@@ -476,19 +505,17 @@
string filename = fileItem.Filename;
if (filename == "") return;
- // Launch File by item
- if (mpGuiMode)
- fileItem.UpdateLaunchInfo();
+ fileItem.UpdateLaunchInfo();
ProcessStartInfo procStart = new ProcessStartInfo();
- if (this.Filename != "")
- { // use the APPLICATION launcher and add current file information
+ // use the APPLICATION launcher and add current file information
+ if (this.Executable != "")
+ {
+ // executable of the application
+ procStart.FileName = this.Executable;
- // filename of the application
- procStart.FileName = this.Filename;
-
- // double quotes around the filename-argument.....
+ // double quotes around the executable-argument.....
if (UseQuotes)
filename = "\"" + fileItem.Filename + "\"";
@@ -496,7 +523,7 @@
if (this.Arguments.Contains("%FILEnoPATHnoEXT%"))
// ex. kawaks:
// winkawaks.exe alpham2
- // => filename without path and extension is necessary!
+ // => executable without path and extension is necessary!
procStart.Arguments = " " + this.Arguments.Replace("%FILEnoPATHnoEXT%", Path.GetFileNameWithoutExtension(fileItem.Filename));
else if (this.Arguments.Contains("%FILE%"))
// placeholder found => replace the placeholder by the correct filename
@@ -625,10 +652,60 @@
// descendant classes do that!
}
- #endregion Public Methods
+ public void LoadFromXmlProfile(XmlNode node)
+ {
+ XmlNode titleNode = node.SelectSingleNode("title");
+ if (titleNode != null)
+ {
+ this.Title = titleNode.InnerText;
+ }
+ XmlNode launchingAppNode = node.SelectSingleNode("launchingApplication");
+ if (launchingAppNode != null)
+ {
+ this.Executable = launchingAppNode.InnerText;
+ }
+ XmlNode useShellExecuteNode = node.SelectSingleNode("useShellExecute");
+ if (useShellExecuteNode != null)
+ {
+ this.UseShellExecute = ProgramUtils.StrToBoolean(useShellExecuteNode.InnerText);
+ }
+
+ XmlNode argumentsNode = node.SelectSingleNode("arguments");
+ if (argumentsNode != null)
+ {
+ this.Arguments = argumentsNode.InnerText;
+ }
+
+ XmlNode windowStyleNode = node.SelectSingleNode("windowStyle");
+ if (windowStyleNode != null)
+ {
+ this.WindowStyle = ProgramUtils.StringToWindowStyle(windowStyleNode.InnerText);
+ }
+
+ XmlNode startupDirNode = node.SelectSingleNode("startupDir");
+ if (startupDirNode != null)
+ {
+ this.StartupDir = startupDirNode.InnerText;
+ }
+
+ XmlNode useQuotesNode = node.SelectSingleNode("useQuotes");
+ if (useQuotesNode != null)
+ {
+ this.UseQuotes = ProgramUtils.StrToBoolean(useQuotesNode.InnerText);
+ }
+
+ XmlNode fileExtensioneNode = node.SelectSingleNode("fileextensions");
+ if (fileExtensioneNode != null)
+ {
+ this.ValidExtensions = fileExtensioneNode.InnerText;
+ }
+ }
+
+ #endregion Public Methods
+
#region Database stuff
/// <summary>
@@ -656,14 +733,14 @@
parameterArray[0] = dbHandlerInstance.GetParameter<int>(ApplicationItemId, "@applicationItemId", DbType.Int32);
parameterArray[1] = dbHandlerInstance.GetParameter<int>(FatherID, "@fatherNodeId", DbType.Int32);
parameterArray[2] = dbHandlerInstance.GetParameter<string>(Title, "@title", DbType.String);
- parameterArray[3] = dbHandlerInstance.GetParameter<string>(Filename, "@filename", DbType.String);
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>(Executable, "@filename", DbType.String);
parameterArray[4] = dbHandlerInstance.GetParameter<string>(Arguments, "@arguments", DbType.String);
parameterArray[5] = dbHandlerInstance.GetParameter<string>(ProgramUtils.WindowStyleToStr(WindowStyle), "@windowStyle", DbType.String);
parameterArray[6] = dbHandlerInstance.GetParameter<string>(StartupDir, "@startupDir", DbType.String);
parameterArray[7] = dbHandlerInstance.GetParameter<bool>(UseShellExecute, "@useShellExecute", DbType.Boolean);
parameterArray[8] = dbHandlerInstance.GetParameter<bool>(UseQuotes, "@useQuotes", DbType.Boolean);
- parameterArray[9] = dbHandlerInstance.GetParameter<string>(ProgramUtils.ApplicationTypeToString(SourceType), "@applicationItemType", DbType.String);
- parameterArray[10] = dbHandlerInstance.GetParameter<string>(Source, "@source", DbType.String);
+ parameterArray[9] = dbHandlerInstance.GetParameter<string>(ProgramUtils.ApplicationTypeToString(Item_Type), "@applicationItemType", DbType.String);
+ parameterArray[10] = dbHandlerInstance.GetParameter<string>(ApplicationItemSource, "@source", DbType.String);
parameterArray[11] = dbHandlerInstance.GetParameter<string>(imageFile, "@imageFile", DbType.String);
parameterArray[12] = dbHandlerInstance.GetParameter<string>(FileDirectory, "@fileDirectory", DbType.String);
parameterArray[13] = dbHandlerInstance.GetParameter<string>(ImageDirectory, "@imageDirectory", DbType.String);
@@ -754,14 +831,14 @@
parameterArray[0] = dbHandlerInstance.GetParameter<int>(ApplicationItemId, "@applicationItemId", DbType.Int32);
parameterArray[1] = dbHandlerInstance.GetParameter<int>(FatherID, "@fatherNodeId", DbType.Int32);
parameterArray[2] = dbHandlerInstance.GetParameter<string>(Title, "@title", DbType.String);
- parameterArray[3] = dbHandlerInstance.GetParameter<string>(Filename, "@filename", DbType.String);
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>(Executable, "@filename", DbType.String);
parameterArray[4] = dbHandlerInstance.GetParameter<string>(Arguments, "@arguments", DbType.String);
parameterArray[5] = dbHandlerInstance.GetParameter<string>(ProgramUtils.WindowStyleToStr(WindowStyle), "@windowStyle", DbType.String);
parameterArray[6] = dbHandlerInstance.GetParameter<string>(StartupDir, "@startupDir", DbType.String);
parameterArray[7] = dbHandlerInstance.GetParameter<bool>(UseShellExecute, "@useShellExecute", DbType.Boolean);
parameterArray[8] = dbHandlerInstance.GetParameter<bool>(UseQuotes, "@useQuotes", DbType.Boolean);
- parameterArray[9] = dbHandlerInstance.GetParameter<string>(ProgramUtils.ApplicationTypeToString(SourceType), "@applicationItemType", DbType.String);
- parameterArray[10] = dbHandlerInstance.GetParameter<string>(Source, "@source", DbType.String);
+ parameterArray[9] = dbHandlerInstance.GetParameter<string>(ProgramUtils.ApplicationTypeToString(Item_Type), "@applicationItemType", DbType.String);
+ parameterArray[10] = dbHandlerInstance.GetParameter<string>(ApplicationItemSource, "@source", DbType.String);
parameterArray[11] = dbHandlerInstance.GetParameter<string>(imageFile, "@imageFile", DbType.String);
parameterArray[12] = dbHandlerInstance.GetParameter<string>(FileDirectory, "@fileDirectory", DbType.String);
parameterArray[13] = dbHandlerInstance.GetParameter<string>(ImageDirectory, "@imageDirectory", DbType.String);
@@ -866,8 +943,6 @@
public virtual void LoadFiles()
{
- lastFilepath = "";
- filePath = "";
ItemList = dbHandlerInstance.LoadItemList(ApplicationItemId, ItemList, "");
filesAreLoaded = true;
}
@@ -942,22 +1017,24 @@
#region imagedirectory stuff
// get next imagedirectory that holds at least one image for a fileitem
- // * m_pFile: the file we're looking images for
+ // * the file we're looking images for
private void GetNextThumbFolderIndex(FileItem fileItem)
{
if (fileItem == null) return;
+
bool foundThumb = false;
+
while (!foundThumb)
{
thumbFolderIndex++;
- if (thumbFolderIndex >= imageDirs.Length)
+ if (thumbFolderIndex >= imageDirsSplitted.Length)
{
thumbFolderIndex = -1;
foundThumb = true;
}
else
{
- string candFolder = imageDirs[thumbFolderIndex];
+ string candFolder = imageDirsSplitted[thumbFolderIndex];
string candThumb = candFolder + "\\" + Path.GetFileName(fileItem.Imagefile);
if (candThumb.ToLower() != fileItem.Imagefile.ToLower())
{
@@ -1007,7 +1084,7 @@
}
else
{
- string curFolder = imageDirs[thumbFolderIndex];
+ string curFolder = imageDirsSplitted[thumbFolderIndex];
curThumb = curFolder + "\\" + Path.GetFileName(fileItem.Imagefile);
}
@@ -1073,56 +1150,6 @@
#endregion
- public void LoadFromXmlProfile(XmlNode node)
- {
-
- XmlNode titleNode = node.SelectSingleNode("title");
- if (titleNode != null)
- {
- this.Title = titleNode.InnerText;
- }
-
- XmlNode launchingAppNode = node.SelectSingleNode("launchingApplication");
- if (launchingAppNode != null)
- {
- this.Filename = launchingAppNode.InnerText;
- }
-
- XmlNode useShellExecuteNode = node.SelectSingleNode("useShellExecute");
- if (useShellExecuteNode != null)
- {
- this.UseShellExecute = ProgramUtils.StrToBoolean(useShellExecuteNode.InnerText);
- }
-
- XmlNode argumentsNode = node.SelectSingleNode("arguments");
- if (argumentsNode != null)
- {
- this.Arguments = argumentsNode.InnerText;
- }
-
- XmlNode windowStyleNode = node.SelectSingleNode("windowStyle");
- if (windowStyleNode != null)
- {
- this.WindowStyle = ProgramUtils.StringToWindowStyle(windowStyleNode.InnerText);
- }
-
- XmlNode startupDirNode = node.SelectSingleNode("startupDir");
- if (startupDirNode != null)
- {
- this.StartupDir = startupDirNode.InnerText;
- }
-
- XmlNode useQuotesNode = node.SelectSingleNode("useQuotes");
- if (useQuotesNode != null)
- {
- this.UseQuotes = ProgramUtils.StrToBoolean(useQuotesNode.InnerText);
- }
-
- XmlNode fileExtensioneNode = node.SelectSingleNode("fileextensions");
- if (fileExtensioneNode != null)
- {
- this.ValidExtensions = fileExtensioneNode.InnerText;
- }
- }
+
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs 2007-08-19 14:44:46 UTC (rev 846)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs 2007-08-19 23:23:20 UTC (rev 847)
@@ -23,6 +23,9 @@
#endregion
+
+
+#region Imports
using System;
using System.Collections;
using System.Collections.Generic;
@@ -35,9 +38,13 @@
using MediaPortal.Util;
using GUIPrograms;
+using GUIPrograms.Imports;
using GUIPrograms.Database;
-using GUIPrograms.Items;
+using GUIPrograms.Items;
+
+#endregion Imports
+
namespace GUIPrograms.Items
{
/// <summary>
@@ -45,268 +52,57 @@
/// </summary>
public class ApplicationItemDirectoryCache : ApplicationItem
{
- GUIDialogProgress progressDialog = null;
- public ApplicationItemDirectoryCache() { }
- private void ShowProgressDialog()
- {
- progressDialog = (GUIDialogProgress)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_PROGRESS);
- progressDialog.ShowWaitCursor = true;
- progressDialog.SetHeading(GUILocalizeStrings.Get(13014));
- progressDialog.SetLine(0, GUILocalizeStrings.Get(13014));
- progressDialog.SetLine(1, "");
- progressDialog.SetLine(2, "");
- progressDialog.StartModal(GetID);
- progressDialog.Progress();
- }
+ #region ApplicationItem Overloads
- private void CloseProgressDialog()
+ public override string DefaultFilepath()
{
- progressDialog.Close();
+ return this.FileDirectory;
}
- private string GetThumbsFile(FileInfo file, string fileTitle)
+ public override bool ProfileLoadingAllowed()
{
- string thumbFolder = "";
-
- if (imageDirs.Length > 0)
- {
- string mainImgFolder = "";
-
- foreach (string imgFolder in imageDirs)
- {
- if (System.IO.Directory.Exists(imgFolder))
- {
- mainImgFolder = imgFolder;
- }
- }
-
- if ("" != mainImgFolder)
- {
- string curDir = mainImgFolder + "\\";
- string filenameNoExtension = mainImgFolder + "\\" + file.Name;
- filenameNoExtension = Path.ChangeExtension(filenameNoExtension, null);
- filenameNoExtension = Path.GetFileNameWithoutExtension(filenameNoExtension);
-
- string[] exactMatchesJPG = Directory.GetFiles(curDir, filenameNoExtension + ".jpg");
- string[] exactMatchesGIF = Directory.GetFiles(curDir, filenameNoExtension + ".gif");
- string[] exactMatchesPNG = Directory.GetFiles(curDir, filenameNoExtension + ".png");
- if (exactMatchesJPG.Length > 0)
- {
- thumbFolder = exactMatchesJPG[0];
- }
- else if (exactMatchesGIF.Length > 0)
- {
- thumbFolder = exactMatchesGIF[0];
- }
- else if (exactMatchesPNG.Length > 0)
- {
...
[truncated message content] |
|
From: <an...@us...> - 2007-08-19 14:44:48
|
Revision: 846
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=846&view=rev
Author: and-81
Date: 2007-08-19 07:44:46 -0700 (Sun, 19 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.resx
trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MessageCommand.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -53,7 +53,8 @@
this.comboBoxComputer = new System.Windows.Forms.ComboBox();
this.groupBoxCommands = new System.Windows.Forms.GroupBox();
this.comboBoxPort = new System.Windows.Forms.ComboBox();
- this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+ this.toolTips = new System.Windows.Forms.ToolTip(this.components);
+ this.buttonIRBlastAutoTest = new System.Windows.Forms.Button();
this.buttonHelp = new System.Windows.Forms.Button();
this.groupBoxGenerateMessage.SuspendLayout();
this.groupBoxStatus.SuspendLayout();
@@ -70,7 +71,7 @@
this.buttonBlast.Size = new System.Drawing.Size(64, 24);
this.buttonBlast.TabIndex = 2;
this.buttonBlast.Text = "Blast IR";
- this.toolTip.SetToolTip(this.buttonBlast, "Blast learned IR code");
+ this.toolTips.SetToolTip(this.buttonBlast, "Blast learned IR code");
this.buttonBlast.UseVisualStyleBackColor = true;
this.buttonBlast.Click += new System.EventHandler(this.buttonBlast_Click);
//
@@ -81,7 +82,7 @@
this.buttonLearnIR.Size = new System.Drawing.Size(64, 24);
this.buttonLearnIR.TabIndex = 0;
this.buttonLearnIR.Text = "Learn IR";
- this.toolTip.SetToolTip(this.buttonLearnIR, "Learn an IR code");
+ this.toolTips.SetToolTip(this.buttonLearnIR, "Learn an IR code");
this.buttonLearnIR.UseVisualStyleBackColor = true;
this.buttonLearnIR.Click += new System.EventHandler(this.buttonLearnIR_Click);
//
@@ -103,7 +104,7 @@
this.buttonConnect.Size = new System.Drawing.Size(80, 24);
this.buttonConnect.TabIndex = 2;
this.buttonConnect.Text = "Connect";
- this.toolTip.SetToolTip(this.buttonConnect, "Connect to server");
+ this.toolTips.SetToolTip(this.buttonConnect, "Connect to server");
this.buttonConnect.UseVisualStyleBackColor = true;
this.buttonConnect.Click += new System.EventHandler(this.buttonConnect_Click);
//
@@ -115,7 +116,7 @@
this.buttonDisconnect.Size = new System.Drawing.Size(80, 24);
this.buttonDisconnect.TabIndex = 3;
this.buttonDisconnect.Text = "Disconnect";
- this.toolTip.SetToolTip(this.buttonDisconnect, "Disconnect from server");
+ this.toolTips.SetToolTip(this.buttonDisconnect, "Disconnect from server");
this.buttonDisconnect.UseVisualStyleBackColor = true;
this.buttonDisconnect.Click += new System.EventHandler(this.buttonDisconnect_Click);
//
@@ -127,7 +128,7 @@
this.buttonShutdownServer.Size = new System.Drawing.Size(64, 24);
this.buttonShutdownServer.TabIndex = 5;
this.buttonShutdownServer.Text = "Shutdown";
- this.toolTip.SetToolTip(this.buttonShutdownServer, "Shutdown server");
+ this.toolTips.SetToolTip(this.buttonShutdownServer, "Shutdown server");
this.buttonShutdownServer.UseVisualStyleBackColor = true;
this.buttonShutdownServer.Click += new System.EventHandler(this.buttonShutdownServer_Click);
//
@@ -144,7 +145,7 @@
this.listBoxStatus.ScrollAlwaysVisible = true;
this.listBoxStatus.Size = new System.Drawing.Size(424, 192);
this.listBoxStatus.TabIndex = 0;
- this.toolTip.SetToolTip(this.listBoxStatus, "Status messages");
+ this.toolTips.SetToolTip(this.listBoxStatus, "Status messages");
//
// buttonCrash
//
@@ -154,7 +155,7 @@
this.buttonCrash.Size = new System.Drawing.Size(64, 24);
this.buttonCrash.TabIndex = 6;
this.buttonCrash.Text = "Crash";
- this.toolTip.SetToolTip(this.buttonCrash, "Crash this program");
+ this.toolTips.SetToolTip(this.buttonCrash, "Crash this program");
this.buttonCrash.UseVisualStyleBackColor = true;
this.buttonCrash.Click += new System.EventHandler(this.buttonCrash_Click);
//
@@ -166,7 +167,7 @@
this.buttonListConnected.Size = new System.Drawing.Size(64, 24);
this.buttonListConnected.TabIndex = 8;
this.buttonListConnected.Text = "# clients";
- this.toolTip.SetToolTip(this.buttonListConnected, "Get client count from server");
+ this.toolTips.SetToolTip(this.buttonListConnected, "Get client count from server");
this.buttonListConnected.UseVisualStyleBackColor = true;
this.buttonListConnected.Click += new System.EventHandler(this.buttonListConnected_Click);
//
@@ -178,7 +179,7 @@
this.buttonPing.Size = new System.Drawing.Size(64, 24);
this.buttonPing.TabIndex = 7;
this.buttonPing.Text = "Ping";
- this.toolTip.SetToolTip(this.buttonPing, "Ping the server");
+ this.toolTips.SetToolTip(this.buttonPing, "Ping the server");
this.buttonPing.UseVisualStyleBackColor = true;
this.buttonPing.Click += new System.EventHandler(this.buttonPing_Click);
//
@@ -205,7 +206,7 @@
this.textBoxCustom.Name = "textBoxCustom";
this.textBoxCustom.Size = new System.Drawing.Size(352, 56);
this.textBoxCustom.TabIndex = 0;
- this.toolTip.SetToolTip(this.textBoxCustom, "Create a custom message to send to the server");
+ this.toolTips.SetToolTip(this.textBoxCustom, "Create a custom message to send to the server");
//
// buttonSendCustom
//
@@ -215,7 +216,7 @@
this.buttonSendCustom.Size = new System.Drawing.Size(56, 24);
this.buttonSendCustom.TabIndex = 1;
this.buttonSendCustom.Text = "Send";
- this.toolTip.SetToolTip(this.buttonSendCustom, "Send custom message to server");
+ this.toolTips.SetToolTip(this.buttonSendCustom, "Send custom message to server");
this.buttonSendCustom.UseVisualStyleBackColor = true;
this.buttonSendCustom.Click += new System.EventHandler(this.buttonSendCustom_Click);
//
@@ -271,7 +272,7 @@
this.numericUpDownButton.TabIndex = 2;
this.numericUpDownButton.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.numericUpDownButton.ThousandsSeparator = true;
- this.toolTip.SetToolTip(this.numericUpDownButton, "Specify a custom button code to forward to the server");
+ this.toolTips.SetToolTip(this.numericUpDownButton, "Specify a custom button code to forward to the server");
//
// comboBoxRemoteButtons
//
@@ -283,7 +284,7 @@
this.comboBoxRemoteButtons.Name = "comboBoxRemoteButtons";
this.comboBoxRemoteButtons.Size = new System.Drawing.Size(120, 21);
this.comboBoxRemoteButtons.TabIndex = 0;
- this.toolTip.SetToolTip(this.comboBoxRemoteButtons, "Choose a remote control button to forward to the server");
+ this.toolTips.SetToolTip(this.comboBoxRemoteButtons, "Choose a remote control button to forward to the server");
this.comboBoxRemoteButtons.SelectedIndexChanged += new System.EventHandler(this.comboBoxRemoteButtons_SelectedIndexChanged);
//
// buttonSendRemoteButton
@@ -350,8 +351,21 @@
this.comboBoxPort.Name = "comboBoxPort";
this.comboBoxPort.Size = new System.Drawing.Size(80, 21);
this.comboBoxPort.TabIndex = 3;
- this.toolTip.SetToolTip(this.comboBoxPort, "Port for blasting IR");
+ this.toolTips.SetToolTip(this.comboBoxPort, "Port for blasting IR");
//
+ // buttonIRBlastAutoTest
+ //
+ this.buttonIRBlastAutoTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonIRBlastAutoTest.Location = new System.Drawing.Point(336, 536);
+ this.buttonIRBlastAutoTest.Name = "buttonIRBlastAutoTest";
+ this.buttonIRBlastAutoTest.Size = new System.Drawing.Size(112, 24);
+ this.buttonIRBlastAutoTest.TabIndex = 8;
+ this.buttonIRBlastAutoTest.Text = "IRBlast Auto-Test";
+ this.toolTips.SetToolTip(this.buttonIRBlastAutoTest, "Runs a random number blasting test");
+ this.buttonIRBlastAutoTest.UseVisualStyleBackColor = true;
+ this.buttonIRBlastAutoTest.Visible = false;
+ this.buttonIRBlastAutoTest.Click += new System.EventHandler(this.buttonAutoTest_Click);
+ //
// buttonHelp
//
this.buttonHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -368,6 +382,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(456, 566);
+ this.Controls.Add(this.buttonIRBlastAutoTest);
this.Controls.Add(this.buttonHelp);
this.Controls.Add(this.groupBoxCommands);
this.Controls.Add(this.groupBoxSetup);
@@ -415,10 +430,11 @@
private System.Windows.Forms.Label labelCustomButton;
private System.Windows.Forms.GroupBox groupBoxSetup;
private System.Windows.Forms.GroupBox groupBoxCommands;
- private System.Windows.Forms.ToolTip toolTip;
+ private System.Windows.Forms.ToolTip toolTips;
private System.Windows.Forms.ComboBox comboBoxPort;
private System.Windows.Forms.ComboBox comboBoxComputer;
private System.Windows.Forms.Button buttonHelp;
+ private System.Windows.Forms.Button buttonIRBlastAutoTest;
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -3,11 +3,13 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
+using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Runtime.InteropServices;
using System.Security;
using System.Text;
+using System.Threading;
using System.Windows.Forms;
using NamedPipes;
@@ -587,6 +589,40 @@
#endregion Controls
+ Thread AutoTest;
+
+ private void buttonAutoTest_Click(object sender, EventArgs e)
+ {
+ AutoTest = new Thread(new ThreadStart(AutoTestThread));
+ AutoTest.IsBackground = true;
+ AutoTest.Start();
+ }
+
+ void AutoTestThread()
+ {
+ Random rand = new Random();
+
+ int randomNumber;
+
+ Process process = new Process();
+ process.StartInfo.FileName = "IRBlast-NoWindow.exe";
+ process.StartInfo.WorkingDirectory = "C:\\Program Files\\IR Server Suite\\IR Blast\\";
+
+ while (true)
+ {
+ randomNumber = rand.Next(100000);
+
+ this.Invoke(_AddStatusLine, new Object[] { String.Format("AutoTest: {0}", randomNumber) });
+
+ process.StartInfo.Arguments = "-host localhost -pad 4 -channel " + randomNumber.ToString();
+
+ process.Start();
+ process.WaitForExit();
+
+ Thread.Sleep(10000);
+ }
+ }
+
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.resx
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.resx 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.resx 2007-08-19 14:44:46 UTC (rev 846)
@@ -117,7 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -42,7 +42,7 @@
{
// TODO: Change log level to info for release.
IrssLog.LogLevel = IrssLog.Level.Debug;
- IrssLog.Open(Common.FolderIrssLogs + "IR Blast.log");
+ IrssLog.Append(Common.FolderIrssLogs + "IR Blast.log");
ShowHeader();
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -43,7 +43,7 @@
{
// TODO: Change log level to info for release.
IrssLog.LogLevel = IrssLog.Level.Debug;
- IrssLog.Open(Common.FolderIrssLogs + "IR Blast (No Window).log");
+ IrssLog.Append(Common.FolderIrssLogs + "IR Blast (No Window).log");
try
{
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -3,6 +3,7 @@
using System.Diagnostics;
using System.IO;
using System.Reflection;
+using System.Threading;
using System.Windows.Forms;
using Microsoft.Win32;
@@ -34,30 +35,34 @@
return;
}
- // Open log file
- try
- {
- // TODO: Change log level to info for release.
- IrssLog.LogLevel = IrssLog.Level.Debug;
- IrssLog.Open(Common.FolderIrssLogs + "IR Server.log");
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.Message);
- return;
- }
+ // TODO: Change log level to info for release.
+ IrssLog.LogLevel = IrssLog.Level.Debug;
+ IrssLog.Open(Common.FolderIrssLogs + "IR Server.log");
+ Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException);
+
// Start Server
IRServer irServer = new IRServer();
if (irServer.Start())
Application.Run();
+ Application.ThreadException -= new ThreadExceptionEventHandler(Application_ThreadException);
+
IrssLog.Close();
- return;
}
/// <summary>
+ /// Handles unhandled exceptions.
+ /// </summary>
+ /// <param name="sender">Sender.</param>
+ /// <param name="e">Event args.</param>
+ public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
+ {
+ IrssLog.Error(e.Exception.ToString());
+ }
+
+ /// <summary>
/// Retreives a list of available IR Server plugins.
/// </summary>
/// <returns>Array of plugin instances.</returns>
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -81,12 +81,15 @@
void InsertKeystroke(string keystroke)
{
- string clipboardWas = Clipboard.GetText();
+ //string clipboardWas = Clipboard.GetText();
- Clipboard.SetText(keystroke);
- textBoxKeys.Paste();
+ //Clipboard.SetText(keystroke);
+ textBoxKeys.Paste(keystroke);
- Clipboard.SetText(clipboardWas);
+ //if (String.IsNullOrEmpty(clipboardWas))
+// Clipboard.SetText(String.Empty);
+ //else
+// Clipboard.SetText(clipboardWas);
}
private void ButtonMappingForm_Load(object sender, EventArgs e)
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -75,13 +75,13 @@
this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.serverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.translatorHelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.serverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
this.groupBoxProgram.SuspendLayout();
@@ -573,46 +573,58 @@
this.toolStripSeparator2,
this.quitToolStripMenuItem});
this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem";
- this.configurationToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
+ this.configurationToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.configurationToolStripMenuItem.Text = "&File";
//
// newToolStripMenuItem
//
this.newToolStripMenuItem.Name = "newToolStripMenuItem";
- this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.newToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
this.newToolStripMenuItem.Text = "&New";
this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
//
// openToolStripMenuItem
//
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
- this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.openToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
this.openToolStripMenuItem.Text = "&Open ...";
this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
//
// importToolStripMenuItem
//
this.importToolStripMenuItem.Name = "importToolStripMenuItem";
- this.importToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.importToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
this.importToolStripMenuItem.Text = "&Import ...";
this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click);
//
// exportToolStripMenuItem
//
this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
- this.exportToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.exportToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
this.exportToolStripMenuItem.Text = "&Export ...";
this.exportToolStripMenuItem.Click += new System.EventHandler(this.exportToolStripMenuItem_Click);
//
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(119, 6);
+ //
+ // serverToolStripMenuItem
+ //
+ this.serverToolStripMenuItem.Name = "serverToolStripMenuItem";
+ this.serverToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+ this.serverToolStripMenuItem.Text = "&Server ...";
+ this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click);
+ //
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(119, 6);
//
// quitToolStripMenuItem
//
this.quitToolStripMenuItem.Name = "quitToolStripMenuItem";
- this.quitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.quitToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
this.quitToolStripMenuItem.Text = "&Quit";
this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click);
//
@@ -622,35 +634,23 @@
this.translatorHelpToolStripMenuItem,
this.aboutToolStripMenuItem});
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
- this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
+ this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.helpToolStripMenuItem.Text = "&Help";
//
// translatorHelpToolStripMenuItem
//
this.translatorHelpToolStripMenuItem.Name = "translatorHelpToolStripMenuItem";
- this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
this.translatorHelpToolStripMenuItem.Text = "&Contents";
this.translatorHelpToolStripMenuItem.Click += new System.EventHandler(this.translatorHelpToolStripMenuItem_Click);
//
// aboutToolStripMenuItem
//
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
- this.aboutToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.aboutToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
this.aboutToolStripMenuItem.Text = "&About";
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
//
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
- //
- // serverToolStripMenuItem
- //
- this.serverToolStripMenuItem.Name = "serverToolStripMenuItem";
- this.serverToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.serverToolStripMenuItem.Text = "&Server ...";
- this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click);
- //
// openFileDialog
//
this.openFileDialog.FileName = "openFileDialog1";
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -105,6 +105,8 @@
IrssLog.LogLevel = IrssLog.Level.Debug;
IrssLog.Open(Common.FolderIrssLogs + "Translator.log");
+ Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException);
+
_config = Configuration.Load(ConfigFile);
if (_config == null)
_config = new Configuration();
@@ -161,6 +163,8 @@
//if (_focusWatcher.IsAlive)
//_focusWatcher.Abort();
+ Application.ThreadException -= new ThreadExceptionEventHandler(Application_ThreadException);
+
IrssLog.Close();
}
@@ -168,6 +172,16 @@
#region Implementation
+ /// <summary>
+ /// Handles unhandled exceptions.
+ /// </summary>
+ /// <param name="sender">Sender.</param>
+ /// <param name="e">Event args.</param>
+ public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
+ {
+ IrssLog.Error(e.Exception.ToString());
+ }
+
/*static void FocusWatcherThread()
{
try
@@ -255,11 +269,11 @@
static void ShowTranslatorMenu()
{
UpdateForegroundWindow();
-
+
+ //Program._mainForm.Focus();
+
_notifyIcon.ContextMenuStrip.Show(Screen.PrimaryScreen.Bounds.Width / 4, Screen.PrimaryScreen.Bounds.Height / 4);
-
- //Win32.SetForegroundWindow(_notifyIcon.ContextMenuStrip.Handle, true);
-
+
//_notifyIcon.ContextMenuStrip.Focus();
}
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -1,5 +1,6 @@
using System;
using System.Diagnostics;
+using System.Threading;
using System.Windows.Forms;
using IrssUtils;
@@ -9,7 +10,10 @@
static class Program
{
-
+
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
[STAThread]
static void Main()
{
@@ -24,14 +28,28 @@
IrssLog.LogLevel = IrssLog.Level.Debug;
IrssLog.Open(Common.FolderIrssLogs + "Tray Launcher.log");
+ Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException);
+
Tray tray = new Tray();
if (tray.Start())
Application.Run();
+ Application.ThreadException -= new ThreadExceptionEventHandler(Application_ThreadException);
+
IrssLog.Close();
}
+ /// <summary>
+ /// Handles unhandled exceptions.
+ /// </summary>
+ /// <param name="sender">Sender.</param>
+ /// <param name="e">Event args.</param>
+ public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
+ {
+ IrssLog.Error(e.Exception.ToString());
+ }
+
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -535,7 +535,10 @@
{
if (Path.GetFileName(process.MainModule.ModuleName).Equals(Path.GetFileName(_programFile), StringComparison.InvariantCultureIgnoreCase))
{
- IrssLog.Info("Program already running");
+ IrssLog.Info("Program already running, attempting to give focus.");
+
+ Win32.SetForegroundWindow(process.MainWindowHandle, true);
+
return;
}
}
@@ -545,7 +548,7 @@
// Launch program
Process launch = new Process();
launch.StartInfo.FileName = _programFile;
- launch.StartInfo.UseShellExecute = true;
+ launch.StartInfo.UseShellExecute = false;
launch.Start();
}
catch (Exception ex)
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -88,6 +88,8 @@
IrssLog.LogLevel = IrssLog.Level.Debug;
IrssLog.Open(Common.FolderIrssLogs + "Virtual Remote.log");
+ Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException);
+
LoadSettings();
if (args.Length > 0) // Command Line Start ...
@@ -170,9 +172,21 @@
StopComms();
+ Application.ThreadException -= new ThreadExceptionEventHandler(Application_ThreadException);
+
IrssLog.Close();
}
+ /// <summary>
+ /// Handles unhandled exceptions.
+ /// </summary>
+ /// <param name="sender">Sender.</param>
+ /// <param name="e">Event args.</param>
+ public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
+ {
+ IrssLog.Error(e.Exception.ToString());
+ }
+
static void LoadSettings()
{
try
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -279,10 +279,6 @@
private void MainForm_Load(object sender, EventArgs e)
{
- // TODO: Change log level to info for release.
- IrssLog.LogLevel = IrssLog.Level.Debug;
- IrssLog.Open(Common.FolderIrssLogs + "Virtual Remote Skin Editor.log");
-
UpdateWindowTitle();
comboBoxShortcut.Items.Clear();
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -1,7 +1,10 @@
using System;
using System.Collections.Generic;
+using System.Threading;
using System.Windows.Forms;
+using IrssUtils;
+
namespace SkinEditor
{
@@ -16,9 +19,32 @@
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new MainForm());
+
+ // TODO: Change log level to info for release.
+ IrssLog.LogLevel = IrssLog.Level.Debug;
+ IrssLog.Open(Common.FolderIrssLogs + "Virtual Remote Skin Editor.log");
+
+ Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException);
+
+ MainForm mainForm = new MainForm();
+
+ Application.Run(mainForm);
+
+ Application.ThreadException -= new ThreadExceptionEventHandler(Application_ThreadException);
+
+ IrssLog.Close();
}
+ /// <summary>
+ /// Handles unhandled exceptions.
+ /// </summary>
+ /// <param name="sender">Sender.</param>
+ /// <param name="e">Event args.</param>
+ public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
+ {
+ IrssLog.Error(e.Exception.ToString());
+ }
+
}
}
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MessageCommand.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MessageCommand.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MessageCommand.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -148,7 +148,7 @@
}
private void radioButtonWindowTitle_CheckedChanged(object sender, EventArgs e)
{
- buttonFindMsgTarget.Enabled = false;
+ buttonFindMsgTarget.Enabled = true;
textBoxMsgTarget.Enabled = true;
}
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -90,7 +90,7 @@
comboBoxStopBits.Items.Clear();
comboBoxStopBits.Items.AddRange(Enum.GetNames(typeof(StopBits)));
- comboBoxStopBits.SelectedIndex = 0;
+ comboBoxStopBits.SelectedIndex = 1;
}
private void buttonParamQuestion_Click(object sender, EventArgs e)
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -90,6 +90,46 @@
}
}
}
+
+ /// <summary>
+ /// Open a log file to append log entries to.
+ /// </summary>
+ /// <param name="fileName">File path, absolute.</param>
+ public static void Append(string fileName)
+ {
+ if (_streamWriter == null && _logLevel > Level.Off)
+ {
+ try
+ {
+ if (File.Exists(fileName) && File.GetCreationTime(fileName).Ticks < DateTime.Now.Subtract(TimeSpan.FromDays(7)).Ticks)
+ {
+ string backup = Path.ChangeExtension(fileName, ".bak");
+
+ if (File.Exists(backup))
+ File.Delete(backup);
+
+ File.Move(fileName, backup);
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+
+ try
+ {
+ _streamWriter = new StreamWriter(fileName, true);
+ _streamWriter.AutoFlush = true;
+
+ string message = DateTime.Now.ToString() + ":\tLog Opened";
+ _streamWriter.WriteLine(message);
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+ }
+ }
/// <summary>
/// Close the currently open log file.
@@ -100,6 +140,7 @@
{
string message = DateTime.Now.ToString() + ":\tLog Closed";
_streamWriter.WriteLine(message);
+ _streamWriter.WriteLine();
_streamWriter.Close();
_streamWriter = null;
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -6,7 +6,7 @@
{
/// <summary>
- /// Used for accessing the Windows System Registry
+ /// Used for accessing the Windows System Registry.
/// </summary>
public static class SystemRegistry
{
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -367,45 +367,21 @@
try { doc.Load(ConfigurationFile); }
catch { return; }
- try { _blasterType = (BlasterType)Enum.Parse(typeof(BlasterType), doc.DocumentElement.Attributes["BlastType"].Value); }
- catch { _blasterType = BlasterType.Microsoft; }
+ try { _blasterType = (BlasterType)Enum.Parse(typeof(BlasterType), doc.DocumentElement.Attributes["BlastType"].Value); } catch {}
+ try { _learnTimeout = int.Parse(doc.DocumentElement.Attributes["LearnTimeout"].Value); } catch {}
- try { _learnTimeout = int.Parse(doc.DocumentElement.Attributes["LearnTimeout"].Value); }
- catch { _learnTimeout = 10000; }
+ try { _enableRemoteInput = bool.Parse(doc.DocumentElement.Attributes["EnableRemoteInput"].Value); } catch {}
+ try { _remoteFirstRepeat = int.Parse(doc.DocumentElement.Attributes["RemoteFirstRepeat"].Value); } catch {}
+ try { _remoteHeldRepeats = int.Parse(doc.DocumentElement.Attributes["RemoteHeldRepeats"].Value); } catch {}
+ try { _enableKeyboardInput = bool.Parse(doc.DocumentElement.Attributes["EnableKeyboardInput"].Value); } catch {}
+ try { _keyboardFirstRepeat = int.Parse(doc.DocumentElement.Attributes["KeyboardFirstRepeat"].Value); } catch {}
+ try { _keyboardHeldRepeats = int.Parse(doc.DocumentElement.Attributes["KeyboardHeldRepeats"].Value); } catch {}
+ try { _handleKeyboardLocally = bool.Parse(doc.DocumentElement.Attributes["HandleKeyboardLocally"].Value); } catch {}
- try { _enableRemoteInput = bool.Parse(doc.DocumentElement.Attributes["EnableRemoteInput"].Value); }
- catch { _enableRemoteInput = true; }
-
- try { _remoteFirstRepeat = int.Parse(doc.DocumentElement.Attributes["RemoteFirstRepeat"].Value); }
- catch { _remoteFirstRepeat = 400; }
-
- try { _remoteHeldRepeats = int.Parse(doc.DocumentElement.Attributes["RemoteHeldRepeats"].Value); }
- catch { _remoteHeldRepeats = 250; }
-
-
- try { _enableKeyboardInput = bool.Parse(doc.DocumentElement.Attributes["EnableKeyboardInput"].Value); }
- catch { _enableKeyboardInput = true; }
-
- try { _keyboardFirstRepeat = int.Parse(doc.DocumentElement.Attributes["KeyboardFirstRepeat"].Value); }
- catch { _keyboardFirstRepeat = 350; }
-
- try { _keyboardHeldRepeats = int.Parse(doc.DocumentElement.Attributes["KeyboardHeldRepeats"].Value); }
- catch { _keyboardHeldRepeats = 0; }
-
- try { _handleKeyboardLocally = bool.Parse(doc.DocumentElement.Attributes["HandleKeyboardLocally"].Value); }
- catch { _handleKeyboardLocally = true; }
-
-
- try { _enableMouseInput = bool.Parse(doc.DocumentElement.Attributes["EnableMouseInput"].Value); }
- catch { _enableMouseInput = true; }
-
- try { _handleMouseLocally = bool.Parse(doc.DocumentElement.Attributes["HandleMouseLocally"].Value); }
- catch { _handleMouseLocally = true; }
-
- try { _mouseSensitivity = double.Parse(doc.DocumentElement.Attributes["MouseSensitivity"].Value); }
- catch { _mouseSensitivity = 1.0d; }
-
+ try { _enableMouseInput = bool.Parse(doc.DocumentElement.Attributes["EnableMouseInput"].Value); } catch {}
+ try { _handleMouseLocally = bool.Parse(doc.DocumentElement.Attributes["HandleMouseLocally"].Value); } catch {}
+ try { _mouseSensitivity = double.Parse(doc.DocumentElement.Attributes["MouseSensitivity"].Value); } catch {}
}
void SaveSettings()
{
@@ -472,7 +448,7 @@
Guid deviceClass;
string devicePath = null;
- // Try eHome driver ...
+ // Try XP eHome driver ...
deviceClass = new Guid(0x7951772d, 0xcd50, 0x49b7, 0xb1, 0x03, 0x2b, 0xaa, 0xc4, 0x94, 0xfc, 0x57);
_replacementDriver = false;
try
@@ -493,6 +469,17 @@
catch { }
}
+ // Try Vista eHome driver ...
+ /*if (devicePath == null)
+ {
+ deviceClass = new Guid(0x36fc9e60, 0xc465, 0x11cf, 0x80, 0x56, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00);
+ try
+ {
+ devicePath = DeviceAccess.FindDevice(deviceClass);
+ }
+ catch { }
+ }*/
+
if (devicePath == null)
throw new Exception("No MCE Transceiver detected");
@@ -692,7 +679,7 @@
if (_remoteButtonHandler != null)
_remoteButtonHandler(keyCode.ToString());
- //Console.WriteLine("Remote button: {0} - {1}", codeType, keyCode);
+ //String.Format("{0}: {1}", Enum.GetName(typeof(IRProtocol), codeType), keyCode);
}
void KeyboardEvent(uint keyCode, uint modifiers)
{
Modified: trunk/plugins/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-08-19 14:44:46 UTC (rev 846)
@@ -2,75 +2,233 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Applications", "Applications", "{0C209E91-5AD5-4662-AD0E-976A940D4806}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server", "Applications\IR Server\IR Server.csproj", "{D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tray Launcher", "Applications\Tray Launcher\Tray Launcher.csproj", "{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debug Client", "Applications\Debug Client\Debug Client.csproj", "{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Translator", "Applications\Translator\Translator.csproj", "{A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Virtual Remote", "Applications\Virtual Remote\Virtual Remote.csproj", "{46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Virtual Remote Skin Editor", "Applications\Virtual Remote Skin Editor\Virtual Remote Skin Editor.csproj", "{D871AB9A-71B3-4D63-8320-084BAD75064E}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IR Server Plugins", "IR Server Plugins", "{0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IPC", "IPC", "{0E9CCB69-CEF0-4680-816B-18E949DEA727}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.InterProcessComm", "IPC\AppModule.InterProcessComm\AppModule.InterProcessComm.csproj", "{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.NamedPipes", "IPC\AppModule.NamedPipes\AppModule.NamedPipes.csproj", "{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Named Pipes", "IPC\Named Pipes\Named Pipes.csproj", "{F4EA6055-7133-4F18-8971-E19ADEB482C1}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaPortal Plugins", "MediaPortal Plugins", "{6C18D808-E5ED-4CFB-A7CD-E2BDBB1D9BDA}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP Control Plugin", "MediaPortal Plugins\MP Control Plugin\MP Control Plugin.csproj", "{E8BEBBCC-1EE0-488D-8806-98ADCB7F0479}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TV2 Blaster Plugin", "MediaPortal Plugins\TV2 Blaster Plugin\TV2 Blaster Plugin.csproj", "{7946D42A-4BCB-4D79-80EB-BA9B17CE2E90}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TV3 Blaster Plugin", "MediaPortal Plugins\TV3 Blaster Plugin\TV3 Blaster Plugin.csproj", "{CD395FC2-70E2-42C4-8A20-5469A0C5EB50}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IgorPlug USB Receiver", "IR Server Plugins\IgorPlug USB Receiver\IgorPlug USB Receiver.csproj", "{A4023992-CCD6-461E-8E14-219A496734C5}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRMan Receiver", "IR Server Plugins\IRMan Receiver\IRMan Receiver.csproj", "{7C686499-7517-4338-8837-7E8617549D9A}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft MCE Transceiver", "IR Server Plugins\Microsoft MCE Transceiver\Microsoft MCE Transceiver.csproj", "{BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "USB-UIRT Transceiver", "IR Server Plugins\USB-UIRT Transceiver\USB-UIRT Transceiver.csproj", "{99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Windows Message Receiver", "IR Server Plugins\Windows Message Receiver\Windows Message Receiver.csproj", "{4CBA81F9-F0C2-4242-8D72-204597285042}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XBCDRC Receiver", "IR Server Plugins\XBCDRC Receiver\XBCDRC Receiver.csproj", "{2B9C6BE9-98D0-4D69-B041-57EE5D2DFB97}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP Blast Zone Plugin", "MediaPortal Plugins\MP Blast Zone Plugin\MP Blast Zone Plugin.csproj", "{907DCA39-A5E0-4EFA-B1F6-5FBE2C1BCD25}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRTrans Transceiver", "IR Server Plugins\IRTrans Transceiver\IRTrans Transceiver.csproj", "{883913F6-F4A7-4DE2-846A-C2102FAF499E}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X10 Transceiver", "IR Server Plugins\X10 Transceiver\X10 Transceiver.csproj", "{253FFB14-AB8E-49AB-A005-A42428C3F452}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FusionREMOTE Receiver", "IR Server Plugins\FusionRemote Receiver\FusionREMOTE Receiver.csproj", "{9FDD649E-0502-4FED-9AC1-AA0346394375}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{E757F80C-23C5-4AD6-B178-16799E337E03}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IrssUtils", "Common\IrssUtils\IrssUtils.csproj", "{CA15769C-232E-4CA7-94FD-206A06CA3ABB}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MPUtils", "Common\MPUtils\MPUtils.csproj", "{08F57DD7-2C6E-484E-9CC5-835F70C5BC64}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server Plugin Interface", "IR Server Plugins\IR Server Plugin Interface\IR Server Plugin Interface.csproj", "{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinLirc Receiver", "IR Server Plugins\WinLirc Receiver\WinLirc Receiver.csproj", "{E6A68244-8C31-44A9-9F85-B4A102B5F209}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Custom HID Receiver", "IR Server Plugins\Custom HID Receiver\Custom HID Receiver.csproj", "{0F6576B4-C88E-4E79-B7E9-9480498C5A32}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Blast", "Applications\IR Blast\IR Blast.csproj", "{C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Blast (No Window)", "Applications\IR Blast (No Window)\IR Blast (No Window).csproj", "{54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IrssComms", "Common\IrssComms\IrssComms.csproj", "{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sage Setup", "Applications\SageSetup\Sage Setup.csproj", "{905131F8-F8AC-4A65-A722-37783902D7B8}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SMS Keyboard", "Applications\SMS Keyboard\SMS Keyboard.csproj", "{A533F58F-2402-47CF-A258-377A669DB56F}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR File Tool", "Applications\IR File Tool\IR File Tool.csproj", "{B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -306,11 +464,32 @@
{54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Release|x86.ActiveCfg = Release|x86
{54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Release|x86.Build.0 = Release|x86
{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|x86.ActiveCfg = Debug|Any CPU
{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|Any CPU.Build.0 = Release|Any CPU
{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|x86.ActiveCfg = Release|Any CPU
+ {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|x86.ActiveCfg = Debug|x86
+ {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|x86.Build.0 = Debug|x86
+ {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|x86.ActiveCfg = Release|x86
+ {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|x86.Build.0 = Release|x86
+ {A533F58F-2402-47CF-A258-377A669DB56F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A533F58F-2402-47CF-A258-377A669DB56F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A533F58F-2402-47CF-A258-377A669DB56F}.Debug|x86.ActiveCfg = Debug|x86
+ {A533F58F-2402-47CF-A258-377A669DB56F}.Debug|x86.Build.0 = Debug|x86
+ {A533F58F-2402-47CF-A258-377A669DB56F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A533F58F-2402-47CF-A258-377A669DB56F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A533F58F-2402-47CF-A258-377A669DB56F}.Release|x86.ActiveCfg = Release|x86
+ {A533F58F-2402-47CF-A258-377A669DB56F}.Release|x86.Build.0 = Release|x86
+ {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Release|x86.ActiveCfg = Release|x86
+ {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -324,6 +503,9 @@
{D871AB9A-71B3-4D63-8320-084BAD75064E} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
+ {905131F8-F8AC-4A65-A722-37783902D7B8} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
+ {A533F58F-2402-47CF-A258-377A669DB56F} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
+ {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{A4023992-CCD6-461E-8E14-219A496734C5} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{7C686499-7517-4338-8837-7E8617549D9A} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -862,6 +862,11 @@
string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixBlast.Length));
BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]);
}
+ else if (command.StartsWith(Common.CmdPrefixSTB)) // STB IR Code
+ {
+ string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixSTB.Length));
+ BlastIR(Common.FolderSTB + commands[0], commands[1]);
+ }
else if (command.StartsWith(Common.CmdPrefixRun)) // External Program
{
string[] commands = Common.SplitRunCommand(command.Substring(Common.CmdPrefixRun.Length));
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2007-08-18 00:46:02 UTC (rev 845)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2007-08-19 14:44:46 UTC (rev 846)
@@ -802,6 +802,11 @@
string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixBlast.Length));
BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]);
}
+ else if (command.StartsWith(Common.CmdPrefixSTB)) // STB IR Code
+ {
+ string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixSTB.Length));
+ BlastIR(Common.FolderSTB + commands[0], commands[1]);
+ }
else if (command.StartsWith(Common.CmdPrefixRun)) // External Program
{
string[] commands = Common.SplitRunCommand(command.Substring(Common.CmdPrefixRun.Length));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Sourc...
[truncated message content] |
|
From: <gre...@us...> - 2007-08-18 00:46:08
|
Revision: 845
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=845&view=rev
Author: gregmac45
Date: 2007-08-17 17:46:02 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
many changes
Modified Paths:
--------------
trunk/plugins/OnlineVideos/Source/OnlineVideos/AbcUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/BlipTvUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/CbsUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/DailyMotionUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/DownloadedVideoUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GameTrailersUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GoogleVideoUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GrouperUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GubaUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ImageDowloader.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesTrailerUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Main.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/MetaCafeUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/MyVideodeUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/OnlineVideoSettings.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/OnlineVideos.csproj
trunk/plugins/OnlineVideos/Source/OnlineVideos/RocketboomUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/SoapBoxUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Stage6Util.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/VideoJugUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/VidiLifeUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/YouTubeUtil.cs
Added Paths:
-----------
trunk/plugins/OnlineVideos/Source/OnlineVideos/FavoriteUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/FavoriteVideo.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Favorites.cs
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/AbcUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/AbcUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/AbcUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -19,43 +19,37 @@
{
public class AbcUtil:SiteUtilBase
{
+ public override string getSiteId()
+ {
+ return "8";
+ }
+ public override List<OnlineVideos.GUIOnlineVideos.VideoInfo> getSiteFavorites(string fsUser)
+ {
+ return new List<OnlineVideos.GUIOnlineVideos.VideoInfo>();
+ }
+
//private String msXmlLink;
- public override List<GUIOnlineVideos.VideoInfo> getSiteFavorites()
- {
- throw new Exception("The method or operation is not implemented.");
- }
- public override bool isSiteFavoritesEnabled()
- {
- return false;
- }
+
+
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
-
- return fsId ;
+ //String [] urlArray = fsId.Split(new char[] { ',' });
+ //return urlArray[0] ;
+ return fsId;
}
public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
{
- List<RssItem> loRssItemList = getRssDataItems(fsUrl);
- List<GUIOnlineVideos.VideoInfo> loVideoList = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo video;
- foreach(RssItem rssItem in loRssItemList){
- video = new GUIOnlineVideos.VideoInfo();
- video.Description = rssItem.mediaDescription;
- video.ImageUrl = rssItem.mediaThumbnail;
- video.Title = rssItem.title;
- foreach(MediaContent content in rssItem.contentList){
- if(content.type.Contains("flv")){
- video.VideoUrl = content.url;
- break;
- }
- }
- loVideoList.Add(video);
- }
- return loVideoList;
+ List<GUIOnlineVideos.VideoInfo> list= new List<GUIOnlineVideos.VideoInfo>();
+ GUIOnlineVideos.VideoInfo video = new GUIOnlineVideos.VideoInfo();
+ video.Title = "test";
+ video.VideoUrl = "RTMP://wdig.fcod.llnwd.net/a339/o2/abc/streaming/episodes/SXD_112_SurstrommingOrASlice_Segment_1_1325482_highband.flv";
+ list.Add(video);
+ return list;
+ //return getRssData;
}
- /*
+
public List<GUIOnlineVideos.VideoInfo> getRssData(String fsUrl)
{
@@ -125,7 +119,7 @@
return loRssItems;
}
- */
+
}
}
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/BlipTvUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/BlipTvUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/BlipTvUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -24,7 +24,7 @@
return "9";
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
String lsUrl = "";
Log.Info("BlipTv getUrl with "+fsId);
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -24,7 +24,7 @@
return "break";
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
String lsHtml = getHTMLData(fsId);
//Log.Write("html to parse to get url = \n{0}",lsHtml);
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/CbsUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/CbsUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/CbsUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -25,7 +25,7 @@
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
return "http://video.cgi.cbs.com/vplayer3/play.pl?id="+fsId;
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/DailyMotionUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/DailyMotionUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/DailyMotionUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -24,7 +24,7 @@
return "6";
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
String lsUrl = "";
Log.Info("DMotion getUrl with "+fsId);
@@ -49,7 +49,7 @@
video.Description = rssItem.description;
video.ImageUrl = rssItem.mediaThumbnail;
video.Title = rssItem.title;
-
+ video.Length = Convert.ToInt32(rssItem.contentList[0].duration);
video.VideoUrl = rssItem.guid;
loVideoList.Add(video);
}
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/DownloadedVideoUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/DownloadedVideoUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/DownloadedVideoUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -25,7 +25,7 @@
return "99";
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
return fsId;
Added: trunk/plugins/OnlineVideos/Source/OnlineVideos/FavoriteUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/FavoriteUtil.cs (rev 0)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/FavoriteUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -0,0 +1,99 @@
+/*
+ * Created by SharpDevelop.
+ * User: GZamor1
+ * Date: 8/16/2007
+ * Time: 4:04 PM
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+using MediaPortal.GUI.Library;
+using System.Text.RegularExpressions;
+using System.IO;
+using System.Text;
+using MediaPortal.Player;
+using System.Collections.Generic;
+//using MediaPortal.Utils.Services;
+using MediaPortal.GUI.View ;
+using MediaPortal.Dialogs;
+using MediaPortal.Util;
+using System.Xml;
+using System.Xml.XPath;
+using System.ComponentModel;
+using System.Threading;
+using OnlineVideos.Database;
+
+namespace OnlineVideos
+{
+ /// <summary>
+ /// Description of FavoriteUtil.
+ /// </summary>
+ public class FavoriteUtil:SiteUtilBase
+ {
+ public FavoriteUtil()
+ {
+ }
+
+ public override string getSiteId()
+ {
+ return "100";
+ }
+ public override string getUrl(OnlineVideos.GUIOnlineVideos.VideoInfo video, OnlineVideos.GUIOnlineVideos.Site foSite)
+ {
+
+ GUIOnlineVideos.Site loSite = OnlineVideoSettings.getInstance().moSiteList[video.SiteID];
+ return SiteUtilFactory.getSiteUtil(video.SiteID).getUrl(video,loSite);;
+ }
+ public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
+ {
+
+ FavoritesDatabase db = FavoritesDatabase.getInstance();
+ List<GUIOnlineVideos.VideoInfo> loVideoList;
+ if(String.IsNullOrEmpty(fsUrl)){
+ loVideoList = db.getAllFavoriteVideos();
+ }else if(fsUrl.StartsWith("%")){
+ fsUrl = fsUrl.Substring(1);
+ loVideoList = db.searchFavoriteVideos(fsUrl);
+ }else{
+ loVideoList = db.getSiteFavoriteVideos(fsUrl);
+ }
+ //GUIOnlineVideos.VideoInfo video;
+
+
+ return loVideoList;
+ }
+ public override List<OnlineVideos.GUIOnlineVideos.RssLink> getDynamicCategories(string lsUrl)
+ {
+ GUIOnlineVideos.RssLink all = new GUIOnlineVideos.RssLink();
+ all.name = "All";
+ all.url = "";
+ List<OnlineVideos.GUIOnlineVideos.RssLink> cats = new List<OnlineVideos.GUIOnlineVideos.RssLink>();
+ cats.Add(all);
+
+ FavoritesDatabase db = FavoritesDatabase.getInstance();
+ string [] lsSiteIds = db.getSiteIDs();
+ Dictionary <String, GUIOnlineVideos.Site> loSiteList = OnlineVideoSettings.getInstance().moSiteList;
+ GUIOnlineVideos.Site loSite;
+ GUIOnlineVideos.RssLink cat;
+ foreach(string lsSiteId in lsSiteIds){
+ loSite = loSiteList[lsSiteId];
+ cat = new GUIOnlineVideos.RssLink();
+ cat.name = loSite.name+"-Favorites";
+ cat.url = loSite.id;
+ cats.Add(cat);
+
+ }
+ cat = new GUIOnlineVideos.RssLink();
+ cat.name = "Search-Favorites";
+ cat.url = "%{0}";
+ cats.Add(cat);
+
+ //SiteUtilFactory.getSiteUtil(
+
+ return cats;
+ }
+
+ }
+
+}
Added: trunk/plugins/OnlineVideos/Source/OnlineVideos/FavoriteVideo.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/FavoriteVideo.cs (rev 0)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/FavoriteVideo.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -0,0 +1,23 @@
+/*
+ * Created by SharpDevelop.
+ * User: GZamor1
+ * Date: 8/16/2007
+ * Time: 4:27 PM
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+
+namespace OnlineVideos
+{
+ /// <summary>
+ /// Description of FavoriteVideo.
+ /// </summary>
+ public class FavoriteVideo
+ {
+ public FavoriteVideo()
+ {
+ }
+ }
+}
Added: trunk/plugins/OnlineVideos/Source/OnlineVideos/Favorites.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/Favorites.cs (rev 0)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/Favorites.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -0,0 +1,280 @@
+/*
+ * Created by SharpDevelop.
+ * User: GZamor1
+ * Date: 8/16/2007
+ * Time: 9:10 AM
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections;
+using System.Text;
+using MediaPortal.GUI.Library;
+using MediaPortal.Database;
+using SQLite.NET;
+using System.Xml;
+using System.IO;
+using MediaPortal.MusicVideos;
+using MediaPortal.Util;
+using MediaPortal.Configuration;
+
+
+namespace OnlineVideos.Database
+{
+ public class FavoritesDatabase
+ {
+ private SQLiteClient m_db;
+
+ private static FavoritesDatabase Instance;
+
+ private FavoritesDatabase()
+ {
+
+ bool dbExists;
+ try
+ {
+ // Open database
+ try
+ {
+ System.IO.Directory.CreateDirectory("database");
+ }
+ catch (Exception) { }
+ dbExists = System.IO.File.Exists(Config.GetFile(Config.Dir.Database, "OnlineVideoDatabase.db3"));
+ m_db = new SQLiteClient(Config.GetFile(Config.Dir.Database, "OnlineVideoDatabase.db3"));
+
+ MediaPortal.Database.DatabaseUtility.SetPragmas(m_db);
+
+ if (!dbExists)
+ {
+ CreateTables();
+ }
+ }
+ catch (SQLiteException ex)
+ {
+ Log.Error("database exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
+ }
+ }
+ public void Dispose()
+ {
+ if (m_db != null)
+ {
+ m_db.Close();
+ m_db.Dispose();
+ m_db = null;
+ }
+ }
+
+ public static FavoritesDatabase getInstance()
+ {
+ if (Instance == null)
+ {
+ Instance = new FavoritesDatabase();
+ }
+ return Instance;
+ }
+ private void CreateTables()
+ {
+ if (m_db == null)
+ {
+ return;
+ }
+ try
+ {
+ m_db.Execute("CREATE TABLE FAVORITE_VIDEOS(VDO_NM text,VDO_URL text,VDO_DESC text,VDO_TAGS text,VDO_LENGTH text,VDO_OTHER_NFO text,VDO_IMG_URL text,VDO_SITE_ID text)\n");
+ //m_db.Execute("CREATE TABLE FAVORITE(FAVORITE_ID integer primary key,FAVORITE_NM text)\n");
+
+
+
+ //if (loFavoriteVideos.Count > 0)
+ //{
+ //foreach (YahooVideo loVideo in loFavoriteVideos)
+ //{
+ // addFavoriteVideo("Default", loVideo);
+ //}
+ //}
+ }
+ catch (Exception e)
+ {
+ Log.Info(e.ToString());
+ }
+ }
+ public bool addFavoriteVideo(OnlineVideos.GUIOnlineVideos.VideoInfo foVideo,String fsSiteId)
+ {
+
+ //check if the video is already in the favorite list
+ //lsSQL = string.Format("select SONG_ID from FAVORITE_VIDEOS where SONG_ID='{0}' AND COUNTRY='{1}' and FAVORITE_ID=''", foVideo.songId, foVideo.countryId, lsFavID);
+ //loResultSet = m_db.Execute(lsSQL);
+ //if (loResultSet.Rows.Count > 0)
+ //{
+ // return false;
+ //}
+ Log.Info("inserting favorite:");
+ Log.Info("desc:" +foVideo.Description);
+ Log.Info("image:"+foVideo.ImageUrl);
+ Log.Info("tags:"+foVideo.Tags);
+ Log.Info("title:"+foVideo.Title);
+ Log.Info("url"+foVideo.VideoUrl);
+
+ DatabaseUtility.RemoveInvalidChars(ref foVideo.Description);
+ DatabaseUtility.RemoveInvalidChars(ref foVideo.ImageUrl);
+ DatabaseUtility.RemoveInvalidChars(ref foVideo.Tags);
+ DatabaseUtility.RemoveInvalidChars(ref foVideo.Title);
+ DatabaseUtility.RemoveInvalidChars(ref foVideo.VideoUrl);
+
+ string lsSQL = string.Format("insert into FAVORITE_VIDEOS(VDO_NM,VDO_URL,VDO_DESC,VDO_TAGS,VDO_LENGTH,VDO_IMG_URL,VDO_SITE_ID)VALUES('{0}','{1}','{2}','{3}','{4}','{5}','{6}')", foVideo.Title,foVideo.VideoUrl, foVideo.Description,foVideo.Tags,foVideo.Length, foVideo.ImageUrl, fsSiteId);
+ m_db.Execute(lsSQL);
+ if (m_db.ChangedRows() > 0)
+ {
+ Log.Info("Favorite {0} inserted successfully into database",foVideo.Title);
+ return true;
+ }
+ else
+ {
+ Log.Info("Favorite {0} failed to insert into database",foVideo.Title);
+ return false;
+ }
+ }
+
+
+ public bool removeFavoriteVideo(GUIOnlineVideos.FavoriteVideoInfo foVideo, GUIOnlineVideos.Site foSite)
+ {
+ /*
+ string lsSQL = String.Format("select FAVORITE_ID from FAVORITE where FAVORITE_NM='{0}'", fsFavoriteNm.Replace("'", "''"));
+ SQLiteResultSet loResultSet = m_db.Execute(lsSQL);
+
+ string lsFavID = (String)loResultSet.GetColumn(0)[0];
+ //Log.Info("fav id = {0}",lsFavID);
+ //Log.Info("song id = {0}", foVideo.songId);
+ lsSQL = string.Format("delete from FAVORITE_VIDEOS where SONG_ID='{0}' and FAVORITE_ID = {1}", foVideo.songId, lsFavID);
+ m_db.Execute(lsSQL);
+ if (m_db.ChangedRows() > 0)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ */
+ return false;
+
+ }
+
+
+ public List<GUIOnlineVideos.VideoInfo> getAllFavoriteVideos()
+ {
+ return getFavoriteVideos(false,null);
+ }
+ public List<GUIOnlineVideos.VideoInfo> getSiteFavoriteVideos(String fsSiteId){
+ return getFavoriteVideos(true,fsSiteId);
+ }
+ private List<GUIOnlineVideos.VideoInfo> getFavoriteVideos(bool fbLimitBySite, String fsSiteId){
+
+ //createFavorite("Default2");
+ string lsSQL;
+ if(!fbLimitBySite){
+ lsSQL = string.Format("select * from favorite_videos");
+ }else{
+ lsSQL = string.Format("select * from favorite_videos where VDO_SITE_ID='{0}'",fsSiteId);
+ }
+ SQLiteResultSet loResultSet = m_db.Execute(lsSQL);
+ List<GUIOnlineVideos.VideoInfo> loFavoriteList = new List<GUIOnlineVideos.VideoInfo>();
+ if (loResultSet.Rows.Count == 0) return loFavoriteList ;
+
+ for (int iRow = 0; iRow < loResultSet.Rows.Count; iRow++)
+ {
+ GUIOnlineVideos.VideoInfo video = new GUIOnlineVideos.FavoriteVideoInfo();
+ video.Description = DatabaseUtility.Get(loResultSet, iRow, "VDO_DESC");
+ video.ImageUrl = DatabaseUtility.Get(loResultSet, iRow, "VDO_IMG_URL");
+ video.Length = DatabaseUtility.GetAsInt(loResultSet, iRow, "VDO_LENGTH");
+ video.Tags = DatabaseUtility.Get(loResultSet, iRow, "VDO_TAGS");
+ video.Title = DatabaseUtility.Get(loResultSet, iRow, "VDO_NM");
+ video.VideoUrl = DatabaseUtility.Get(loResultSet,iRow,"VDO_URL");
+ video.SiteID = DatabaseUtility.Get(loResultSet,iRow,"VDO_SITE_ID");
+
+ Log.Info("Pulled {0} out of the database",video.Title);
+ loFavoriteList.Add(video);
+
+ }
+ return loFavoriteList;
+ }
+ public string [] getSiteIDs(){
+ string lsSQL = "select distinct VDO_SITE_ID from favorite_videos";
+ SQLiteResultSet loResultSet = m_db.Execute(lsSQL);
+ string [] siteIdList = new string[loResultSet.Rows.Count];
+ for (int iRow = 0; iRow < loResultSet.Rows.Count; iRow++)
+ {
+ siteIdList[iRow] = DatabaseUtility.Get(loResultSet,iRow,"VDO_SITE_ID");
+
+ }
+ return siteIdList;
+
+ }
+
+ public List<GUIOnlineVideos.VideoInfo> searchFavoriteVideos(String fsQuery){
+
+ //createFavorite("Default2");
+ string lsSQL;
+ //if(!fbLimitBySite){
+ lsSQL = string.Format("select * from favorite_videos where VDO_NM like '%{0}%' or VDO_DESC like '%{0}%' or VDO_TAGS like '%{0}%'",fsQuery);
+ //}else{
+ //lsSQL = string.Format("select * from favorite_videos where VDO_SITE_ID='{0}'",fsSiteId);
+ //}
+ SQLiteResultSet loResultSet = m_db.Execute(lsSQL);
+ List<GUIOnlineVideos.VideoInfo> loFavoriteList = new List<GUIOnlineVideos.VideoInfo>();
+ if (loResultSet.Rows.Count == 0) return loFavoriteList ;
+
+ for (int iRow = 0; iRow < loResultSet.Rows.Count; iRow++)
+ {
+ GUIOnlineVideos.VideoInfo video = new GUIOnlineVideos.FavoriteVideoInfo();
+ video.Description = DatabaseUtility.Get(loResultSet, iRow, "VDO_DESC");
+ video.ImageUrl = DatabaseUtility.Get(loResultSet, iRow, "VDO_IMG_URL");
+ video.Length = DatabaseUtility.GetAsInt(loResultSet, iRow, "VDO_LENGTH");
+ video.Tags = DatabaseUtility.Get(loResultSet, iRow, "VDO_TAGS");
+ video.Title = DatabaseUtility.Get(loResultSet, iRow, "VDO_NM");
+ video.VideoUrl = DatabaseUtility.Get(loResultSet,iRow,"VDO_URL");
+ video.SiteID = DatabaseUtility.Get(loResultSet,iRow,"VDO_SITE_ID");
+
+ Log.Info("Pulled {0} out of the database",video.Title);
+ loFavoriteList.Add(video);
+
+ }
+ return loFavoriteList;
+ }
+
+ /*
+ public List<GUIOnlineVideos.FavoriteVideos> getSiteFavoriteVideos(GUIOnlineVideos.Site foSite)
+ {
+ List<YahooVideo> loFavoriteList = new List<YahooVideo>();
+ string lsSQL = String.Format("select FAVORITE_ID from FAVORITE where FAVORITE_NM='{0}'", fsFavoriteNm.Replace("'", "''"));
+ SQLiteResultSet loResultSet = m_db.Execute(lsSQL);
+
+ string lsFavID = (String)loResultSet.GetColumn(0)[0];
+ lsSQL = string.Format("select SONG_NM,SONG_ID,ARTIST_NM,ARTIST_ID,COUNTRY from FAVORITE_VIDEOS where FAVORITE_ID={0}", lsFavID);
+ loResultSet = m_db.Execute(lsSQL);
+
+ foreach (ArrayList loRow in loResultSet.RowsList)
+ {
+ YahooVideo loVideo = new YahooVideo();
+ IEnumerator en = loRow.GetEnumerator();
+ en.MoveNext();
+ loVideo.songName = (String)en.Current;
+ en.MoveNext();
+ loVideo.songId = (String)en.Current;
+ en.MoveNext();
+ loVideo.artistName = (String)en.Current;
+ en.MoveNext();
+ loVideo.artistId = (String)en.Current;
+ en.MoveNext();
+ loVideo.countryId = (String)en.Current;
+ loFavoriteList.Add(loVideo);
+
+ }
+
+ return loFavoriteList;
+ }
+ */
+ }
+}
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -13,7 +13,9 @@
using MediaPortal.Dialogs;
//using MediaPortal.Utils.Services;
using MediaPortal.Utils;
+using MediaPortal.Configuration;
using MediaPortal.Player;
+using MediaPortal.GUI;
namespace OnlineVideos
{
@@ -25,6 +27,10 @@
protected GUIFacadeControl facadeView = null;
[SkinControlAttribute(1)]
protected GUIImage logoImage = null;
+
+ [SkinControlAttribute(4)]
+ protected GUITextControl txtDesc = null;
+
//private ILog moLog;
protected View currentView = View.Icons;
private Dictionary <String, Site> moSiteList = new Dictionary<String, Site>();
@@ -70,17 +76,22 @@
public class VideoInfo
{
public String Title;
- public String Description;
- public String VideoUrl;
- public String ImageUrl;
+ public String Description = "";
+ public String VideoUrl = "";
+ public String ImageUrl = "";
public int Length;
- public String Tags;
+ public String Tags = "";
public Object Other;
+ public string SiteID = "";
public VideoInfo()
{
Length = -1;
}
}
+ public class FavoriteVideoInfo:VideoInfo
+ {
+ public String videoId;
+ }
public GUIOnlineVideos()
{
@@ -169,7 +180,9 @@
public override bool Init()
{
LoadSettings();
- return Load(GUIGraphicsContext.Skin + @"\myonlinevideos.xml");
+ bool result = Load(GUIGraphicsContext.Skin + @"\myonlinevideos.xml");
+
+ return result;
}
public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
@@ -193,8 +206,9 @@
if (_CurrentState == State.home)
{
DisplaySites();
- currentView = View.List;
- ChangeFacadeView();
+ //currentView = View.List;
+ //ChangeFacadeView();
+
}
else if (_CurrentState == State.categories)
{
@@ -222,26 +236,39 @@
if (dlgSel != null)
{
dlgSel.Add("Save"); // Save
+ if(msSelectedCategoryValue.StartsWith("fav:") ==false){
+ dlgSel.Add("Add to favorites");
+ }
+ else{
+ dlgSel.Add("Remove from favorites");
+ }
if(msSelectedSiteId=="1"){
dlgSel.Add("Related Videos"); // Related Videos
}
- if(isSiteFavoriteEnabled()){
- if(msSelectedCategoryValue.StartsWith("fav:") ==false){
- dlgSel.Add("Add to favorites");
- }
- else{
- dlgSel.Add("Remove from favorites");
- }
- }
+ //if(isSiteFavoriteEnabled()){
+
+ //}
}
dlgSel.DoModal(GetID);
int liSelectedIdx = dlgSel.SelectedId;
Log.Info("Selected id {0}",liSelectedIdx);
switch(liSelectedIdx){
case 1:
- SaveVideo(loListItem);
+ SaveVideo(moCurrentVideoList[facadeView.SelectedListItemIndex -1]);
break;
case 2:
+ SiteUtilBase siteUtil = SiteUtilFactory.getSiteUtil(msSelectedSiteId);
+ Site loSite = moSiteList [msSelectedSiteId];
+ if(msSelectedCategoryValue.StartsWith("fav:") == false){
+ //siteUtil.addFavorite(moCurrentVideoList[liSelected].VideoUrl,loSite.username,loSite.password);
+ Log.Info("Received request to add video to favorites.");
+ siteUtil.AddFavorite(moCurrentVideoList[liSelected],msSelectedSiteId);
+
+ }else{
+ siteUtil.removeFavorite(moCurrentVideoList[liSelected].VideoUrl,loSite.username,loSite.password);
+ }
+ break;
+ case 3:
//Log.Info("Getting related videos on {0} using tags:{1}",SiteUtilFactory.getSiteUtil(msSelectedSiteId),moCurrentVideoList[liSelected].Tags);
SiteUtilBase site = SiteUtilFactory.getSiteUtil(msSelectedSiteId);
//Log.Info("VideoList before:");
@@ -255,15 +282,7 @@
}
DisplayVideos(false);
break;
- case 3:
- SiteUtilBase siteUtil = SiteUtilFactory.getSiteUtil(msSelectedSiteId);
- Site loSite = moSiteList [msSelectedSiteId];
- if(msSelectedCategoryValue.StartsWith("fav:") == false){
- siteUtil.addFavorite(moCurrentVideoList[liSelected].VideoUrl,loSite.username,loSite.password);
- }else{
- siteUtil.removeFavorite(moCurrentVideoList[liSelected].VideoUrl,loSite.username,loSite.password);
- }
- break;
+
}
base.OnShowContextMenu();
}
@@ -285,6 +304,8 @@
_CurrentState = State.home;
return;
}
+ }else{
+ Log.Info("Action:"+action.wID);
}
base.OnAction(action);
}
@@ -344,13 +365,84 @@
}
base.OnClicked(controlId, control, actionType);
}
+ public override bool OnMessage(GUIMessage message)
+ {
+ /*
+ if(message.Message == GUIMessage.MessageType.GUI_MSG_SETFOCUS || message.Message == GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS_CHANGED){
+ Log.Info("Message:"+message.Message);
+ //if(message.Message == GUIMessage.MessageType.GUI_MSG_SETFOCUS){
+ Log.Info(message.Label);
+ Log.Info(message.Label2);
+ Log.Info(message.Label3);
+ Log.Info(message.Label4);
+ Log.Info(message.Object+"");
+ Log.Info(message.Object2+"");
+ Log.Info(message.Param1+"");
+ Log.Info(message.Param2+"");
+ Log.Info(message.Param3+"" );
+ Log.Info(message.Param4+"");
+ Log.Info(message.SenderControlId+"");
+ Log.Info(message.SendToTargetWindow+"");
+ Log.Info(message.TargetWindowId+"");
+ Log.Info(message.TargetControlId+"");
+
+
+
+ int liIndex = facadeView.SelectedListItemIndex;
+ if(liIndex>0){
+ if(message.Message == GUIMessage.MessageType.GUI_MSG_SETFOCUS && _CurrentState == State.videos && message.TargetWindowId==GetID && message.TargetControlId == facadeView.GetID){
+ DisplayVideoInfo(moCurrentVideoList[liIndex -1]);
+
+ }else if(message.Message == GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS_CHANGED && _CurrentState == State.videos && message.SenderControlId == facadeView.GetID && message.TargetWindowId == GetID){
+ DisplayVideoInfo(moCurrentVideoList[liIndex -1]);
+
+ }else{
+ DisplayVideoInfo(null);
+ }
+ }else{
+ DisplayVideoInfo(null);
+ }
+ }
+
+ */
+ /*
+ if(message.Message == GUIMessage.MessageType.GUI_MSG_SETFOCUS && _CurrentState == State.videos && message.TargetControlId!=facadeView.GetID && message.TargetWindowId == GetID){
+ DisplayVideoInfo(null);
+ }
+ */
+ return base.OnMessage(message);
+ }
+ protected override void OnPageDestroy(int newWindowId)
+ {
+ // Save view
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+ {
+ xmlwriter.SetValue("onlinevideos", "view", (int)currentView);
+ }
+ base.OnPageDestroy(newWindowId);
+ }
#region new methods
private void LoadSettings()
{
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+ {
+ currentView = (View)xmlreader.GetValueAsInt("onlinevideos", "view", (int)View.Icons);
+ SwitchView();
+ }
OnlineVideoSettings settings = OnlineVideoSettings.getInstance();
msThumbLocation = settings.msThumbLocation;
msFilterArray = settings.msFilterArray;
moSiteList= settings.moSiteList;
+ Site FavSite = new Site();
+ FavSite.id = "100";
+ FavSite.name = "Favorites";
+ FavSite.enabled = true;
+ RssLink cat = new RssLink();
+ cat.isDynamic = true;
+ cat.name = "dynamic";
+ cat.url = "favorites";
+ FavSite.RssList.Add("dynamic",cat);
+ moSiteList.Add("100",FavSite);
msDownloadDir = settings.msDownloadDir;
}
private void DisplaySites()
@@ -376,6 +468,8 @@
facadeView.Add(loListItem);
}
}
+
+
GUIPropertyManager.SetProperty("#header.image","");
}
private void DisplayCategories()
@@ -417,6 +511,7 @@
}
//GUIPropertyManager.SetProperty("#itemcount", facadeView.Count-1 + "");
//SiteUtilBase loSiteUtil = SiteUtilFactory.getSiteUtil(msSelectedSiteId);
+ /*
if (isSiteFavoriteEnabled())
{
loListItem = new GUIListItem("Favorites");
@@ -426,13 +521,15 @@
facadeView.Add(loListItem);
//loSiteUtil.getSiteFavorites();
}
+ */
}
+ /*
private bool isSiteFavoriteEnabled(){
Site loSite = moSiteList[msSelectedSiteId];
SiteUtilBase loSiteUtil = SiteUtilFactory.getSiteUtil(msSelectedSiteId);
return (loSiteUtil.isSiteFavoritesEnabled() && String.IsNullOrEmpty(loSite.username) == false);
}
-
+ */
private void DisplayVideos(bool fbRefresh)
{
List<VideoInfo> loListItems;
@@ -441,6 +538,8 @@
GUIControl.ClearControl(GetID, facadeView.GetID);
loListItem = new GUIListItem("..");
loListItem.IsFolder = true;
+ loListItem.ItemId = 0;
+ loListItem.OnItemSelected+= new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(OnVideoItemSelected);
MediaPortal.Util.Utils.SetDefaultIcons(loListItem);
facadeView.Add(loListItem);
@@ -484,7 +583,7 @@
loListItem.ItemId = liIdx;
loListItem.RetrieveArt = false;
loListItem.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt);
-
+ loListItem.OnItemSelected+=new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler( OnVideoItemSelected);
facadeView.Add(loListItem);
//loListItem.RetrieveArt = true;
loImageUrlList.Add(loVideoInfo.ImageUrl);
@@ -550,6 +649,14 @@
item.ThumbnailImage = ImageDownloader._imageLocationList[item.ItemId-1];
}
}
+ void OnVideoItemSelected(GUIListItem item,GUIControl parent){
+ if(item.ItemId ==0 ){
+ DisplayVideoInfo(null);
+ }
+ else{
+ DisplayVideoInfo(moCurrentVideoList[item.ItemId-1]);
+ }
+ }
private bool GetUserInputString(ref string sString)
{
VirtualKeyboard keyBoard = (VirtualKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD);
@@ -588,14 +695,16 @@
GUIWindowManager.SendThreadMessage(msg);
}
}
- private void SaveVideo(GUIListItem foListItem)
+ private void SaveVideo(VideoInfo foListItem)
{
- String lsUrl = SiteUtilFactory.getSiteUtil(msSelectedSiteId).getUrl(foListItem.Path);
+ Site loSite = moSiteList[msSelectedSiteId];
+ //String lsUrl = SiteUtilFactory.getSiteUtil(msSelectedSiteId).getUrl(foListItem.Path);
+ String lsUrl = SiteUtilFactory.getSiteUtil(msSelectedSiteId).getUrl(foListItem,loSite);
WebClient loClient = new WebClient();
loClient.Headers.Add("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; .NET CLR 1.0.3705;)");
loClient.DownloadFileCompleted += new AsyncCompletedEventHandler(DownloadFileCompleted);
- String lsFileName = msDownloadDir+foListItem.Label;
- loClient.DownloadFileAsync(new Uri(lsUrl), lsFileName + ".flv", foListItem.Label);
+ String lsFileName = msDownloadDir+foListItem.Title;
+ loClient.DownloadFileAsync(new Uri(lsUrl), lsFileName + ".flv", foListItem.Title);
}
private void DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
@@ -652,15 +761,17 @@
case State.home:
GUIPropertyManager.SetProperty("#header.label","OnlineVideos");
GUIPropertyManager.SetProperty("#header.image","");
+ DisplayVideoInfo(null);
break;
case State.categories:
GUIPropertyManager.SetProperty("#header.label","Categories");
GUIPropertyManager.SetProperty("#header.image","OnlineVidlogo"+msSelectedSiteId+".jpeg");
+ DisplayVideoInfo(null);
break;
case State.videos:
GUIPropertyManager.SetProperty("#header.label",msSelectedCategoryName);
GUIPropertyManager.SetProperty("#header.image","OnlineVidlogo"+msSelectedSiteId+".jpeg");
-
+ DisplayVideoInfo(null);
break;
}
}
@@ -672,14 +783,14 @@
//if (!AllowView(CurrentView) || facadeView.ThumbnailView == null)
// shouldContinue = true;
//else
- facadeView.View = GUIFacadeControl.ViewMode.SmallIcons;
+ //facadeView.View = GUIFacadeControl.ViewMode.SmallIcons;
break;
case View.Icons:
currentView = View.LargeIcons;
//if (!AllowView(CurrentView) || facadeView.ThumbnailView == null)
// shouldContinue = true;
//else
- facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
+ //facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
//facadeView.
break;
case View.LargeIcons:
@@ -687,18 +798,20 @@
//if (!AllowView(CurrentView) || facadeView.FilmstripView == null)
// shouldContinue = true;
//else
- facadeView.View = GUIFacadeControl.ViewMode.Filmstrip;
+ //facadeView.View = GUIFacadeControl.ViewMode.Filmstrip;
break;
case View.FilmStrip:
currentView = View.List;
//if (!AllowView(CurrentView) || facadeView.ListView == null)
// shouldContinue = true;
//else
- facadeView.View = GUIFacadeControl.ViewMode.List;
+ //facadeView.View = GUIFacadeControl.ViewMode.List;
break;
}
+ SwitchView();
//} while (shouldContinue);
//SelectCurrentItem();
+ /*
GUIControl.FocusControl(GetID, facadeView.GetID);
string strLine = String.Empty;
@@ -720,9 +833,63 @@
}
GUIControl.SetControlLabel(GetID, btnViewAs.GetID, strLine);
+ */
+ }
+ protected void SwitchView()
+ {
+ if (facadeView == null)
+ return;
+ string strLine = String.Empty;
+ switch (currentView)
+ {
+ case View.List:
+ facadeView.View = GUIFacadeControl.ViewMode.List;
+ strLine = GUILocalizeStrings.Get(101);
+ break;
+ case View.Icons:
+ facadeView.View = GUIFacadeControl.ViewMode.SmallIcons;
+ strLine = GUILocalizeStrings.Get(100);
+ break;
+ case View.LargeIcons:
+ facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
+ strLine = GUILocalizeStrings.Get(417);
+ break;
+ case View.FilmStrip:
+ facadeView.View = GUIFacadeControl.ViewMode.Filmstrip;
+ strLine = GUILocalizeStrings.Get(733);
+ break;
+ }
+ GUIControl.SetControlLabel(GetID, btnViewAs.GetID, strLine);
+
}
+
+ private void DisplayVideoInfo(VideoInfo foVideo){
+ if(foVideo==null){
+ GUIPropertyManager.SetProperty("#videotitle", String.Empty);
+ GUIPropertyManager.SetProperty("#tags", String.Empty);
+ GUIPropertyManager.SetProperty("#length", String.Empty);
+ GUIPropertyManager.SetProperty("#desc", String.Empty);
+ GUIControl.HideControl(GetID,11);
+ GUIControl.HideControl(GetID,12);
+ GUIControl.HideControl(GetID,13);
+ GUIControl.HideControl(GetID,14);
+
+ }else{
+ GUIPropertyManager.SetProperty("#videotitle", foVideo.Title);
+ GUIPropertyManager.SetProperty("#tags", foVideo.Tags);
+ TimeSpan t = TimeSpan.FromSeconds(foVideo.Length);
+ GUIPropertyManager.SetProperty("#length", t.ToString());
+ GUIPropertyManager.SetProperty("#desc", foVideo.Description);
+ GUIControl.ShowControl(GetID,11);
+ GUIControl.ShowControl(GetID,12);
+ GUIControl.ShowControl(GetID,13);
+ GUIControl.ShowControl(GetID,14);
+ //Log.Info(foVideo.Description);
+ }
+ }
+
#endregion
}
}
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/GameTrailersUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GameTrailersUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GameTrailersUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -25,7 +25,7 @@
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
return "http://trailers.gametrailers.com/gt_vault/"+fsId + ".wmv";
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/GoogleVideoUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GoogleVideoUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GoogleVideoUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -24,7 +24,7 @@
return "2";
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
return fsId + "&txe=.flv";
@@ -51,6 +51,7 @@
}else if(content.type.Contains("flv")){
flvUrl = content.url;
Log.Info("flv url:{0}", content.url);
+ video.Length = Convert.ToInt32(content.duration);
}
else if (content.type.Contains("mp4"))
{
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/GrouperUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GrouperUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GrouperUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -24,7 +24,7 @@
return "3";
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
Log.Info("doc id={0}", fsId);
String lsHtml = getHTMLData("http://grouper.com/rss/flv.ashx?id=" + fsId);
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/GubaUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GubaUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GubaUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -25,7 +25,7 @@
return "guba";
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
String lsHtml = getHTMLData("http://www.guba.com/watch/" + fsId);
Regex loRegex = new Regex("(http://free.guba.com/download/flash/[^?]+)");
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/ImageDowloader.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/ImageDowloader.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/ImageDowloader.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -184,7 +184,7 @@
name = System.IO.Path.GetFileNameWithoutExtension(name);
imageLocation = lsThumbLocation + name + "L.jpg";
thumbnailLocation = lsThumbLocation + name + ".jpg";
- if (System.IO.File.Exists(imageLocation) == false)
+ if (System.IO.File.Exists(thumbnailLocation) == false)
{
client.DownloadFile(url, imageLocation);
if (System.IO.File.Exists(thumbnailLocation) == false)
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesTrailerUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesTrailerUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesTrailerUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -17,47 +17,88 @@
namespace OnlineVideos
{
- public class ItunesTrailerUtil : SiteUtilBase
- {
- public override string getSiteId()
+ public class ItunesTrailerUtil : SiteUtilBase
+ {
+ public override string getSiteId()
{
return "15";
}
- public override List<GUIOnlineVideos.VideoInfo> getVideoList(String fsUrl)
- {
- BackgroundWorker worker = new BackgroundWorker();
- worker.DoWork += new DoWorkEventHandler(HDTrailerPlugin.AppleTrailers.GetAppleTrailersRSS);
- AppleTrailers._workerCompleted = false;
- worker.RunWorkerAsync(fsUrl);
- using (WaitCursor cursor = new WaitCursor())
- {
- while (HDTrailerPlugin.AppleTrailers._workerCompleted == false)
- GUIWindowManager.Process();
- }
- List<GUIOnlineVideos.VideoInfo> loListItems = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo loItem;
- foreach (ITMSClient.TrailerInfo trailer in HDTrailerPlugin.AppleTrailers.trailers)
- {
- loItem = new GUIOnlineVideos.VideoInfo();
- loItem.Title = trailer.Title;
- if(trailer.PosterUrl!=null)
- loItem.ImageUrl = trailer.PosterUrl.ToString();
- //loItem.Description = trailer.Overview;
- loItem.VideoUrl = trailer.Url.ToString();
- loItem.Other = trailer;
- loListItems.Add(loItem);
- }
+ public override List<GUIOnlineVideos.VideoInfo> getVideoList(String fsUrl)
+ {
+ BackgroundWorker worker = new BackgroundWorker();
+ worker.DoWork += new DoWorkEventHandler(HDTrailerPlugin.AppleTrailers.GetAppleTrailersRSS);
+ AppleTrailers._workerCompleted = false;
+ worker.RunWorkerAsync(fsUrl);
+ using (WaitCursor cursor = new WaitCursor())
+ {
+ while (HDTrailerPlugin.AppleTrailers._workerCompleted == false)
+ GUIWindowManager.Process();
+ }
+ List<GUIOnlineVideos.VideoInfo> loListItems = new List<GUIOnlineVideos.VideoInfo>();
+ GUIOnlineVideos.VideoInfo loItem;
+ foreach (ITMSClient.TrailerInfo trailer in HDTrailerPlugin.AppleTrailers.trailers)
+ {
+ loItem = new GUIOnlineVideos.VideoInfo();
+ loItem.Title = trailer.Title;
+ if(trailer.PosterUrl!=null)
+ loItem.ImageUrl = trailer.PosterUrl.ToString();
+ loItem.Description = trailer.Overview;
+ loItem.VideoUrl = trailer.Url.ToString();
+ loItem.Other = trailer;
+ //loItem.Length = trailer..
+ loListItems.Add(loItem);
+ }
- return loListItems;
+ return loListItems;
- }
+ }
- public override String getUrl(GUIOnlineVideos.VideoInfo video,GUIOnlineVideos.Site foSite)
- {
- TrailerInfo trailer = (TrailerInfo)video.Other;
- trailer = AppleTrailers.ProcessTrailer(trailer);
- return trailer.TrailerStreamCollection[0].Uri.ToString();
- }
+ public override String getUrl(GUIOnlineVideos.VideoInfo video,GUIOnlineVideos.Site foSite)
+ {
+ TrailerInfo trailer = (TrailerInfo)video.Other;
+ trailer = AppleTrailers.ProcessTrailer(trailer);
+ return trailer.TrailerStreamCollection[0].Uri.ToString();
+ }
+ private List<GUIOnlineVideos.VideoInfo> search(String fsQuery){
+ Dictionary<string, GUIOnlineVideos.RssLink> loRssList= OnlineVideoSettings.getInstance().moSiteList[getSiteId()].RssList;
+ List<GUIOnlineVideos.VideoInfo> loListItems = new List<GUIOnlineVideos.VideoInfo>();
+ GUIOnlineVideos.VideoInfo loItem;
+ foreach(GUIOnlineVideos.RssLink link in loRssList.Values){
+
+
+ BackgroundWorker worker = new BackgroundWorker();
+ worker.DoWork += new DoWorkEventHandler(HDTrailerPlugin.AppleTrailers.GetAppleTrailersRSS);
+ AppleTrailers._workerCompleted = false;
+ worker.RunWorkerAsync(link.url);
+ Dictionary<string, string> loTrailersFound = new Dictionary<string,string>();
+ using (WaitCursor cursor = new WaitCursor())
+ {
+ while (HDTrailerPlugin.AppleTrailers._workerCompleted == false)
+ GUIWindowManager.Process();
+ }
+ foreach (ITMSClient.TrailerInfo trailer in HDTrailerPlugin.AppleTrailers.trailers)
+ {
+ if(trailer.Title.Contains(fsQuery)){
+ if(loTrailersFound.ContainsKey(trailer.Title) == false){
+ loTrailersFound.Add(trailer.Title, "");
+ loItem = new GUIOnlineVideos.VideoInfo();
+ loItem.Title = trailer.Title;
+ if(trailer.PosterUrl!=null){
+ loItem.ImageUrl = trailer.PosterUrl.ToString();
+ }
+ loItem.Description = trailer.Overview;
+ loItem.VideoUrl = trailer.Url.ToString();
+ loItem.Other = trailer;
+ //loItem.Length = trailer..
+ loListItems.Add(loItem);
+ }
+ }
+ }
+
+
+ }
+ return loListItems;
- }
+ }
+ }
}
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/Main.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/Main.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/Main.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -24,40 +24,17 @@
public static void Main(string[] args)
{
- XmlDocument doc = new XmlDocument();
- XmlReaderSettings settings = new XmlReaderSettings();
- WebClient client =new WebClient();
- String xml = client.DownloadString("http://stage6.divx.com/rss/videos/order%3Arating");
- settings.ProhibitDtd = false;
- settings.CheckCharacters =false;
- //settings.
- try{
- //XmlParserContext context = new XmlParserContext();
- //context.Encoding = System.Text.Encoding.UTF8;
- doc.LoadXml(xml);
- }catch(Exception e){
- Console.WriteLine(e);
- }
- XmlNamespaceManager expr = new XmlNamespaceManager(doc.NameTable);
- expr.AddNamespace("media", "http://search.yahoo.com/mrss");
- expr.AddNamespace("exInfo","http://www.gametrailers.com/rssexplained.php");
- //Create the root XmlNode and generate an XmlNodeList from it.
- XmlNode root = doc.SelectSingleNode("//rss/channel/item", expr);
- XmlNodeList nodeList;
- nodeList = root.SelectNodes("//rss/channel/item");
- //XmlAttributeCollection ac;
-// List<RssItem> loRssItems = new List<RssItem>();
-// RssItem loRssItem;
-// //GUIListItem loListItem;
-// MediaContent loMediaContent;
+
- //SiteUtilBase loUtil = new YouTubeUtil();
+ SiteUtilBase loUtil = new YouTubeUtil();
//List<GUIOnlineVideos.VideoInfo> loList = loUtil.getVideoList("http://youtube.com/rss/global/top_rated.rss");
+
+
/*
SiteUtilBase loUtil = new BlipTvUtil();
List<GUIOnlineVideos.VideoInfo> loList = loUtil.getRssData("http://blip.tv/?1=1&search=soccer;page=1;s=posts&skin=rss");
@@ -75,9 +52,9 @@
List<GUIOnlineVideos.VideoInfo> loList = loUtil.getRssData("http://www.gametrailers.com/rss/newest.xml");
*/
/*
- SiteUtilBase loUtil = new AbcUtil();
+ AbcUtil loUtil = new AbcUtil();
List<GUIOnlineVideos.VideoInfo> loList = loUtil.getRssData("http://ll.static.abc.com/streaming/s/catalog?aff=&isIE=true");
- */
+ */
/*
SiteUtilBase loUtil = new VideoJugUtil();
List<GUIOnlineVideos.VideoInfo> loList = loUtil.getRssData("http://www.videojug.com/rss");
@@ -102,10 +79,14 @@
SiteUtilBase loUtil = new DailyMotionUtil();
List<GUIOnlineVideos.VideoInfo> loList = loUtil.getVideoList("http://www.dailymotion.com/rss");
*/
+ /*
+ SiteUtilBase loUtil = new Stage6Util();
+ List<GUIOnlineVideos.VideoInfo> loList = loUtil.getVideoList("http://stage6.divx.com/rss/videos/order:rating");
+ */
//Console.WriteLine(loUtil.getUrl(loList[0].VideoUrl));
//foreach(GUIOnlineVideos.VideoInfo loVideoInfo in loList){
- // Console.WriteLine("title:{0} \nurl:{1} \nimage:{2}",loVideoInfo.Title,loVideoInfo.VideoUrl, loVideoInfo.ImageUrl);
- //}
+// Console.WriteLine("title:{0} \nurl:{1} \nimage:{2}",loVideoInfo.Title,loVideoInfo.VideoUrl, loVideoInfo.ImageUrl);
+// }
//YouTubeUtil youtube = new YouTubeUtil();
//youtube.username = "MepoPlugin";
//youtube.password = "mepo";
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/MetaCafeUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/MetaCafeUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/MetaCafeUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -25,7 +25,7 @@
return "5";
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
WebClient client = new WebClient();
String lsHtml = client.DownloadString(String.Format("http://www.metacafe.com/fplayer.php?itemID={0}&fs=n&t=embedded", fsId));
@@ -46,7 +46,8 @@
video = new GUIOnlineVideos.VideoInfo();
video.Description = rssItem.description;
video.ImageUrl = rssItem.mediaThumbnail;
- video.Title = rssItem.title;
+ video.Title = rssItem.title;
+ video.Length = Convert.ToInt32(rssItem.contentList[0].duration);
video.VideoUrl = Regex.Match(rssItem.link,@"watch/([\d]*)").Groups[1].Value;
loVideoList.Add(video);
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/MyVideodeUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/MyVideodeUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/MyVideodeUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -24,7 +24,7 @@
return "myvideo.de";
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
String lsUrl = "";
HttpWebRequest webrequest =
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/OnlineVideoSettings.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/OnlineVideoSettings.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/OnlineVideoSettings.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -64,7 +64,7 @@
msThumbLocation = thumbNode.InnerText;
if(String.IsNullOrEmpty(msThumbLocation)){
msThumbLocation =
- System.IO.Directory.GetCurrentDirectory()+"/Thumbs/OnlineVideos/";
+ System.IO.Directory.GetCurrentDirectory()+@"\Thumbs\OnlineVideos\";
}
if(System.IO.Directory.Exists(msThumbLocation)==false){
System.IO.Directory.CreateDirectory(msThumbLocation);
@@ -130,6 +130,13 @@
if (lbDonwloadDirSet==false && loSite.id == "99")
{
msDownloadDir = loRssData.url;
+ if(String.IsNullOrEmpty(msDownloadDir)){
+ msDownloadDir =
+ System.IO.Directory.GetCurrentDirectory()+@"\Downloads\OnlineVideos\";
+ }
+ if(System.IO.Directory.Exists(msDownloadDir)==false){
+ System.IO.Directory.CreateDirectory(msDownloadDir);
+ }
lbDonwloadDirSet = true;
}
//Console.WriteLine("rss Node:{0}", loRssData.ToString());
@@ -188,7 +195,7 @@
filterNode.InnerText = lsFilterList;
}else{
msFilterArray = null;
-
+
}
root.AppendChild(filterNode);
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/OnlineVideos.csproj
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/OnlineVideos.csproj 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/OnlineVideos.csproj 2007-08-18 00:46:02 UTC (rev 845)
@@ -42,6 +42,11 @@
<HintPath>..\..\..\..\Mediaportal\Core\bin\Release\Core.DLL</HintPath>
<Private>False</Private>
</Reference>
+ <Reference Include="Databases">
+ <HintPath>..\..\..\..\Mediaportal\Databases\bin\Debug\Databases.dll</HintPath>
+ <SpecificVersion>False</SpecificVersion>
+ <Private>False</Private>
+ </Reference>
<Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Mediaportal\Dialogs\bin\Release\Dialogs.DLL</HintPath>
@@ -74,6 +79,9 @@
<Compile Include="Configuration.Designer.cs">
<DependentUpon>Configuration.cs</DependentUpon>
</Compile>
+ <Compile Include="Favorites.cs" />
+ <Compile Include="FavoriteUtil.cs" />
+ <Compile Include="FavoriteVideo.cs" />
<Compile Include="OnlineVideoSettings.cs" />
<Compile Include="RocketboomUtil.cs" />
<Compile Include="MyVideodeUtil.cs" />
@@ -110,7 +118,7 @@
<Compile Include="VidiLifeUtil.cs" />
<Compile Include="SoapBoxUtil.cs" />
<Compile Include="GameTrailersUtil.cs" />
- <None Include="AbcUtil.cs" />
+ <Compile Include="AbcUtil.cs" />
<Compile Include="CbsUtil.cs" />
<Compile Include="BreakUtil.cs" />
<EmbeddedResource Include="Configuration.resx">
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/RocketboomUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/RocketboomUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/RocketboomUtil.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -24,7 +24,7 @@
return "17";
}
- public override String getUrl(String fsId)
+ protected override String getUrl(String fsId)
{
return fsId;
}
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs 2007-08-18 00:46:02 UTC (rev 845)
@@ -9,6 +9,7 @@
using System.Xml;
using System.Xml.XPath;
using System.Threading;
+using OnlineVideos.Database;
namespace OnlineVideos
{
@@ -29,6 +30,7 @@
public String exInfoImage;
public List<MediaContent> contentList;
public String enclosure;
+ public String enclosureDuration;
public RssItem(){
contentList = new List<MediaContent>();
}
@@ -52,11 +54,8 @@
{
//ServiceProvider loServices = GlobalServiceProvider.Instance;
//moLog = loServices.Get<ILog>();
- }
+ }
- public virtual Boolean isSiteFavoritesEnabled(){
- return false;
- }
public virtual List<GUIOnlineVideos.VideoInfo> getSiteFavorites(String fsUser){
return new List<GUIOnlineVideos.VideoInfo>();
}
@@ -65,25 +64,30 @@
return new List<GUIOnlineVideos.VideoInfo>();
}
public virtual List<GUIOnlineVideos.RssLink> getDynamicCategories(String lsUrl)
- {
- return new List<GUIOnlineVideos.RssLink>();
+ {
+ return new List<GUIOnlineVideos.RssLink>();
- }
- public virtual String getUrl(String fsId)
- {
- return "";
- }
- public virtual bool addFavorite(String fsId,String fsUserName,String fsPassword){
- return false;
- }
- public virtual bool removeFavorite(String fsId,String fsUserName,String fsPassword){
- return false;
- }
-
- public virtual String getUrl(GUIOnlineVideos.VideoInfo video,GUIOnlineVideos.Site foSite)
- {
- return getUrl(video.VideoUrl);
- }
+ }
+ protected virtual String getUrl(String fsId)
+ {
+ return "";
+ }
+ //public virtual bool addFavorite(String fsId,String fsUserName,String fsPassword){
+ public virtual void AddFavorite(GUIOnlineVideos.VideoInfo foVideo,String fsSiteId){
+ //return false;
+ Log.Info("SiteUtilBase AddFavorites.");
+ FavoritesDatabase db = FavoritesDatabase.getInstance();
+ db.addFavoriteVideo(foVideo,fsSiteId);
+
+ }
+ public virtual bool removeFavorite(String fsId,String fsUserName,String fsPassword){
+ return false;
+ }
+
+ public virtual String getUrl(GUIOnlineVideos.VideoInfo video,GUIOnlineVideos.Site foSite)
+ {
+ return getUrl(video.VideoUrl);
+ }
public List<RssItem> getRssDataItems(String fsUrl){
@@ -143,33 +147,32 @@
for (int j = 0; j < n.ChildNodes.Count; j++)
{
- XmlNode nin = n.ChildNodes[j];
-
+ XmlNode nin = n.ChildNodes[j];
switch (nin.Name)
{
case "media:content":
loMediaContent = new MediaContent();
try{
- loMediaContent.url = nin.Attributes["url"].Value;
- loMediaContent.type = nin.Attributes["type"].Value;
- loMediaContent.medium = nin.Attributes["medium"].Value;
- loMediaContent.duration = nin.Attributes["duration"].Value;
- loMediaContent.height = nin.Attributes["height"].Value;
- loMediaContent.width = nin.Attributes["width"].Value;
+ loMediaContent.url = nin.Attributes["url"].Value;
+ loMediaContent.type = nin.Attributes["type"].Value;
+ loMediaContent.medium = nin.Attributes["medium"].Value;
+ loMediaContent.duration = nin.Attributes["duration"].Value;
+ loMediaContent.height = nin.Attributes["height"].Value;
+ loMediaContent.width = nin.Attributes["width"].Value;
}catch(Exception){};
loRssItem.contentList.Add(loMediaContent);
break;
case "media:description":
loRssItem.mediaDescription = n.InnerText;
break;
- case "media:thumbnail":
+ case "media:thumbnail":
loRssItem.mediaThumbnail = nin.Attributes["url"].Value;
break;
case "media:title":
loRssItem.mediaTitle = nin.InnerText;
break;
-
+
}
}
break;
@@ -182,6 +185,24 @@
loMediaContent.height = n.Attributes["height"].Value;
loMediaContent.width = n.Attributes["width"].Value;
loRssItem.contentList.Add(loMediaContent);
+ for (int j = 0; j < n.ChildNodes.Count; j++)
+ {
+ XmlNode nin = n.ChildNodes[j];
+
+ switch (nin.Name)
+ {
+ case "media:description":
+ loRssItem.mediaDescription = n.InnerText;
+ break;
+ case "media:thumbnail":
+ loRssItem.mediaThumbnail = nin.Attributes["url"].Value;
+ break;
+ case "media:title":
+ loRssItem.mediaTitle = nin.InnerText;
+ break;
+
+ }
+ }
break;
case "media:description":
loRssItem.mediaDescription = n.InnerText;
@@ -194,6 +215,9 @@
break;
case "enclosure":
loRssItem.enclosure = n.Attributes["url"].Value;
+ if(n.Attributes["duration"]!=null){
+ loRssItem.enclosureDuration = n.Attributes["duration"].Value;
+ }
break;
case "media:category":
loRssItem.mediaCategory = n.InnerText;
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/SoapBoxUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/SoapBoxUtil.cs 2007-08-17 15:52:32 UTC (rev 844)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/SoapBoxUtil.cs 2007-08-18 00...
[truncated message content] |
|
From: <fr...@us...> - 2007-08-17 15:52:36
|
Revision: 844
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=844&view=rev
Author: framug
Date: 2007-08-17 08:52:32 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs
Modified: trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs
===================================================================
--- trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs 2007-08-17 15:42:46 UTC (rev 843)
+++ trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs 2007-08-17 15:52:32 UTC (rev 844)
@@ -235,7 +235,7 @@
MediaPortal.Profile.Settings s = new MediaPortal.Profile.Settings("MediaPortal.xml");
string skin_name = s.GetValueAsString("skin", "name", string.Empty);
/* Need to know where is MP installed (running) because we don't have it
- in MediaPortal.xml neither in MediaPortalDirs.xml is MP is not installed */
+ in MediaPortal.xml */
string picture_path = AppDomain.CurrentDomain.BaseDirectory
+ @"skin\" + skin_name + @"\Media\" + m_Picture;
// if user didn't write .png extension, we add it automatically
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-08-17 15:42:50
|
Revision: 843
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=843&view=rev
Author: framug
Date: 2007-08-17 08:42:46 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
Controls for Picture Name. (just for fun) :)
1/ PNG File must begin with "hover_"
2/ File must exist in MP installed folder\your skin\media
Modified Paths:
--------------
trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs
Modified: trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs
===================================================================
--- trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs 2007-08-16 10:36:15 UTC (rev 842)
+++ trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs 2007-08-17 15:42:46 UTC (rev 843)
@@ -196,21 +196,64 @@
if (cf.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
+//fmu add control for Picture Name
+ if (ControlPictureName())
+ {
using (MediaPortal.Profile.Settings xmlwrite = new MediaPortal.Profile.Settings("MultiShortcut.xml"))
+ {
+ xmlwrite.SetValue(m_Name, "exefile", m_ExeFile);
+ xmlwrite.SetValue(m_Name, "arguments", m_Arguments);
+ xmlwrite.SetValue(m_Name, "picture", m_Picture);
+ xmlwrite.SetValue(m_Name, "buttonimage", m_ButtonImg);
+ xmlwrite.SetValue(m_Name, "buttonimagefocus", m_ButtonImgF);
+ xmlwrite.SetValue(m_Name, "caption", m_Caption);
+ xmlwrite.SetValue(m_Name, "pluginid", m_ID);
+ xmlwrite.SetValue(m_Name, "handlempwindow", m_HandleMPWindow ? 0 : 1);
+ }
+ }
+ else
{
- xmlwrite.SetValue(m_Name, "exefile", m_ExeFile);
- xmlwrite.SetValue(m_Name, "arguments", m_Arguments);
- xmlwrite.SetValue(m_Name, "picture", m_Picture);
- xmlwrite.SetValue(m_Name, "buttonimage", m_ButtonImg);
- xmlwrite.SetValue(m_Name, "buttonimagefocus", m_ButtonImgF);
- xmlwrite.SetValue(m_Name, "caption", m_Caption);
- xmlwrite.SetValue(m_Name, "pluginid", m_ID);
- xmlwrite.SetValue(m_Name, "handlempwindow", m_HandleMPWindow ? 0 : 1);
+ ShowPlugin();
}
}
}
+ //fmu Controls for Picture Name
+ public bool ControlPictureName()
+ {
+// If user wrote Picture Name then must begin with "hover_"
+ if (m_Picture != String.Empty)
+ {
+ int length_picture = m_Picture.Length;
+ if (length_picture < 6 || m_Picture.Substring(0, 6) != "hover_")
+ {
+ MessageBox.Show("Picture name must begin with \"hover_\"");
+ return false;
+ }
+// Need to know what is the used skin
+ MediaPortal.Profile.Settings s = new MediaPortal.Profile.Settings("MediaPortal.xml");
+ string skin_name = s.GetValueAsString("skin", "name", string.Empty);
+/* Need to know where is MP installed (running) because we don't have it
+ in MediaPortal.xml neither in MediaPortalDirs.xml is MP is not installed */
+ string picture_path = AppDomain.CurrentDomain.BaseDirectory
+ + @"skin\" + skin_name + @"\Media\" + m_Picture;
+// if user didn't write .png extension, we add it automatically
+ bool png = m_Picture.EndsWith(".png");
+ if (!png)
+ {
+ picture_path = picture_path + ".png";
+ }
+// PNG file exist ?
+ if (!System.IO.File.Exists(picture_path))
+ {
+ MessageBox.Show("PNG File not found : " + picture_path);
+ return false;
+ }
+ }
+ return true;
+ }
+
#endregion
#region GUIWindow
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nor...@us...> - 2007-08-16 10:37:22
|
Revision: 842
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=842&view=rev
Author: northern_sky
Date: 2007-08-16 03:36:15 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
more cleanups, fixed gamebaseimport,baseitem rem, abstact appitem instead
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilterItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
Removed Paths:
-------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-16 05:22:46 UTC (rev 841)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-16 10:36:15 UTC (rev 842)
@@ -49,6 +49,9 @@
{
#region Variables
+ private ProgramViewHandler ViewHandler = ProgramViewHandler.Instance;
+ private ItemFactory itemFactoryInstance = ItemFactory.ItemFactoryInstance;
+
private SQLiteConnection sqlLiteConnection = null;
private List<ApplicationItem> globalApplicationItemList = new List<ApplicationItem>();
private readonly string DATABASEFILE = "myProgramsAltDatabaseV1.db3";
@@ -66,8 +69,8 @@
{
string DatabasePath = Config.GetFile(Config.Dir.Database, DATABASEFILE);
string connString = string.Empty;
-
- try
+
+ try
{
//check if database exists
if (!File.Exists(DatabasePath))
@@ -263,7 +266,6 @@
public ItemType GetItemType(string columnName, string tableName, int id)
{
- ItemType itemType = ItemType.UNKNOWN;
string sqlStmt = "SELECT " + columnName + " FROM " + tableName + " WHERE applicationId = " + id;
return ProgramUtils.StringToSourceType(ExecuteStmtScalar(sqlStmt).ToString());
@@ -378,6 +380,51 @@
#endregion dataaccess help methods
+
+ public List<object> LoadItemList(int appID,List<object> itemList, string overrideSQL)
+ {
+ try
+ {
+ itemList.Clear();
+ string sqlQuery = "";
+
+ if (overrideSQL == "")
+ {
+ sqlQuery = ViewHandler.BuildQuery(appID);
+ }
+ else
+ {
+ sqlQuery = overrideSQL;
+ }
+
+ using (SQLiteCommand command = SqlLiteConn.CreateCommand())
+ {
+ command.CommandText = sqlQuery;
+ using (SQLiteDataReader dataReader = command.ExecuteReader())
+ {
+ while (dataReader.Read())
+ {
+ if (ViewHandler.IsFilterQuery)
+ {
+ FilterItem curFile = (FilterItem)itemFactoryInstance.GetItem(ItemType.FILTERITEM, dataReader);
+ itemList.Add(curFile);
+ }
+ else
+ {
+ FileItem curFile = (FileItem)itemFactoryInstance.GetItem(ItemType.FILEITEM, dataReader);
+ itemList.Add(curFile);
+ }
+ }
+ }
+ }
+ }
+ catch (SQLiteException ex)
+ {
+ Log.Info("Filedatabase exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
+ }
+ return itemList;
+ }
+
public void LoadAllApplicationItems()
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-16 05:22:46 UTC (rev 841)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-16 10:36:15 UTC (rev 842)
@@ -111,7 +111,7 @@
fileListView.Items.Clear();
- foreach (BaseItem item in currentApplication.ItemList)
+ foreach (object item in currentApplication.ItemList)
{
// add all filelinks,
// or add all files
@@ -254,16 +254,11 @@
if (dialogResult == DialogResult.OK)
{
file.Write();
- currentApplication.ItemLoad(currentApplication.ApplicationItemId, "");
+ currentApplication.LoadFiles();
SyncListView();
}
}
- private void ChangeFilePath(string NewPath)
- {
- currentApplication.ItemLoad(currentApplication.ApplicationItemId, NewPath);
- SyncListView();
- }
private void EditItem()
{
@@ -279,7 +274,7 @@
if (dialogResult == DialogResult.OK)
{
file.Write();
- currentApplication.ItemLoad(currentApplication.ApplicationItemId, "");
+ currentApplication.LoadFiles();
SyncListView();
}
}
@@ -330,7 +325,7 @@
}
}
}
- currentApplication.ItemLoad(currentApplication.ApplicationItemId, "");
+ currentApplication.LoadFiles();
SyncListView();
}
@@ -564,7 +559,7 @@
// Log.Info("Add to Favourites groupAppID:{0} Title:{1} fileID:{2} appID:{3}", GrouperAppID, currentFileItem.Title, currentFileItem.FileID, currentFileItem.applicationId);
}
- foreach (BaseItem app in apps)
+ foreach (object app in apps)
{
if (app is ApplicationItemGrouper)
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.Designer.cs 2007-08-16 05:22:46 UTC (rev 841)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.Designer.cs 2007-08-16 10:36:15 UTC (rev 842)
@@ -36,6 +36,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Name = "SettingsBase";
this.Size = new System.Drawing.Size(497, 550);
+ this.Load += new System.EventHandler(this.SettingsBase_Load);
this.ResumeLayout(false);
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs 2007-08-16 05:22:46 UTC (rev 841)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs 2007-08-16 10:36:15 UTC (rev 842)
@@ -44,7 +44,7 @@
public partial class SettingsBase : UserControl
{
protected ConditionChecker conditionChecker = new ConditionChecker();
- protected DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
+ protected DatabaseHandler dbHandlerInstance;
public SettingsBase()
@@ -68,5 +68,14 @@
//Log.Debug("{0}: EntriesOK()", this.ToString());
return true;
}
+
+ private void SettingsBase_Load(object sender, EventArgs e)
+ {
+ //temp fix for vs designer support
+ //vs design can be errorunos if using static help methods in contructor etc . databasehandler does
+ if(!DesignMode) {
+ dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
+ }
+ }
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-16 05:22:46 UTC (rev 841)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-16 10:36:15 UTC (rev 842)
@@ -20,36 +20,7 @@
#endregion
-//#region Enums
-//#endregion
-//#region Delegates
-//#endregion
-
-//#region Events
-//#endregion
-
-
-
-
-
-#region Properties
-// Public Properties
-#endregion
-
-#region Public Methods
-#endregion
-
-#region Private Methods
-#endregion
-
-#region <Base class> Overloads
-#endregion
-
-#region <Interface> Implementations
-// region for each interface
-#endregion
-
namespace GUIPrograms.Design
{
public partial class SetupForm : Form
@@ -57,6 +28,7 @@
#region Variables
+
private DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
private List<ApplicationItem> globalApplicationList;// = DatabaseHandler.DBHandlerInstance.ApplicationItemList;
private AppSettingsDirCache appSettingsDirCache = new AppSettingsDirCache();
@@ -633,7 +605,7 @@
{
AppSettingsBase appSettingsPage = pageCurrentSettings as AppSettingsBase;
// create a pseudo-appitem and read the values from the xml node
- ApplicationItem tempApp = new ApplicationItem();
+ ApplicationItemDirectoryCache tempApp = new ApplicationItemDirectoryCache();
tempApp.LoadFromXmlProfile(node);
appSettingsPage.LoadFromAppItem(tempApp);
appSettingsFileEditView.FileExtensionsText = tempApp.ValidExtensions;
@@ -723,6 +695,9 @@
private void SetupForm_Load(object sender, EventArgs e)
{
+
+
+
AttachFilesView();
AttachProgramsView();
UpdateTree();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-16 05:22:46 UTC (rev 841)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-16 10:36:15 UTC (rev 842)
@@ -305,7 +305,7 @@
}
xmlwriter.SetValue("myprograms", "startWindow", StartWindow.ToString());
- xmlwriter.SetValue("myprograms", "startview", (int) mapSettings.ViewLayout);
+ xmlwriter.SetValue("myprograms", "startview", (int)mapSettings.ViewLayout);
}
}
@@ -452,7 +452,7 @@
prevFilepath = lastApp.DefaultFilepath();
this.CurrentSortAsc = mapSettings.SortAscending;
ViewHandler.CurrentLevel = mapSettings.LastViewLevel;
- lastApp.ViewHandler = this.ViewHandler;
+ //lastApp.ViewHandler = this.ViewHandler;
}
else
{
@@ -797,7 +797,7 @@
switch (CurrentSortMethod)
{
- case ProgramSort.SortMethod.Title:
+ case ProgramSort.SortMethod.Title:
sortBy = GUILocalizeStrings.Get(268);
break;
case ProgramSort.SortMethod.Filename:
@@ -925,8 +925,8 @@
lastApp.LoadFiles();
lastApp.CurrentView = ViewHandler.CurrentView;
}
-
- int totalFiles = lastApp.DisplayFiles(lastApp.FileDirectory, facadeView);
+ int totalFiles = 0;
+ totalFiles = totalFiles + DisplayItemList(lastApp.filePath, lastApp.ItemList, facadeView);
return (totalFiles);
}
@@ -1216,6 +1216,19 @@
}
}
+ /* protected void OnItemSelected(GUIListItem item, GUIControl parent)
+ {
+ GUIPrograms.ThumbnailPath = "";
+ if (item.ThumbnailImage != ""
+ && item.ThumbnailImage != GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png"
+ && item.ThumbnailImage != GUIGraphicsContext.Skin + @"\media\DefaultAlbum.png"
+ )
+ {
+ // only show big thumb if there is really one....
+ GUIPrograms.ThumbnailPath = item.ThumbnailImage;
+ }
+ }*/
+
void OnItemSelected(GUIListItem item, GUIControl parent)
{
ThumbnailPath = "";
@@ -1236,15 +1249,52 @@
void OnClick()
{
- GUIListItem item = GetSelectedItem();
+ GUIListItem selectedGUIListItem = GetSelectedItem();
- if (item.MusicTag != null)
+ if (selectedGUIListItem.MusicTag != null)
{
- ((BaseItem)item.MusicTag).OnClick((BaseItem)item.MusicTag, this);
+ object item = selectedGUIListItem.MusicTag;
+
+ if (item is ApplicationItem)
+ {
+
+ lastApp = (ApplicationItem)item;
+ SaveItemIndex(GetSelectedItemNo().ToString(), lastApp, lastApp.lastFilepath);
+ mapSettings.LastAppID = lastApp.ApplicationItemId;
+ prevFilepath = lastApp.DefaultFilepath();
+ ViewHandler.CurrentLevel = 0;
+ //lastApp.ViewHandler = ViewHandler;
+ }
+ else if (item is FileItem)
+ {
+ FileItem fileItem = (FileItem)item;
+ selectedItemIndex = GetSelectedItemNo();
+
+ if (lastApp != null)
+ {
+ mapSettings.LastAppID = lastApp.ApplicationItemId;
+ prevFilepath = lastApp.DefaultFilepath();
+ lastApp.LaunchFile(fileItem);
+ }
+ }
+ else if (item is FilterItem)
+ {
+ FilterItem filterItem = (FilterItem)item;
+
+ SaveItemIndex(GetSelectedItemNo().ToString(), lastApp, prevFilepath);
+ ViewHandler.AddFilterItem(filterItem);
+ if (lastApp != null)
+ {
+ // force reload, this will load the next filter-level.....
+ lastApp.LoadFiles();
+ }
+ }
+
+
UpdateButtonStates();
UpdateListControl();
}
- else if (item.Label.Equals(ProgramUtils.cBackLabel))
+ else if (selectedGUIListItem.Label.Equals(ProgramUtils.cBackLabel))
{ // folder-item clicked....
selectedItemIndex = -1;
BackItemClicked();
@@ -1252,6 +1302,69 @@
}
}
+ #region moved from BaseItem
+
+ public int DisplayItemList(string filePath, List<object> dbItems, GUIFacadeControl facadeView)
+ {
+ int totalItems = 0;
+
+ foreach (object baseItem in dbItems)
+ {
+ totalItems = totalItems + 1;
+
+ if (baseItem is FileItem)
+ {
+ FileItem curFile = baseItem as FileItem;
+ GUIListItem gli = new GUIListItem(curFile.Title);
+
+ gli.MusicTag = curFile;
+ // gli.IsFolder = curFile.IsFolder;
+ gli.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt);
+ gli.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(OnItemSelected);
+ facadeView.Add(gli);
+ }
+ if (baseItem is FilterItem)
+ {
+ FilterItem curFile = baseItem as FilterItem;
+ GUIListItem gli = new GUIListItem(curFile.Title);
+ gli.MusicTag = curFile;
+ //gli.IsFolder = false;
+ gli.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(OnItemSelected);
+ facadeView.Add(gli);
+ }
+ }
+ return totalItems;
+ }
+
+ protected void OnRetrieveCoverArt(GUIListItem guiListItem)
+ {
+ if (guiListItem.MusicTag == null) return;
+ FileItem curFileItem = (FileItem)guiListItem.MusicTag;
+ if (curFileItem == null) return;
+
+ string imgFile = String.Empty;
+
+ if (ProgramUtils.UseThumbsDir())
+ imgFile = ProgramUtils.GetFileImage(lastApp, curFileItem);
+ else
+ imgFile = curFileItem.Imagefile;
+
+ if (File.Exists(imgFile))
+ {
+ guiListItem.ThumbnailImage = imgFile;
+ guiListItem.IconImageBig = imgFile;
+ guiListItem.IconImage = imgFile;
+ }
+ else
+ {
+ guiListItem.ThumbnailImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
+ guiListItem.IconImageBig = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
+ guiListItem.IconImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderNF.png";
+ }
+ }
+
+ #endregion
+
protected void OnShowSort()
{
GUIDialogMenu dlg = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
@@ -1288,15 +1401,15 @@
default:
CurrentSortMethod = ProgramSort.SortMethod.Title;
break;
- }
+ }
//ToDo
//tmp fix until all mappings in place.
- switch (dlg.SelectedLabelText)
+ switch (dlg.SelectedLabelText)
{
case "Sort by: Times launched":
CurrentSortMethod = ProgramSort.SortMethod.LaunchCount;
break;
- case "Sort by: Date launched":
+ case "Sort by: Date launched":
CurrentSortMethod = ProgramSort.SortMethod.LastTimeLaunched;
break;
case "Sort by: Platform":
@@ -1304,9 +1417,9 @@
break;
default:
break;
- }
-
+ }
+
OnSort();
GUIControl.FocusControl(GetID, btnSortBy.GetID);
}
@@ -1330,7 +1443,7 @@
if (item.Label.Equals(ProgramUtils.cBackLabel)) return;
if (item.MusicTag == null) return;
if (item.MusicTag is ApplicationItem) return;
-
+
if (item.MusicTag is FileItem)
{
curFile = (FileItem)item.MusicTag;
@@ -1378,7 +1491,7 @@
{
int nNewWindow = (int)Window.WINDOW_FILES;
StartWindow = nNewWindow;
- mapSettings.ViewLayout = (int) Layout.List;
+ mapSettings.ViewLayout = (int)Layout.List;
ViewHandler.CurrentView = GUILocalizeStrings.Get(100000 + GetID);//my files
if (nNewWindow != GetID)
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj 2007-08-16 05:22:46 UTC (rev 841)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj 2007-08-16 10:36:15 UTC (rev 842)
@@ -145,7 +145,6 @@
<Compile Include="Items\ApplicationItemGameBase.cs" />
<Compile Include="Items\ApplicationItemGrouper.cs" />
<Compile Include="Items\ApplicationItemMame.cs" />
- <Compile Include="Items\BaseItem.cs" />
<Compile Include="Items\FileItem.cs" />
<Compile Include="Items\FileItemInfo.cs" />
<Compile Include="Items\FilelinkItem.cs" />
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-08-16 05:22:46 UTC (rev 841)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-08-16 10:36:15 UTC (rev 842)
@@ -32,6 +32,7 @@
using GUIPrograms.Items;
using GUIPrograms;
using GUIPrograms.Database;
+using System.Data.SQLite;
namespace GUIPrograms.Imports
@@ -60,6 +61,7 @@
void DBImportGamebaseItem(OleDbDataReader myReader, string romFilename, string imgFilename, int curPos, int maxGames)
{
+
FileItem curFile = new FileItem();
curFile.FileID = -1; // to force an INSERT statement when writing the item
curFile.AppID = applicationItem.ApplicationItemId;
@@ -142,64 +144,69 @@
{
using (OleDbConnection myCon = new OleDbConnection(strCon))
{
- using (OleDbTransaction transaction = myCon.BeginTransaction())
- {
+
using (OleDbCommand myCmd = new OleDbCommand(sqlStr, myCon))
{
+ using (SQLiteTransaction transaction = DatabaseHandler.DBHandlerInstance.SqlLiteConn.BeginTransaction())
+
+ {
myCon.Open();
int maxGames = CountGames(myCon, sqlStrCount);
- using (OleDbDataReader myReader = myCmd.ExecuteReader())
- {
+
+
+ using (OleDbDataReader myReader = myCmd.ExecuteReader())
+ {
- int i = 0;
- while (myReader.Read())
- {
- i++;
- curRomname = myReader["Filename"].ToString();
- curFullRomname = applicationItem.FileDirectory + "\\" + curRomname;
+ int i = 0;
+ while (myReader.Read())
+ {
+ i++;
+ curRomname = myReader["Filename"].ToString();
+ curFullRomname = applicationItem.FileDirectory + "\\" + curRomname;
- if (applicationItem.ImageDirectory != "")
- {
- curTitleImage = applicationItem.imageDirs[0] + "\\" + myReader["ScrnshotFilename"].ToString();
- }
- else
- {
- curTitleImage = "";
- }
+ if (applicationItem.ImageDirectory != "")
+ {
+ curTitleImage = applicationItem.imageDirs[0] + "\\" + myReader["ScrnshotFilename"].ToString();
+ }
+ else
+ {
+ curTitleImage = "";
+ }
- if (File.Exists(curFullRomname))
- {
- // rom-name from gamebase exists in users filedirectory
- // => ready to import item
- bDoImport = true;
+ if (File.Exists(curFullRomname))
+ {
+ // rom-name from gamebase exists in users filedirectory
+ // => ready to import item
+ bDoImport = true;
- if (applicationItem.ImportValidImagesOnly)
- {
- // skip item if no thumbnail image is found
- bDoImport = ((curTitleImage != null) && (curTitleImage != "") && (File.Exists(curTitleImage)));
- }
+ if (applicationItem.ImportValidImagesOnly)
+ {
+ // skip item if no thumbnail image is found
+ bDoImport = ((curTitleImage != null) && (curTitleImage != "") && (File.Exists(curTitleImage)));
+ }
+
+ if (bDoImport)
+ {
+ DBImportGamebaseItem(myReader, curFullRomname, curTitleImage, i, maxGames);
- if (bDoImport)
- {
- DBImportGamebaseItem(myReader, curFullRomname, curTitleImage, i, maxGames);
+ }
+ else
+ {
+ Log.Info("*skipped* gamebase game {0} image{1}", curRomname, curTitleImage);
+ }
+ }
+ else
+ {
+ Log.Info("*missing* gamebase game {0}", curRomname);
+ }
}
- else
- {
- Log.Info("*skipped* gamebase game {0} image{1}", curRomname, curTitleImage);
- }
-
}
- else
- {
- Log.Info("*missing* gamebase game {0}", curRomname);
- }
+ transaction.Commit();
}
- }
- }
- transaction.Commit();
+
}
}
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-16 05:22:46 UTC (rev 841)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-16 10:36:15 UTC (rev 842)
@@ -23,6 +23,8 @@
#endregion
+#region Imports
+
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -41,761 +43,644 @@
using GUIPrograms.Database;
using GUIPrograms.Items;
+#endregion Imports
namespace GUIPrograms.Items
{
- public class ApplicationItem : BaseItem
- {
- #region Variables
+ public abstract class ApplicationItem
+ {
+ #region Events/Delegates
- int appID;
- int fatherID;
- string title;
- string filename;
+ public delegate void FilelinkLaunchEventHandler(FilelinkItem curLink, bool mpGuiMode);
+ public event FilelinkLaunchEventHandler OnLaunchFilelink = null;
- string arguments;
- ProcessWindowStyle windowStyle;
- string startupDir;
- bool useQuotes;
- bool useShellExecute;
- bool waitForExit;
- string preLaunch;
- string postLaunch;
+ // event: read new file
+ public delegate void RefreshInfoEventHandler(string informationMessage, int progressBarProgess);
+ public event RefreshInfoEventHandler OnRefreshInfo = null;
+ #endregion Events/Delegates
- private List<ImportOption> importOptionList;
+ #region Variables
- public List<ImportOption> ImportOptionList
- {
- get { return importOptionList; }
- set { importOptionList = value; }
- }
- bool enabled;
- int appPosition;
+ protected int GetID = ProgramUtils.GetID;
+ protected DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
- string currentView = "";
+ int appID;
+ int fatherID;
+ string title;
+ string filename;
- public List<BaseItem> ItemList = new List<BaseItem>();
- public bool filesAreLoaded = false; // load on demand....
- // protected FileItemList fileList = null;
+ string arguments;
+ ProcessWindowStyle windowStyle;
+ string startupDir;
+ bool useQuotes;
+ bool useShellExecute;
+ bool waitForExit;
+ string preLaunch;
+ string postLaunch;
+ private List<ImportOption> importOptionList;
+ bool enabled;
+ int appPosition;
- public bool linksAreLoaded = false; // load on demand....
+ string currentView = "";
- bool importMamePlaychoice10 = false;
- bool importMameMahjong = false;
- bool refreshGUIAllowed = false;
+ public List<object> ItemList = new List<object>();
+ public bool filesAreLoaded = false; // load on demand....
+ public bool linksAreLoaded = false; // load on demand....
+ bool importMamePlaychoice10 = false;
+ bool importMameMahjong = false;
+ bool refreshGUIAllowed = false;
+ public string filePath = "";
- ItemType sourceType;
- string sourceFile;
- string imageFile;
- string imageDirectories; // in one string for sqlite db field
- public string[] imageDirs; // imageDirectories splitted
- string fileDirectory;
- string validExtensions;
- bool importValidImagesOnly;
+ ItemType sourceType;
+ string sourceFile;
+ string imageFile;
+ string imageDirectories; // in one string for sqlite db field
+ public string[] imageDirs; // imageDirectories splitted
+ string fileDirectory;
+ string validExtensions;
+ bool importValidImagesOnly;
+ int platformId;
+ string launchErrorMsg;
+ // two magic image-slideshow counters
+ int thumbIndex = 0;
+ int thumbFolderIndex = -1;
- int platformId;
+ public string lastFilepath = ""; // cached path
- string launchErrorMsg;
- // two magic image-slideshow counters
- int thumbIndex = 0;
- int thumbFolderIndex = -1;
+ #endregion
- protected string lastFilepath = ""; // cached path
+ #region Properties
- #endregion
+ public List<ImportOption> ImportOptionList
+ {
+ get { return importOptionList; }
+ set { importOptionList = value; }
+ }
- #region Properties
- // Helper Routines
+ public int ApplicationItemId
+ {
+ get { return appID; }
+ set { appID = value; }
+ }
+ public int FatherID
+ {
+ get { return fatherID; }
+ set { fatherID = value; }
+ }
+ public string Title
+ {
+ get { return title; }
+ set { title = value; }
+ }
+ public string Filename
+ {
+ get { return filename; }
+ set { filename = value; }
+ }
+ public string Imagefile
+ {
+ get { return imageFile; }
+ set { imageFile = value; }
+ }
- public int ApplicationItemId
- {
- get { return appID; }
- set { appID = value; }
- }
- public int FatherID
- {
- get { return fatherID; }
- set { fatherID = value; }
- }
- public string Title
- {
- get { return title; }
- set { title = value; }
- }
+ public string Arguments
+ {
+ get { return arguments; }
+ set { arguments = value; }
+ }
+ public ProcessWindowStyle WindowStyle
+ {
+ get { return windowStyle; }
+ set { windowStyle = value; }
+ }
+ public string StartupDir
+ {
+ get { return startupDir; }
+ set { startupDir = value; }
+ }
+ public bool UseQuotes
+ {
+ get { return useQuotes; }
+ set { useQuotes = value; }
+ }
+ public bool UseShellExecute
+ {
+ get { return useShellExecute; }
+ set { useShellExecute = value; }
+ }
+ public bool WaitForExit
+ {
+ get { return waitForExit; }
+ set { waitForExit = value; }
+ }
+ public string PreLaunch
+ {
+ get { return preLaunch; }
+ set { preLaunch = value; }
+ }
+ public string PostLaunch
+ {
+ get { return postLaunch; }
+ set { postLaunch = value; }
+ }
- public string Filename
- {
- get { return filename; }
- set { filename = value; }
- }
- public string Imagefile
- {
- get { return imageFile; }
- set { imageFile = value; }
- }
+ public bool Enabled
+ {
+ get { return enabled; }
+ set { enabled = value; }
+ }
- public string Arguments
- {
- get { return arguments; }
- set { arguments = value; }
- }
- public ProcessWindowStyle WindowStyle
- {
- get { return windowStyle; }
- set { windowStyle = value; }
- }
- public string StartupDir
- {
- get { return startupDir; }
- set { startupDir = value; }
- }
- public bool UseQuotes
- {
- get { return useQuotes; }
- set { useQuotes = value; }
- }
- public bool UseShellExecute
- {
- get { return useShellExecute; }
- set { useShellExecute = value; }
- }
- public bool WaitForExit
- {
- get { return waitForExit; }
- set { waitForExit = value; }
- }
- public string PreLaunch
- {
- get { return preLaunch; }
- set { preLaunch = value; }
- }
- public string PostLaunch
- {
- get { return postLaunch; }
- set { postLaunch = value; }
- }
+ public bool RefreshGUIAllowed
+ {
+ get { return refreshGUIAllowed; }
+ set { refreshGUIAllowed = value; }
+ }
- public bool Enabled
- {
- get { return enabled; }
- set { enabled = value; }
- }
+ public int Position
+ {
+ get { return appPosition; }
+ set { appPosition = value; }
+ }
- public virtual bool RefreshGUIAllowed
- {
- get { return refreshGUIAllowed; }
- set { refreshGUIAllowed = value; }
- }
+ public string CurrentView
+ {
+ get { return currentView; }
+ set { currentView = value; }
+ }
- public int Position
- {
- get { return appPosition; }
- set { appPosition = value; }
- }
+ public bool ImportMamePlaychoice10
+ {
+ get { return importMamePlaychoice10; }
+ set { importMamePlaychoice10 = value; }
+ }
+ public bool ImportMameMahjong
+ {
+ get { return importMameMahjong; }
+ set { importMameMahjong = value; }
+ }
- public string CurrentView
- {
- get { return currentView; }
- set { currentView = value; }
- }
+ // more Properties, maybe need some renaming or anything else
+ public string FileDirectory
+ {
+ get { return fileDirectory; }
+ set { fileDirectory = value; }
+ }
+ public string ImageDirectory
+ {
+ get { return imageDirectories; }
+ set { SetImageDirectory(value); }
+ }
+ private void SetImageDirectory(string value)
+ {
+ imageDirectories = value;
+ imageDirs = imageDirectories.Split(';');
+ for (int i = 0; i < imageDirs.Length; i++)
+ {
+ imageDirs[i] = imageDirs[i].Trim();
+ // hack the \n away....
+ // imageDirs[i] = imageDirs[i].TrimStart('\n');
+ // hack trailing backslashes away
+ imageDirs[i] = imageDirs[i].TrimEnd('\\');
+ }
+ }
+ public string Source
+ {
+ get { return sourceFile; }
+ set { sourceFile = value; }
+ }
+ public ItemType SourceType
+ {
+ get { return sourceType; }
+ set { sourceType = value; }
+ }
+ public string ValidExtensions
+ {
+ get { return validExtensions; }
+ set { validExtensions = value; }
+ }
+ public bool ImportValidImagesOnly
+ {
+ get { return importValidImagesOnly; }
+ set { importValidImagesOnly = value; }
+ }
- public bool ImportMamePlaychoice10
- {
- get { return importMamePlaychoice10; }
- set { importMamePlaychoice10 = value; }
- }
- public bool ImportMameMahjong
- {
- get { return importMameMahjong; }
- set { importMameMahjong = value; }
- }
+ public int PlatformId
+ {
+ get { return platformId; }
+ set { platformId = value; }
+ }
+ public string LaunchErrorMsg
+ {
+ get { return launchErrorMsg; }
+ set { launchErrorMsg = value; }
+ }
- // more Properties, maybe need some renaming or anything else
- public string FileDirectory
- {
- get { return fileDirectory; }
- set { fileDirectory = value; }
- }
- public string ImageDirectory
- {
- get { return imageDirectories; }
- set { SetImageDirectory( value ); }
- }
- private void SetImageDirectory(string value)
- {
- imageDirectories = value;
- imageDirs = imageDirectories.Split( ';' );
- for ( int i = 0; i < imageDirs.Length; i++ )
- {
- imageDirs[i] = imageDirs[i].Trim();
- // hack the \n away....
- // imageDirs[i] = imageDirs[i].TrimStart('\n');
- // hack trailing backslashes away
- imageDirs[i] = imageDirs[i].TrimEnd( '\\' );
- }
- }
- public string Source
- {
- get { return sourceFile; }
- set { sourceFile = value; }
- }
- public ItemType SourceType
- {
- get { return sourceType; }
- set { sourceType = value; }
- }
- public string ValidExtensions
- {
- get { return validExtensions; }
- set { validExtensions = value; }
- }
- public bool ImportValidImagesOnly
- {
- get { return importValidImagesOnly; }
- set { importValidImagesOnly = value; }
- }
+ #endregion
- public int PlatformId
- {
- get { return platformId; }
- set { platformId = value; }
- }
- public string LaunchErrorMsg
- {
- get { return launchErrorMsg; }
- set { launchErrorMsg = value; }
- }
+ #region Constructor
- #endregion
+ public ApplicationItem()
+ {
- #region Events
-
- public delegate void FilelinkLaunchEventHandler(FilelinkItem curLink, bool mpGuiMode);
- public event FilelinkLaunchEventHandler OnLaunchFilelink = null;
-
- // event: read new file
- public delegate void RefreshInfoEventHandler(string informationMessage, int progressBarProgess);
- public event RefreshInfoEventHandler OnRefreshInfo = null;
-
- #endregion
-
- #region Constructor
-
- public ApplicationItem()
- {
-
- // .. init member variables ...
- appID = -1;
- fatherID = -1;
- title = "";
- filename = "";
- arguments = "";
- windowStyle = ProcessWindowStyle.Normal;
- startupDir = "%FILEDIR%";
- useShellExecute = false;
- useQuotes = true;
- enabled = true;
- sourceType = ItemType.UNKNOWN;
- sourceFile = "";
- imageFile = "";
- fileDirectory = "";
- imageDirectories = "";
- validExtensions = "";
- appPosition = 0;
- importValidImagesOnly = false;
+ // .. init member variables ...
+ appID = -1;
+ fatherID = -1;
+ title = "";
+ filename = "";
+ arguments = "";
+ windowStyle = ProcessWindowStyle.Normal;
+ startupDir = "%FILEDIR%";
+ useShellExecute = false;
+ useQuotes = true;
+ enabled = true;
+ sourceType = ItemType.UNKNOWN;
+ sourceFile = "";
+ imageFile = "";
+ fileDirectory = "";
+ imageDirectories = "";
+ validExtensions = "";
+ appPosition = 0;
+ importValidImagesOnly = false;
platformId = 0;
- waitForExit = true;
- filesAreLoaded = false;
- preLaunch = "";
- postLaunch = "";
+ waitForExit = true;
+ filesAreLoaded = false;
+ preLaunch = "";
+ postLaunch = "";
- }
+ }
- #endregion
+ #endregion Constructor
- protected void LaunchFilelink(FilelinkItem curLink, bool MPGUIMode)
- {
- /*ApplicationItem targetApp = GetAppByID(curLink.TargetAppID);
- if (targetApp != null)
- {
- targetApp.LaunchFile(curLink, MPGUIMode);
- }*/
- }
+ #region protected methods
+ protected void LaunchFilelink(FilelinkItem curLink, bool MPGUIMode)
+ {
+ /*ApplicationItem targetApp = GetAppByID(curLink.TargetAppID);
+ if (targetApp != null)
+ {
+ targetApp.LaunchFile(curLink, MPGUIMode);
+ }*/
+ }
- protected void SendRefreshInfo(string informationMessage, int progressBarCtr)
- {
- if ( OnRefreshInfo != null )
- {
- OnRefreshInfo( informationMessage, progressBarCtr );
- }
- }
- protected int GetID = ProgramUtils.GetID;
+ protected void SendRefreshInfo(string informationMessage, int progressBarCtr)
+ {
+ if (OnRefreshInfo != null)
+ {
+ OnRefreshInfo(informationMessage, progressBarCtr);
+ }
+ }
- public FileItem PrevFile(FileItem curFile)
- {
- if ( ItemList == null ) return null;
- if ( ItemList.Count == 0 ) return null;
- int index = this.ItemList.IndexOf( curFile );
- index = index - 1;
- if ( index < 0 )
- index = ItemList.Count - 1;
- return ( FileItem ) ItemList[index];
- }
+ protected void DoPreLaunch()
+ {
+ if (waitForExit && (preLaunch != ""))
+ {
+ LaunchCmd(preLaunch);
+ }
+ }
- public FileItem NextFile(FileItem curFile)
- {
- if ( ItemList == null ) return null;
- if ( ItemList.Count == 0 ) return null;
+ protected void DoPostLaunch()
+ {
+ if (waitForExit && (preLaunch != ""))
+ {
+ LaunchCmd(postLaunch);
+ }
+ }
- int index = this.ItemList.IndexOf( curFile );
- index = index + 1;
- if ( index > ItemList.Count - 1 )
- index = 0;
- return ( FileItem ) ItemList[index];
- }
+ protected void LaunchCmd(string commands)
+ {
+ string results = "";
+ string errors = "";
+ string[] script;
+ string curLine;
+ Process p = new Process();
+ StreamWriter sw;
+ StreamReader sr;
+ StreamReader err;
- /// <summary>
- /// look for FileItem and launch it using the found object
- /// </summary>
- /// <param name="guiListItem"></param>
- public virtual void LaunchFile(BaseItem launchItem)
- {
- FileItem curFileItem = ( FileItem ) launchItem;
- if ( curFileItem == null ) return;
+ script = commands.Split(';');
+ if (script.Length > 0)
+ {
+ ProcessStartInfo psI = new ProcessStartInfo("cmd");
+ psI.UseShellExecute = false;
+ psI.RedirectStandardInput = true;
+ psI.RedirectStandardOutput = true;
+ psI.RedirectStandardError = true;
+ psI.CreateNoWindow = true;
+ p.StartInfo = psI;
- this.LaunchFile( curFileItem, true );
- }
+ p.Start();
+ sw = p.StandardInput;
+ sr = p.StandardOutput;
+ err = p.StandardError;
- public virtual void LaunchFile(FileItem fileItem, bool mpGuiMode)
- {
- string filename = fileItem.Filename;
- if ( filename == "" ) return;
+ sw.AutoFlush = true;
- // Launch File by item
- if ( mpGuiMode )
- fileItem.UpdateLaunchInfo();
+ for (int i = 0; i < script.Length; i++)
+ {
+ curLine = script[i].Trim();
+ curLine = curLine.TrimStart('\n');
+ if (curLine != "")
+ sw.WriteLine(curLine);
+ }
+ sw.Close();
- ProcessStartInfo procStart = new ProcessStartInfo();
+ results += sr.ReadToEnd();
+ errors += err.ReadToEnd();
- if ( this.Filename != "" )
- { // use the APPLICATION launcher and add current file information
+ if (errors.Trim() != "")
+ {
+ Log.Info("Application PrePost errors: {0}", errors);
+ }
+ }
+ }
- // filename of the application
- procStart.FileName = this.Filename;
+ #endregion protected methods
- // double quotes around the filename-argument.....
- if ( UseQuotes )
- filename = "\"" + fileItem.Filename + "\"";
+ #region Public Methods
- // set the arguments: one of the arguments is the fileitem-filename
- if ( this.Arguments.Contains( "%FILEnoPATHnoEXT%" ) )
- // ex. kawaks:
- // winkawaks.exe alpham2
- // => filename without path and extension is necessary!
- procStart.Arguments = " " + this.Arguments.Replace( "%FILEnoPATHnoEXT%", Path.GetFileNameWithoutExtension( fileItem.Filename ) );
- else if ( this.Arguments.Contains( "%FILE%" ) )
- // placeholder found => replace the placeholder by the correct filename
- procStart.Arguments = " " + this.Arguments.Replace( "%FILE%", filename );
- else
- // no placeholder found => default handling: add the fileitem as the last argument
- procStart.Arguments = " " + this.Arguments + " " + filename;
- // set WorkingDirectory
- if ( this.StartupDir.Contains( "%FILEDIR%" ) )
- procStart.WorkingDirectory = this.StartupDir.Replace( "%FILEDIR%", Path.GetDirectoryName( fileItem.Filename ) );
- else
- procStart.WorkingDirectory = this.StartupDir;
- }
- else
- {
- // application has no launch-file
- // => try to make a correct launch using the current FILE object
- if ( UseQuotes )
- {
- procStart.FileName = "\"" + fileItem.Filename + "\"";
- }
- else
- {
- procStart.FileName = fileItem.Filename;
- }
+ public virtual string CurrentFilePath()
+ {
+ return this.FileDirectory;
+ }
- // set WorkingDirectory
- if ( this.StartupDir == "" )
- procStart.WorkingDirectory = Path.GetDirectoryName( fileItem.Filename );
- else if ( this.StartupDir.Contains( "%FILEDIR%" ) )
- procStart.WorkingDirectory = this.StartupDir.Replace( "%FILEDIR%", Path.GetDirectoryName( fileItem.Filename ) );
- else
- procStart.WorkingDirectory = this.StartupDir;
- }
+ public void Assign(ApplicationItem sourceApp)
+ {
+ this.Enabled = sourceApp.Enabled;
+ this.ApplicationItemId = sourceApp.ApplicationItemId;
+ this.FatherID = sourceApp.FatherID;
+ this.Title = sourceApp.Title;
+ this.Filename = sourceApp.Filename;
+ this.Arguments = sourceApp.Arguments;
+ this.WindowStyle = sourceApp.WindowStyle;
+ this.StartupDir = sourceApp.StartupDir;
+ this.UseShellExecute = sourceApp.UseShellExecute;
+ this.UseQuotes = sourceApp.UseQuotes;
+ this.SourceType = sourceApp.SourceType;
+ this.Source = sourceApp.Source;
+ this.Imagefile = sourceApp.Imagefile;
+ this.FileDirectory = sourceApp.FileDirectory;
+ this.ImageDirectory = sourceApp.ImageDirectory;
+ this.ValidExtensions = sourceApp.ValidExtensions;
+ this.ImportValidImagesOnly = sourceApp.ImportValidImagesOnly;
+ this.Position = sourceApp.Position;
+ this.WaitForExit = sourceApp.WaitForExit;
+ this.PreLaunch = sourceApp.PreLaunch;
+ this.PostLaunch = sourceApp.PostLaunch;
+ this.PlatformId = sourceApp.PlatformId;
- // set UseShellExecute
- procStart.UseShellExecute = this.UseShellExecute;
- // set WindowStyle
- procStart.WindowStyle = this.WindowStyle;
+ }
- this.LaunchErrorMsg = "";
- try
- {
- DoPreLaunch();
+ public FileItem PrevFile(FileItem curFile)
+ {
+ if (ItemList == null) return null;
+ if (ItemList.Count == 0) return null;
- if ( mpGuiMode )
- {
- AutoPlay.StopListening();
- if ( g_Player.Playing )
- g_Player.Stop();
- }
+ int index = this.ItemList.IndexOf(curFile);
+ index = index - 1;
+ if (index < 0)
+ index = ItemList.Count - 1;
+ return (FileItem)ItemList[index];
+ }
- //proc = new Process();
- /*proc.EnableRaisingEvents = true;
- proc.Exited += new EventHandler(proc_Exited);
+ public FileItem NextFile(FileItem curFile)
+ {
+ if (ItemList == null) return null;
+ if (ItemList.Count == 0) return null;
- proc.StartInfo = procStart;
- ProgramUtils.StartProcess(proc, this.WaitForExit);
- */
- Utils.StartProcess( procStart, this.WaitForExit );
+ int index = this.ItemList.IndexOf(curFile);
+ index = index + 1;
+ if (index > ItemList.Count - 1)
+ index = 0;
+ return (FileItem)ItemList[index];
+ }
- if ( mpGuiMode )
- {
- GUIGraphicsContext.DX9Device.Reset( GUIGraphicsContext.DX9Device.PresentationParameters );
- AutoPlay.StartListening();
- }
- }
- catch ( Exception ex )
- {
- string ErrorString = String.Format( "myPrograms: error launching program\n filename: {0}\n arguments: {1}\n WorkingDirectory: {2}\n stack: {3} {4} {5}",
- procStart.FileName,
- procStart.Arguments,
- procStart.WorkingDirectory,
- ex.Message,
- ex.Source,
- ex.StackTrace );
- Log.Info( ErrorString );
- this.LaunchErrorMsg = ErrorString;
- }
- finally
- {
- DoPostLaunch();
- }
- }
+ /// <summary>
+ /// look for FileItem and launch it using the found object
+ /// </summary>
+ /// <param name="guiListItem"></param>
+ public virtual void LaunchFile(FileItem launchItem)
+ {
+ FileItem curFileItem = launchItem;
+ if (curFileItem == null) return;
+ this.LaunchFile(curFileItem, true);
+ }
- protected void DoPreLaunch()
- {
- if ( waitForExit && ( preLaunch != "" ) )
- {
- LaunchCmd( preLaunch );
- }
- }
+ public virtual void LaunchFile(FileItem fileItem, bool mpGuiMode)
+ {
+ string filename = fileItem.Filename;
+ if (filename == "") return;
- protected void DoPostLaunch()
- {
- if ( waitForExit && ( preLaunch != "" ) )
- {
- LaunchCmd( postLaunch );
- }
- }
+ // Launch File by item
+ if (mpGuiMode)
+ fileItem.UpdateLaunchInfo();
- public override void ItemLoad(int appID, string pathSubfolders)
- {
+ ProcessStartInfo procStart = new ProcessStartInfo();
- try
- {
- ItemList.Clear();
+ if (this.Filename != "")
+ { // use the APPLICATION launcher and add current file information
- filePath = pathSubfolders;
- string sqlQuery = ViewHandler.BuildQuery( appID, pathSubfolders );
+ // filename of the application
+ procStart.FileName = this.Filename;
- using (SQLiteCommand command = dbHandlerInstance.SqlLiteConn.CreateCommand())
- {
- command.CommandText = sqlQuery;
- using ( SQLiteDataReader dataReader = command.ExecuteReader() )
- {
- while ( dataReader.Read() )
- {
- if ( ViewHandler.IsFilterQuery )
- {
- FilterItem curFile = (FilterItem) itemFactoryInstance.GetItem(ItemType.FILTERITEM, dataReader);
- ItemList.Add( curFile );
- }
- else
- {
- FileItem curFile = (FileItem) itemFactoryInstance.GetItem(ItemType.FILEITEM, dataReader);
- ItemList.Add( curFile );
- }
- }
+ // double quotes around the filename-argument.....
+ if (UseQuotes)
+ filename = "\"" + fileItem.Filename + "\"";
- }
- }
- }
- catch ( SQLiteException ex )
- {
- Log.Info( "Filedatabase exception err:{0} stack:{1}", ex.Message, ex.StackTrace );
- }
- }
+ // set the arguments: one of the arguments is the fileitem-filename
+ if (this.Arguments.Contains("%FILEnoPATHnoEXT%"))
+ // ex. kawaks:
+ // winkawaks.exe alpham2
+ // => filename without path and extension is necessary!
+ procStart.Arguments = " " + this.Arguments.Replace("%FILEnoPATHnoEXT%", Path.GetFileNameWithoutExtension(fileItem.Filename));
+ else if (this.Arguments.Contains("%FILE%"))
+ // placeholder found => replace the placeholder by the correct filename
+ procStart.Arguments = " " + this.Arguments.Replace("%FILE%", filename);
+ else
+ // no placeholder found => default handling: add the fileitem as the last argument
+ procStart.Arguments = " " + this.Arguments + " " + filename;
- protected void LaunchCmd(string commands)
- {
- string results = "";
- string errors = "";
- string[] script;
- string curLine;
- Process p = new Process();
- StreamWriter sw;
- StreamReader sr;
- StreamReader err;
-
- script = commands.Split( ';' );
- if ( script.Length > 0 )
- {
- ProcessStartInfo psI = new ProcessStartInfo( "cmd" );
- psI.UseShellExecute = false;
- psI.RedirectStandardInput = true;
- psI.RedirectStandardOutput = true;
- psI.RedirectStandardError = true;
- psI.CreateNoWindow = true;
- p.StartInfo = psI;
-
- p.Start();
- sw = p.StandardInput;
- sr = p.StandardOutput;
- err = p.StandardError;
-
- sw.AutoFlush = true;
-
- for ( int i = 0; i < script.Length; i++ )
- {
- curLine = script[i].Trim();
- curLine = curLine.TrimStart( '\n' );
- if ( curLine != "" )
- sw.WriteLine( curLine );
- }
- sw.Close();
-
- results += sr.ReadToEnd();
- errors += err.ReadToEnd();
-
- if ( errors.Trim() != "" )
- {
- Log.Info( "Application PrePost errors: {0}", errors );
- }
- }
- }
-
- public virtual string DefaultFilepath()
- {
- return ""; // override this if the appitem can have subfolders
- }
-
- public virtual int DisplayFiles(string filePath, GUIFacadeControl facadeView)
- {
- int totalItems = 0;
-
- totalItems = totalItems + DisplayItemList( filePath, this.ItemList, facadeView );
-
- return totalItems;
- }
-
-
- #region moved from BaseItem
-
- public int DisplayItemList(string filePath, List<BaseItem> dbItems, GUIFacadeControl facadeView)
- {
- int totalItems = 0;
-
- foreach (BaseItem baseItem in dbItems)
+ // set WorkingDirectory
+ if (this.StartupDir.Contains("%FILEDIR%"))
+ procStart.WorkingDirectory = this.StartupDir.Replace("%FILEDIR%", Path.GetDirectoryName(fileItem.Filename));
+ else
+ procStart.WorkingDirectory = this.StartupDir;
+ }
+ else
{
- totalItems = totalItems + 1;
-
- if (baseItem is FileItem)
+ // application has no launch-file
+ // => try to make a correct launch using the current FILE object
+ if (UseQuotes)
{
- FileItem curFile = baseItem as FileItem;
- GUIListItem gli = new GUIListItem(curFile.Title);
-
- gli.MusicTag = curFile;
- // gli.IsFolder = curFile.IsFolder;
- gli.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt);
- gli.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(OnItemSelected);
- facadeView.Add(gli);
+ procStart.FileName = "\"" + fileItem.Filename + "\"";
}
- if (baseItem is FilterItem)
+ else
{
- FilterItem curFile = baseItem as FilterItem;
- GUIListItem gli = new GUIListItem(curFile.Title);
- gli.MusicTag = curFile;
- //gli.IsFolder = false;
- gli.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(OnItemSelected);
- facadeView.Add(gli);
+ procStart.FileName = fileItem.Filename;
}
+
+ // set WorkingDirectory
+ if (this.StartupDir == "")
+ procStart.WorkingDirectory = Path.GetDirectoryName(fileItem.Filename);
+ else if (this.StartupDir.Contains("%FILEDIR%"))
+ procStart.WorkingDirectory = this.StartupDir.Replace("%FILEDIR%", Path.GetDirectoryName(fileItem.Filename));
+ else
+ procStart.WorkingDirectory = this.StartupDir;
}
- return totalItems;
- }
- protected void OnRetrieveCoverArt(GUIListItem guiListItem)
- {
- if (guiListItem.MusicTag == null) return;
- FileItem curFileItem = (FileItem)guiListItem.MusicTag;
- if (curFileItem == null) return;
+ // set UseShellExecute
+ procStart.UseShellExecute = this.UseShellExecute;
+ // set WindowStyle
+ procStart.WindowStyle = this.WindowStyle;
- string imgFile = String.Empty;
+ this.LaunchErrorMsg = "";
+ try
+ {
+ DoPreLaunch();
- if (ProgramUtils.UseThumbsDir())
- imgFile = ProgramUtils.GetFileImage(this,curFileItem);
- else
- imgFile = curFileItem.Imagefile;
+ if (mpGuiMode)
+ {
+ AutoPlay.StopListening();
+ if (g_Player.Playing)
+ g_Player.Stop();
+ }
- if (File.Exists(imgFile))
+ //proc = new Process();
+ /*proc.EnableRaisingEvents = true;
+ proc.Exited += new EventHandler(proc_Exited);
+
+ proc.StartInfo = procStart;
+ ProgramUtils.StartProcess(proc, this.WaitForExit);
+ */
+ Utils.StartProcess(procStart, this.WaitForExit);
+
+ if (mpGuiMode)
+ {
+ GUIGraphicsContext.DX9Device.Reset(GUIGraphicsContext.DX9Device.PresentationParameters);
+ AutoPlay.StartListening();
+ }
+ }
+ catch (Exception ex)
{
- guiListItem.ThumbnailImage = imgFile;
- guiListItem.IconImageBig = imgFile;
- guiListItem.IconImage = imgFile;
+ string ErrorString = String.Format("myPrograms: error launching program\n filename: {0}\n arguments: {1}\n WorkingDirectory: {2}\n stack: {3} {4} {5}",
+ procStart.FileName,
+ procStart.Arguments,
+ procStart.WorkingDirectory,
+ ex.Message,
+ ex.Source,
+ ex.StackTrace);
+ Log.Info(ErrorString);
+ this.LaunchErrorMsg = ErrorString;
}
- else
+ finally
{
- guiListItem.ThumbnailImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
- guiListItem.IconImageBig = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
- guiListItem.IconImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderNF.png";
+ DoPostLaunch();
}
}
- #endregion
+ public virtual string DefaultFilepath()
+ {
+ return ""; // override this if the appitem can have subfolders
+ }
+ public virtual bool FileEditorAllowed()
+ {
+ return true; // otherwise, override this in child class
+ }
- public override void OnClick(BaseItem baseItem, GUIPrograms guiPrograms)
- {
- ApplicationItem candidate = ( ApplicationItem ) baseItem;
- guiPrograms.SaveItemIndex( guiPrograms.GetSelectedItemNo().ToString(), guiPrograms.lastApp, lastFilepath );
- guiPrograms.lastApp = candidate;
- guiPrograms.mapSettings.LastAppID = guiPrograms.lastApp.ApplicationItemId;
- guiPrograms.prevFilepath = guiPrograms.lastApp.DefaultFilepath();
- guiPrograms.ViewHandler.CurrentLevel = 0;
- guiPrograms.lastApp.ViewHandler = guiPrograms.ViewHandler;
- }
+ public virtual bool FileAddAllowed()
+ {
+ return true; // otherwise, override this in child class
+ }
- /* protected int DisplayArrayList(string filePath, List<object> dbItems, GUIFacadeControl facadeView)
- {
- int totalItems = 0;
- //foreach (FileItem currentFileItem in dbItems)
- foreach (object obj in dbItems)
- {
- totalItems = totalItems + 1;
- if (obj is FileItem)
- {
- FileItem curFile = obj as FileItem;
- GUIListItem gli = new GUIListItem(curFile.Title);
+ public virtual bool FilesCanBeFavourites()
+ {
+ return true; // otherwise, override this in child class
+ }
- gli.MusicTag = curFile;
- gli.IsFolder = curFile.IsFolder;
- gli.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt);
- gli.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(OnItemSelected);
- facadeView.Add(gli);
- }
- }
- return totalItems;
- }
- */
+ public virtual bool FileBrowseAllowed()
+ {
+ // set this to true, if SUBDIRECTORIES are allowed
+ // (example: possible for DIRECTORY-CACHE)
+ return false; // otherwise, override this in child class
+ }
- public virtual bool FileEditorAllowed()
- {
- return true; // otherwise, override this in child class
- }
+ public virtual bool SubItemsAllowed()
+ {
+ return false;
+ }
- public virtual bool FileAddAllowed()
- {
- return true; // otherwise, override this in child class
- }
+ public virtual bool ProfileLoadingAllowed()
+ {
+ return false;
+ }
- public virtual bool FilesCanBeFavourites()
- {
- return true; // otherwise, override this in child class
- }
+ public virtual void Refresh(bool mpGuiMode)
+ {
+ // descendant classes do that!
+ }
- public virtual bool FileBrowseAllowed()
- {
- // set this to true, if SUBDIRECTORIES are allowed
- // (example: possible for DIRECTORY-CACHE)
- return false; // otherwise, override this in child class
- }
+ #endregion Public Methods
- public virtual bool SubItemsAllowed()
- {
- return false;
- }
- public virtual bool ProfileLoadingAllowed()
- {
- return false;
- }
- public virtual void Refresh(bool mpGuiMode)
- {
- // descendant classes do that!
- }
+ #region Database stuff
- #region Database stuff
+ /// <summary>
+ /// get an unused SQL application KEY-number
+ /// </summary>
+ private int GetNewAppID()
+ {
+ int result = 0;
+ // won't work in multiuser environment :)
+ string sqlStmt = "SELECT MAX(applicationId) FROM tblApplicationItem";
+ object o = dbHandlerInstance.ExecuteStmtScalar(sqlStmt);
+ if (o.ToString() != "")
+ {
+ result = Convert.ToInt32(o);
+ }
+ return result + 1;
+ }
- /// <summary>
- /// get an unused SQL application KEY-number
- /// </summary>
- private int GetNewAppID()
- {
- int result = 0;
- // won't work in multiuser environment :)
- string sqlStmt = "SELECT MAX(applicationId) FROM tblApplicationItem";
- object o = dbHandlerInstance.ExecuteStmtScalar( sqlStmt );
- if ( o.ToString() != "" )
- {
- result = Convert.ToInt32( o );
- }
- return result + 1;
- }
-
+ private void Insert()
+ {
+ SQLiteParameter[] parameterArray = new SQLiteParameter[23];
+ ApplicationItemId = GetNewAppID(); // important to avoid subsequent inserts!
+ //params for question + values
+ parameterArray[0] = dbHandlerInstance.GetParameter<int>(ApplicationItemId, "@applicationItemId", DbType.Int32);
+ parameterArray[1] = dbHandlerInstance.GetParameter<int>(FatherID, "@fatherNodeId", DbType.Int32);
+ parameterArray[2] = dbHandlerInstance.GetParameter<string>(Title, "@title", DbType.String);
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>(Filename, "@filename", DbType.String);
+ parameterArray[4] = dbHandlerInstance.GetParameter<string>(Arguments, "@arguments", DbType.String);
+ parameterArray[5] = dbHandlerInstance.GetParameter<string>(ProgramUtils.WindowStyleToStr(WindowStyle), "@windowStyle", DbType.String);
+ parameterArray[6] = dbHandlerInstance.GetParameter<string>(StartupDir, "@startupDir", DbType.String);
+ parameterArray[7] = dbHandlerInstance.GetParameter<bool>(UseShellExecute, "@useShellExecute", DbType.Boolean);
+ parameterArray[8] = dbHandlerInstance.GetParameter<bool>(UseQuotes, "@useQuotes", DbType.Boolean);
+ parameterArray[9] = dbHandlerInstance.GetParameter<string>(ProgramUtils.ApplicationTypeToString(SourceType), "@applicationItemType", DbType.String);
+ parameterArray[10] = dbHandlerInstance.GetParameter<string>(Source, "@source", DbType.String);
+ parameterArray[11] = dbHandlerInstance.GetParameter<string>(imageFile, "@imageFile", DbType.String);
+ parameterArray[12] = dbHandlerInstance.GetParameter<string>(FileDire...
[truncated message content] |
|
From: <an...@us...> - 2007-08-16 05:22:47
|
Revision: 841
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=841&view=rev
Author: and-81
Date: 2007-08-15 22:22:46 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-08-15 14:22:31 UTC (rev 840)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-08-16 05:22:46 UTC (rev 841)
@@ -28,7 +28,6 @@
static string _localPipeName;
static string _blastPort = "None";
- static string _blastSpeed = "None";
static bool _treatAsChannelNumber = false;
static int _padChannelNumber = 0;
@@ -66,10 +65,6 @@
_blastPort = args[++index];
continue;
- case "-speed":
- _blastSpeed = args[++index];
- continue;
-
case "-channel":
_treatAsChannelNumber = true;
continue;
@@ -126,14 +121,14 @@
foreach (char digit in channelNumber.ToString())
{
- if (digit == '~')
+ if (digit.Equals('~'))
{
Thread.Sleep(500);
}
else
{
fileName = Common.FolderIRCommands + digit + Common.FileExtensionIR;
- BlastIR(fileName, _blastPort, _blastSpeed);
+ BlastIR(fileName, _blastPort);
}
}
}
@@ -144,7 +139,7 @@
else
{
fileName = Common.FolderIRCommands + command;
- BlastIR(fileName, _blastPort, _blastSpeed);
+ BlastIR(fileName, _blastPort);
}
}
@@ -512,18 +507,16 @@
}
}
- static void BlastIR(string fileName, string port, string speed)
+ static void BlastIR(string fileName, string port)
{
FileStream file = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);
- byte[] outData = new byte[8 + port.Length + speed.Length + file.Length];
+ byte[] outData = new byte[4 + port.Length + file.Length];
BitConverter.GetBytes(port.Length).CopyTo(outData, 0);
Encoding.ASCII.GetBytes(port).CopyTo(outData, 4);
- BitConverter.GetBytes(speed.Length).CopyTo(outData, 4 + port.Length);
- Encoding.ASCII.GetBytes(speed).CopyTo(outData, 8 + port.Length);
- file.Read(outData, 8 + port.Length + speed.Length, (int)file.Length);
+ file.Read(outData, 4 + port.Length, (int)file.Length);
file.Close();
PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Blast", outData);
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-08-15 14:22:31 UTC (rev 840)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-08-16 05:22:46 UTC (rev 841)
@@ -29,7 +29,6 @@
static string _localPipeName;
static string _blastPort = "None";
- static string _blastSpeed = "None";
static bool _treatAsChannelNumber = false;
static int _padChannelNumber = 0;
@@ -65,10 +64,6 @@
_blastPort = args[++index];
continue;
- case "-speed":
- _blastSpeed = args[++index];
- continue;
-
case "-channel":
_treatAsChannelNumber = true;
continue;
@@ -125,14 +120,14 @@
foreach (char digit in channelNumber.ToString())
{
- if (digit == '~')
+ if (digit.Equals('~'))
{
Thread.Sleep(500);
}
else
{
fileName = Common.FolderIRCommands + digit + Common.FileExtensionIR;
- BlastIR(fileName, _blastPort, _blastSpeed);
+ BlastIR(fileName, _blastPort);
}
}
}
@@ -143,7 +138,7 @@
else
{
fileName = Common.FolderIRCommands + command;
- BlastIR(fileName, _blastPort, _blastSpeed);
+ BlastIR(fileName, _blastPort);
}
}
@@ -474,18 +469,16 @@
}
}
- static void BlastIR(string fileName, string port, string speed)
+ static void BlastIR(string fileName, string port)
{
FileStream file = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);
- byte[] outData = new byte[8 + port.Length + speed.Length + file.Length];
+ byte[] outData = new byte[4 + port.Length + file.Length];
BitConverter.GetBytes(port.Length).CopyTo(outData, 0);
Encoding.ASCII.GetBytes(port).CopyTo(outData, 4);
- BitConverter.GetBytes(speed.Length).CopyTo(outData, 4 + port.Length);
- Encoding.ASCII.GetBytes(speed).CopyTo(outData, 8 + port.Length);
- file.Read(outData, 8 + port.Length + speed.Length, (int)file.Length);
+ file.Read(outData, 4 + port.Length, (int)file.Length);
file.Close();
PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Blast", outData);
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-08-15 14:22:31 UTC (rev 840)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-08-16 05:22:46 UTC (rev 841)
@@ -1005,7 +1005,8 @@
break;
}
- SendToRepeaters(received);
+ if (_registeredRepeaters.Count > 0)
+ SendToRepeaters(received);
PipeMessage response = new PipeMessage(Common.ServerPipeName, Environment.MachineName, received.Name + " Failure", null);
Modified: trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs
===================================================================
--- trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs 2007-08-15 14:22:31 UTC (rev 840)
+++ trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs 2007-08-16 05:22:46 UTC (rev 841)
@@ -33,13 +33,16 @@
ForwardMouseEvent,
}
- public enum MessageType
+ [Flags]
+ public enum MessageTypes
{
- Request,
- Response,
- Success,
- Failure,
- Other,
+ None = 0,
+ Request = 1,
+ Response = 2,
+ Success = 4,
+ Failure = 8,
+ DoResponse = 16,
+ DontRespond = 32,
}
*/
#endregion Enumerations
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-08-15 14:22:33
|
Revision: 840
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=840&view=rev
Author: and-81
Date: 2007-08-15 07:22:31 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/ExternalProgram.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Mouse.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs
trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/APipeConnection.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginInterface.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Keyboard.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceDetectionData.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceIrCode.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Mouse.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite.sln
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -41,11 +41,10 @@
[STAThread]
static void Main(string[] args)
{
+ // TODO: Change log level to info for release.
IrssLog.LogLevel = IrssLog.Level.Debug;
IrssLog.Open(Common.FolderIrssLogs + "IR Blast.log");
- IrssLog.Debug("Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit"));
-
ShowHeader();
try
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -42,11 +42,10 @@
[STAThread]
static void Main(string[] args)
{
+ // TODO: Change log level to info for release.
IrssLog.LogLevel = IrssLog.Level.Debug;
IrssLog.Open(Common.FolderIrssLogs + "IR Blast (No Window).log");
- IrssLog.Debug("Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit"));
-
try
{
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -40,8 +40,6 @@
// TODO: Change log level to info for release.
IrssLog.LogLevel = IrssLog.Level.Debug;
IrssLog.Open(Common.FolderIrssLogs + "IR Server.log");
-
- IrssLog.Debug("Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit"));
}
catch (Exception ex)
{
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -210,7 +210,7 @@
this.groupBoxButton.Controls.Add(this.textBoxButtonDesc);
this.groupBoxButton.Location = new System.Drawing.Point(8, 8);
this.groupBoxButton.Name = "groupBoxButton";
- this.groupBoxButton.Size = new System.Drawing.Size(456, 80);
+ this.groupBoxButton.Size = new System.Drawing.Size(464, 80);
this.groupBoxButton.TabIndex = 0;
this.groupBoxButton.TabStop = false;
this.groupBoxButton.Text = "Button";
@@ -241,7 +241,7 @@
this.textBoxKeyCode.Location = new System.Drawing.Point(88, 16);
this.textBoxKeyCode.Name = "textBoxKeyCode";
this.textBoxKeyCode.ReadOnly = true;
- this.textBoxKeyCode.Size = new System.Drawing.Size(360, 20);
+ this.textBoxKeyCode.Size = new System.Drawing.Size(368, 20);
this.textBoxKeyCode.TabIndex = 1;
this.textBoxKeyCode.TabStop = false;
this.textBoxKeyCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -253,7 +253,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.textBoxButtonDesc.Location = new System.Drawing.Point(88, 48);
this.textBoxButtonDesc.Name = "textBoxButtonDesc";
- this.textBoxButtonDesc.Size = new System.Drawing.Size(360, 20);
+ this.textBoxButtonDesc.Size = new System.Drawing.Size(368, 20);
this.textBoxButtonDesc.TabIndex = 3;
this.toolTips.SetToolTip(this.textBoxButtonDesc, "Provide a description of this button here");
this.textBoxButtonDesc.TextChanged += new System.EventHandler(this.textBoxButtonDesc_TextChanged);
@@ -269,7 +269,7 @@
this.groupBoxSet.Controls.Add(this.buttonTest);
this.groupBoxSet.Location = new System.Drawing.Point(8, 96);
this.groupBoxSet.Name = "groupBoxSet";
- this.groupBoxSet.Size = new System.Drawing.Size(456, 296);
+ this.groupBoxSet.Size = new System.Drawing.Size(464, 296);
this.groupBoxSet.TabIndex = 1;
this.groupBoxSet.TabStop = false;
this.groupBoxSet.Text = "Command";
@@ -282,7 +282,7 @@
this.textBoxCommand.Location = new System.Drawing.Point(64, 264);
this.textBoxCommand.Name = "textBoxCommand";
this.textBoxCommand.ReadOnly = true;
- this.textBoxCommand.Size = new System.Drawing.Size(328, 20);
+ this.textBoxCommand.Size = new System.Drawing.Size(336, 20);
this.textBoxCommand.TabIndex = 2;
//
// buttonSet
@@ -313,7 +313,7 @@
this.tabControl.Location = new System.Drawing.Point(8, 24);
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
- this.tabControl.Size = new System.Drawing.Size(440, 232);
+ this.tabControl.Size = new System.Drawing.Size(448, 232);
this.tabControl.TabIndex = 0;
//
// tabPageBlastIR
@@ -1626,7 +1626,7 @@
this.tabPageMisc.Location = new System.Drawing.Point(4, 22);
this.tabPageMisc.Name = "tabPageMisc";
this.tabPageMisc.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageMisc.Size = new System.Drawing.Size(432, 206);
+ this.tabPageMisc.Size = new System.Drawing.Size(440, 206);
this.tabPageMisc.TabIndex = 7;
this.tabPageMisc.Text = "Misc";
this.tabPageMisc.UseVisualStyleBackColor = true;
@@ -1652,7 +1652,7 @@
// buttonTest
//
this.buttonTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonTest.Location = new System.Drawing.Point(400, 264);
+ this.buttonTest.Location = new System.Drawing.Point(408, 264);
this.buttonTest.Name = "buttonTest";
this.buttonTest.Size = new System.Drawing.Size(48, 20);
this.buttonTest.TabIndex = 3;
@@ -1665,7 +1665,7 @@
//
this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.buttonCancel.Location = new System.Drawing.Point(408, 400);
+ this.buttonCancel.Location = new System.Drawing.Point(416, 400);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(56, 24);
this.buttonCancel.TabIndex = 3;
@@ -1676,7 +1676,7 @@
// buttonOK
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonOK.Location = new System.Drawing.Point(344, 400);
+ this.buttonOK.Location = new System.Drawing.Point(352, 400);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(56, 24);
this.buttonOK.TabIndex = 2;
@@ -1690,14 +1690,14 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.buttonCancel;
- this.ClientSize = new System.Drawing.Size(472, 433);
+ this.ClientSize = new System.Drawing.Size(480, 433);
this.Controls.Add(this.groupBoxButton);
this.Controls.Add(this.groupBoxSet);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOK);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(480, 428);
+ this.MinimumSize = new System.Drawing.Size(488, 428);
this.Name = "ButtonMappingForm";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -91,9 +91,9 @@
private void ButtonMappingForm_Load(object sender, EventArgs e)
{
- textBoxKeyCode.Text = _keyCode;
- textBoxButtonDesc.Text = _description;
- textBoxCommand.Text = _command;
+ textBoxKeyCode.Text = _keyCode;
+ textBoxButtonDesc.Text = _description;
+ textBoxCommand.Text = _command;
// Setup IR Blast tab
SetupIRList();
@@ -127,6 +127,7 @@
// Setup Misc tab
comboBoxMiscCommand.Items.Clear();
+ comboBoxMiscCommand.Items.Add(Common.UITextTranslator);
comboBoxMiscCommand.Items.Add(Common.UITextEject);
comboBoxMiscCommand.Items.Add(Common.UITextStandby);
comboBoxMiscCommand.Items.Add(Common.UITextHibernate);
@@ -261,11 +262,26 @@
comboBoxMiscCommand.SelectedItem = Common.UITextHibernate;
break;
+ case Common.CmdPrefixReboot:
+ comboBoxMiscCommand.SelectedItem = Common.UITextReboot;
+ break;
+
+ case Common.CmdPrefixShutdown:
+ comboBoxMiscCommand.SelectedItem = Common.UITextShutdown;
+ break;
+
+ case Common.CmdPrefixStandby:
+ comboBoxMiscCommand.SelectedItem = Common.UITextStandby;
+ break;
+
+ case Common.CmdPrefixTranslator:
+ comboBoxMiscCommand.SelectedItem = Common.UITextTranslator;
+ break;
+
default:
if (prefix.Equals(Common.CmdPrefixEject, StringComparison.InvariantCultureIgnoreCase))
- {
comboBoxMiscCommand.SelectedItem = Common.UITextEject;
- }
+ //else
break;
}
break;
@@ -435,10 +451,22 @@
textBoxCommand.Text = _command = Common.CmdPrefixHibernate;
break;
+ case Common.UITextReboot:
+ textBoxCommand.Text = _command = Common.CmdPrefixReboot;
+ break;
- }
+ case Common.CmdPrefixShutdown:
+ textBoxCommand.Text = _command = Common.CmdPrefixShutdown;
+ break;
+ case Common.CmdPrefixStandby:
+ textBoxCommand.Text = _command = Common.CmdPrefixStandby;
+ break;
+ case Common.CmdPrefixTranslator:
+ textBoxCommand.Text = _command = Common.CmdPrefixTranslator;
+ break;
+ }
break;
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -140,7 +140,7 @@
processWindow = process.MainWindowHandle;
if (processWindow != IntPtr.Zero)
{
- Win32.SetForegroundWindow(processWindow);
+ Win32.SetForegroundWindow(processWindow, true);
break;
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -21,71 +21,6 @@
static class Program
{
- #region Enumerations
-
- /// <summary>
- /// A list of MCE remote buttons.
- /// </summary>
- internal enum MceButton
- {
- Custom = -1,
- None = 0,
- TV_Power = 0x7b9a,
- Blue = 0x7ba1,
- Yellow = 0x7ba2,
- Green = 0x7ba3,
- Red = 0x7ba4,
- Teletext = 0x7ba5,
- Radio = 0x7baf,
- Print = 0x7bb1,
- Videos = 0x7bb5,
- Pictures = 0x7bb6,
- Recorded_TV = 0x7bb7,
- Music = 0x7bb8,
- TV = 0x7bb9,
- Guide = 0x7bd9,
- Live_TV = 0x7bda,
- DVD_Menu = 0x7bdb,
- Back = 0x7bdc,
- OK = 0x7bdd,
- Right = 0x7bde,
- Left = 0x7bdf,
- Down = 0x7be0,
- Up = 0x7be1,
- Star = 0x7be2,
- Hash = 0x7be3,
- Replay = 0x7be4,
- Skip = 0x7be5,
- Stop = 0x7be6,
- Pause = 0x7be7,
- Record = 0x7be8,
- Play = 0x7be9,
- Rewind = 0x7bea,
- Forward = 0x7beb,
- Channel_Down = 0x7bec,
- Channel_Up = 0x7bed,
- Volume_Down = 0x7bee,
- Volume_Up = 0x7bef,
- Info = 0x7bf0,
- Mute = 0x7bf1,
- Start = 0x7bf2,
- PC_Power = 0x7bf3,
- Enter = 0x7bf4,
- Escape = 0x7bf5,
- Number_9 = 0x7bf6,
- Number_8 = 0x7bf7,
- Number_7 = 0x7bf8,
- Number_6 = 0x7bf9,
- Number_5 = 0x7bfa,
- Number_4 = 0x7bfb,
- Number_3 = 0x7bfc,
- Number_2 = 0x7bfd,
- Number_1 = 0x7bfe,
- Number_0 = 0x7bff,
- }
-
- #endregion Enumerations
-
#region Constants
internal static readonly string ConfigFile = Common.FolderAppData + "Translator\\Translator.xml";
@@ -113,7 +48,6 @@
static TransceiverInfo _transceiverInfo = new TransceiverInfo();
//static Thread _focusWatcher;
- static IntPtr _ownWindowHandle = IntPtr.Zero;
static IntPtr _currentForegroundWindow = IntPtr.Zero;
#endregion Variables
@@ -156,38 +90,7 @@
{
if (args.Length > 0)
{
- for (int index = 0; index < args.Length; index++)
- {
- switch (args[index].ToLowerInvariant())
- {
- case "-macro":
- SendCopyDataMessage("Translator", Common.CmdPrefixMacro + args[++index]);
- continue;
-
- case "-eject":
- SendCopyDataMessage("Translator", Common.CmdPrefixEject + args[++index]);
- continue;
-
- case "-shutdown":
- SendCopyDataMessage("Translator", Common.CmdPrefixShutdown);
- continue;
-
- case "-reboot":
- SendCopyDataMessage("Translator", Common.CmdPrefixReboot);
- continue;
-
- case "-standby":
- SendCopyDataMessage("Translator", Common.CmdPrefixStandby);
- continue;
-
- case "-hibernate":
- SendCopyDataMessage("Translator", Common.CmdPrefixHibernate);
- continue;
-
- //TODO: Add more command line options.
- }
- }
-
+ ProcessCommandLine(args);
return;
}
@@ -202,8 +105,6 @@
IrssLog.LogLevel = IrssLog.Level.Debug;
IrssLog.Open(Common.FolderIrssLogs + "Translator.log");
- IrssLog.Debug("Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit"));
-
_config = Configuration.Load(ConfigFile);
if (_config == null)
_config = new Configuration();
@@ -229,7 +130,6 @@
// Setup main form ...
_mainForm = new MainForm();
- _ownWindowHandle = _mainForm.Handle;
// Start the window focus watcher thread
/*
@@ -264,7 +164,11 @@
IrssLog.Close();
}
- static void FocusWatcherThread()
+ #endregion Main
+
+ #region Implementation
+
+ /*static void FocusWatcherThread()
{
try
{
@@ -277,7 +181,7 @@
catch
{
}
- }
+ }*/
static void UpdateForegroundWindow()
{
@@ -287,20 +191,25 @@
if (hWnd == IntPtr.Zero)
return;
-
+
if (hWnd == _mainForm.Handle)
- return;
-/*
- string windowTitle = Win32.GetWindowTitle(hWnd);
- if (windowTitle.StartsWith("Translator", StringComparison.InvariantCultureIgnoreCase))
return;
- int procID;
- Win32.GetWindowThreadProcessId(hWnd, out procID);
- Process proc = Process.GetProcessById(procID);
- if (proc.MainModule.ModuleName.Equals("Translator.exe", StringComparison.InvariantCultureIgnoreCase))
+ if (hWnd == _notifyIcon.ContextMenuStrip.Handle)
return;
- */
+
+ /*
+ string windowTitle = Win32.GetWindowTitle(hWnd);
+ if (windowTitle.StartsWith("Translator", StringComparison.InvariantCultureIgnoreCase))
+ return;
+
+ int procID;
+ Win32.GetWindowThreadProcessId(hWnd, out procID);
+ Process proc = Process.GetProcessById(procID);
+ if (proc.MainModule.ModuleName.Equals("Translator.exe", StringComparison.InvariantCultureIgnoreCase))
+ return;
+ */
+
_currentForegroundWindow = hWnd;
}
catch
@@ -308,14 +217,49 @@
}
}
- #endregion Main
+ static void ProcessCommandLine(string[] args)
+ {
+ for (int index = 0; index < args.Length; index++)
+ {
+ switch (args[index].ToLowerInvariant())
+ {
+ case "-macro":
+ SendCopyDataMessage("Translator", Common.CmdPrefixMacro + args[++index]);
+ continue;
- #region Implementation
+ case "-eject":
+ SendCopyDataMessage("Translator", Common.CmdPrefixEject + args[++index]);
+ continue;
+ case "-shutdown":
+ SendCopyDataMessage("Translator", Common.CmdPrefixShutdown);
+ continue;
+
+ case "-reboot":
+ SendCopyDataMessage("Translator", Common.CmdPrefixReboot);
+ continue;
+
+ case "-standby":
+ SendCopyDataMessage("Translator", Common.CmdPrefixStandby);
+ continue;
+
+ case "-hibernate":
+ SendCopyDataMessage("Translator", Common.CmdPrefixHibernate);
+ continue;
+
+ //TODO: Add more command line options.
+ }
+ }
+ }
+
static void ShowTranslatorMenu()
{
UpdateForegroundWindow();
+
_notifyIcon.ContextMenuStrip.Show(Screen.PrimaryScreen.Bounds.Width / 4, Screen.PrimaryScreen.Bounds.Height / 4);
+
+ //Win32.SetForegroundWindow(_notifyIcon.ContextMenuStrip.Handle, true);
+
//_notifyIcon.ContextMenuStrip.Focus();
}
@@ -424,15 +368,9 @@
actions.DropDownItems.Add("System Standby", null, new EventHandler(ClickAction));
actions.DropDownItems.Add("System Hibernate", null, new EventHandler(ClickAction));
actions.DropDownItems.Add("System Reboot", null, new EventHandler(ClickAction));
- actions.DropDownItems.Add("System Logoff", null, new EventHandler(ClickAction));
+ //actions.DropDownItems.Add("System Logoff", null, new EventHandler(ClickAction));
actions.DropDownItems.Add("System Shutdown", null, new EventHandler(ClickAction));
-
- actions.DropDownItems.Add(new ToolStripSeparator());
- actions.DropDownItems.Add("Volume Up", null, new EventHandler(ClickAction));
- actions.DropDownItems.Add("Volume Down", null, new EventHandler(ClickAction));
- actions.DropDownItems.Add("Volume Mute", null, new EventHandler(ClickAction));
-
actions.DropDownItems.Add(new ToolStripSeparator());
ToolStripMenuItem ejectMenu = new ToolStripMenuItem("Eject");
@@ -442,6 +380,12 @@
ejectMenu.DropDownItems.Add(drive.Name, null, new EventHandler(ClickEjectAction));
actions.DropDownItems.Add(ejectMenu);
+ actions.DropDownItems.Add(new ToolStripSeparator());
+
+ actions.DropDownItems.Add("Volume Up", null, new EventHandler(ClickAction));
+ actions.DropDownItems.Add("Volume Down", null, new EventHandler(ClickAction));
+ actions.DropDownItems.Add("Volume Mute", null, new EventHandler(ClickAction));
+
_notifyIcon.ContextMenuStrip.Items.Add(actions);
/**/
@@ -595,23 +539,25 @@
break;
case "System Standby":
- Application.SetSuspendState(PowerState.Suspend, true, false);
+ Standby();
break;
case "System Hibernate":
- Application.SetSuspendState(PowerState.Hibernate, true, false);
+ Hibernate();
break;
case "System Reboot":
- Win32.ExitWindowsEx(Win32.ExitWindows.Reboot | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReason.FlagUserDefined);
+ Reboot();
break;
+ /*
case "System Logoff":
- Win32.ExitWindowsEx(Win32.ExitWindows.LogOff | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReason.FlagUserDefined);
+ LogOff();
break;
+ */
case "System Shutdown":
- Win32.ExitWindowsEx(Win32.ExitWindows.ShutDown | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReason.FlagUserDefined);
+ ShutDown();
break;
@@ -1063,17 +1009,13 @@
{
try
{
- IntPtr active = Win32.GetForegroundWindow();
-
- if (active.Equals(IntPtr.Zero))
+ int pid = Win32.GetForegroundWindowPID();
+ if (pid == -1)
{
- IrssLog.Debug("No active program (no foreground window)");
+ IrssLog.Debug("Error retreiving foreground window process ID");
return null;
}
- int pid = -1;
- Win32.GetWindowThreadProcessId(active, out pid);
-
string fileName = Path.GetFileName(Process.GetProcessById(pid).MainModule.FileName);
foreach (ProgramSettings progSettings in Config.Programs)
@@ -1174,6 +1116,33 @@
}
+ static void Hibernate()
+ {
+ IrssLog.Info("Hibernate");
+ Application.SetSuspendState(PowerState.Hibernate, true, false);
+ }
+ static void Standby()
+ {
+ IrssLog.Info("Standby");
+ Application.SetSuspendState(PowerState.Suspend, true, false);
+ }
+ static void Reboot()
+ {
+ IrssLog.Info("Reboot");
+ Win32.ExitWindowsEx(Win32.ExitWindows.Reboot | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReasons.FlagUserDefined);
+ }
+ /*static void LogOff()
+ {
+ IrssLog.Info("LogOff");
+ Win32.ExitWindowsEx(Win32.ExitWindows.LogOff | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReason.FlagUserDefined);
+ }*/
+ static void ShutDown()
+ {
+ IrssLog.Info("ShutDown");
+ Win32.ExitWindowsEx(Win32.ExitWindows.ShutDown | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReasons.FlagUserDefined);
+ }
+
+
static void MapEvent(MappingEvent theEvent)
{
if (_inConfiguration)
@@ -1285,15 +1254,27 @@
case Common.XmlTagStandby:
{
- Application.SetSuspendState(PowerState.Suspend, true, false);
+ Standby();
break;
}
case Common.XmlTagHibernate:
{
- Application.SetSuspendState(PowerState.Hibernate, true, false);
+ Hibernate();
break;
}
+
+ case Common.XmlTagShutdown:
+ {
+ ShutDown();
+ break;
+ }
+
+ case Common.XmlTagReboot:
+ {
+ Reboot();
+ break;
+ }
}
}
}
@@ -1415,6 +1396,26 @@
string mouseCommand = command.Substring(Common.CmdPrefixMouse.Length);
Common.ProcessMouseCommand(mouseCommand);
}
+ else if (command.StartsWith(Common.CmdPrefixHibernate)) // Hibernate Command
+ {
+ Hibernate();
+ }
+ else if (command.StartsWith(Common.CmdPrefixReboot)) // Reboot Command
+ {
+ Reboot();
+ }
+ else if (command.StartsWith(Common.CmdPrefixShutdown)) // Shutdown Command
+ {
+ ShutDown();
+ }
+ else if (command.StartsWith(Common.CmdPrefixStandby)) // Standby Command
+ {
+ Standby();
+ }
+ else if (command.StartsWith(Common.CmdPrefixTranslator)) // Translator Command
+ {
+ ShowTranslatorMenu();
+ }
else
{
throw new ArgumentException(String.Format("Cannot process unrecognized command \"{0}\"", command), "command");
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2007-08-15 14:22:31 UTC (rev 840)
@@ -106,12 +106,6 @@
<Compile Include="Forms\MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
- <Compile Include="Forms\PopupMenu.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Forms\PopupMenu.Designer.cs">
- <DependentUpon>PopupMenu.cs</DependentUpon>
- </Compile>
<Compile Include="MappedEvent.cs" />
<Compile Include="Program.cs" />
<Compile Include="ProgramSettings.cs" />
@@ -144,10 +138,6 @@
<SubType>Designer</SubType>
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Forms\PopupMenu.resx">
- <SubType>Designer</SubType>
- <DependentUpon>PopupMenu.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -20,11 +20,10 @@
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
+ // TODO: Change log level to info for release.
IrssLog.LogLevel = IrssLog.Level.Debug;
IrssLog.Open(Common.FolderIrssLogs + "Tray Launcher.log");
- IrssLog.Debug("Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit"));
-
Tray tray = new Tray();
if (tray.Start())
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -84,11 +84,10 @@
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
+ // TODO: Change log level to info for release.
IrssLog.LogLevel = IrssLog.Level.Debug;
IrssLog.Open(Common.FolderIrssLogs + "Virtual Remote.log");
- IrssLog.Debug("Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit"));
-
LoadSettings();
if (args.Length > 0) // Command Line Start ...
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -279,11 +279,10 @@
private void MainForm_Load(object sender, EventArgs e)
{
+ // TODO: Change log level to info for release.
IrssLog.LogLevel = IrssLog.Level.Debug;
IrssLog.Open(Common.FolderIrssLogs + "Virtual Remote Skin Editor.log");
- IrssLog.Debug("Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit"));
-
UpdateWindowTitle();
comboBoxShortcut.Items.Clear();
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -124,6 +124,8 @@
public const string CmdPrefixEject = "Eject: ";
+ public const string CmdPrefixTranslator = "Show Translator Menu";
+
#endregion Command Prefixes
#region XML Tags
@@ -152,6 +154,8 @@
public const string XmlTagEject = "EJECT";
+ public const string XmlTagTranslator = "TRANSLATOR";
+
#endregion XML Tags
#region User Interface Text
@@ -174,11 +178,14 @@
public const string UITextHibernate = "Hibernate";
public const string UITextReboot = "Reboot";
public const string UITextShutdown = "Shutdown";
+ //public const string UITextLogoff
public const string UITextMouse = "Mouse Command";
public const string UITextEject = "Eject CD";
+ public const string UITextTranslator = "Show Translator Menu";
+
#endregion User Interface Text
#region Mouse Commands
@@ -323,7 +330,7 @@
processWindow = process.MainWindowHandle;
if (processWindow != IntPtr.Zero)
{
- Win32.SetForegroundWindow(processWindow);
+ Win32.SetForegroundWindow(processWindow, true);
break;
}
@@ -372,7 +379,9 @@
{
IntPtr windowHandle = IntPtr.Zero;
- switch (commands[0].ToLowerInvariant())
+ string matchType = commands[0].ToLowerInvariant();
+
+ switch (matchType)
{
case "active":
windowHandle = Win32.GetForegroundWindow();
@@ -383,7 +392,7 @@
{
try
{
- if (proc.MainModule.FileName == commands[1])
+ if (commands[1].Equals(proc.MainModule.FileName, StringComparison.InvariantCultureIgnoreCase))
{
windowHandle = proc.MainWindowHandle;
break;
@@ -410,15 +419,12 @@
//Win32.SendMessage(windowHandle, msg, wordParam, longParam);
- IntPtr result;
+ IntPtr result = IntPtr.Zero;
Win32.SendMessageTimeout(windowHandle, msg, wordParam, longParam, Win32.SendMessageTimeoutFlags.SMTO_ABORTIFHUNG, 1000, out result);
+ int lastError = Marshal.GetLastWin32Error();
if (result == IntPtr.Zero)
- {
- int lastError = Marshal.GetLastWin32Error();
Marshal.ThrowExceptionForHR(lastError);
- }
-
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/ExternalProgram.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/ExternalProgram.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/ExternalProgram.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -173,7 +173,7 @@
processWindow = process.MainWindowHandle;
if (processWindow != IntPtr.Zero)
{
- Win32.SetForegroundWindow(processWindow);
+ Win32.SetForegroundWindow(processWindow, true);
break;
}
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -17,7 +17,7 @@
byte bVk,
byte bScan,
uint dwFlags,
- UIntPtr dwExtraInfo);
+ IntPtr dwExtraInfo);
#endregion Interop
@@ -26,7 +26,7 @@
/// <summary>
/// Virtual Key Codes
/// </summary>
- public enum VKey : byte
+ public enum VKey
{
None = 0,
VK_0 = 0x30,
@@ -174,8 +174,7 @@
/// Key Event Types
/// </summary>
[Flags]
- [CLSCompliant(false)]
- public enum KeyEvents : uint
+ public enum KeyEvents
{
KeyDown = 0,
ExtendedKey = 1,
@@ -194,7 +193,7 @@
/// <param name="vKey">Virtual key to press.</param>
public static void KeyDown(VKey vKey)
{
- keybd_event((byte)vKey, 0, (uint)KeyEvents.KeyDown, UIntPtr.Zero);
+ keybd_event((byte)vKey, 0, (uint)KeyEvents.KeyDown, IntPtr.Zero);
}
/// <summary>
@@ -203,7 +202,7 @@
/// <param name="vKey">Virtual key to release.</param>
public static void KeyUp(VKey vKey)
{
- keybd_event((byte)vKey, 0, (uint)KeyEvents.KeyUp, UIntPtr.Zero);
+ keybd_event((byte)vKey, 0, (uint)KeyEvents.KeyUp, IntPtr.Zero);
}
/// <summary>
@@ -213,8 +212,7 @@
/// <param name="scan">Scan code.</param>
/// <param name="flags">Event type.</param>
/// <param name="extraInfo">Pointer to additional information.</param>
- [CLSCompliant(false)]
- public static void Event(VKey vKey, byte scan, KeyEvents flags, UIntPtr extraInfo)
+ public static void Event(VKey vKey, byte scan, KeyEvents flags, IntPtr extraInfo)
{
keybd_event((byte)vKey, scan, (uint)flags, extraInfo);
}
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Mouse.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Mouse.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Mouse.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -23,7 +23,7 @@
/// Used to simulate mouse actions.
/// </summary>
[Flags]
- public enum MouseEvents : int
+ public enum MouseEvents
{
None = 0x0000,
Move = 0x0001,
@@ -40,7 +40,7 @@
/// <summary>
/// Used to simulate mouse wheel scrolling.
/// </summary>
- public enum ScrollDir : int
+ public enum ScrollDir
{
None = 0,
Up = 120,
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -292,46 +292,46 @@
}
[Flags]
- public enum ShutdownReason
+ public enum ShutdownReasons
{
- MajorApplication = 0x00040000,
- MajorHardware = 0x00010000,
- MajorLegacyApi = 0x00070000,
- MajorOperatingSystem = 0x00020000,
- MajorOther = 0x00000000,
- MajorPower = 0x00060000,
- MajorSoftware = 0x00030000,
- MajorSystem = 0x00050000,
+ MajorApplication = 0x00040000,
+ MajorHardware = 0x00010000,
+ MajorLegacyApi = 0x00070000,
+ MajorOperatingSystem = 0x00020000,
+ MajorOther = 0x00000000,
+ MajorPower = 0x00060000,
+ MajorSoftware = 0x00030000,
+ MajorSystem = 0x00050000,
- MinorBlueScreen = 0x0000000F,
- MinorCordUnplugged = 0x0000000b,
- MinorDisk = 0x00000007,
- MinorEnvironment = 0x0000000c,
- MinorHardwareDriver = 0x0000000d,
- MinorHotfix = 0x00000011,
- MinorHung = 0x00000005,
- MinorInstallation = 0x00000002,
- MinorMaintenance = 0x00000001,
- MinorMMC = 0x00000019,
- MinorNetworkConnectivity = 0x00000014,
- MinorNetworkCard = 0x00000009,
- MinorOther = 0x00000000,
- MinorOtherDriver = 0x0000000e,
- MinorPowerSupply = 0x0000000a,
- MinorProcessor = 0x00000008,
- MinorReconfig = 0x00000004,
- MinorSecurity = 0x00000013,
- MinorSecurityFix = 0x00000012,
+ MinorBlueScreen = 0x0000000F,
+ MinorCordUnplugged = 0x0000000b,
+ MinorDisk = 0x00000007,
+ MinorEnvironment = 0x0000000c,
+ MinorHardwareDriver = 0x0000000d,
+ MinorHotfix = 0x00000011,
+ MinorHung = 0x00000005,
+ MinorInstallation = 0x00000002,
+ MinorMaintenance = 0x00000001,
+ MinorMMC = 0x00000019,
+ MinorNetworkConnectivity = 0x00000014,
+ MinorNetworkCard = 0x00000009,
+ MinorOther = 0x00000000,
+ MinorOtherDriver = 0x0000000e,
+ MinorPowerSupply = 0x0000000a,
+ MinorProcessor = 0x00000008,
+ MinorReconfig = 0x00000004,
+ MinorSecurity = 0x00000013,
+ MinorSecurityFix = 0x00000012,
MinorSecurityFixUninstall = 0x00000018,
- MinorServicePack = 0x00000010,
+ MinorServicePack = 0x00000010,
MinorServicePackUninstall = 0x00000016,
- MinorTermSrv = 0x00000020,
- MinorUnstable = 0x00000006,
- MinorUpgrade = 0x00000003,
- MinorWMI = 0x00000015,
+ MinorTermSrv = 0x00000020,
+ MinorUnstable = 0x00000006,
+ MinorUpgrade = 0x00000003,
+ MinorWMI = 0x00000015,
- FlagUserDefined = 0x40000000,
- //FlagPlanned = 0x80000000,
+ FlagUserDefined = 0x40000000,
+ //FlagPlanned = 0x80000000,
}
[Flags]
@@ -343,7 +343,7 @@
Reboot = 0x02,
PowerOff = 0x08,
RestartApps = 0x40,
- // Optionally include ONE of the following two:
+ // Optionally include ONE of the following:
Force = 0x04,
ForceIfHung = 0x10,
}
@@ -376,16 +376,13 @@
[DllImport("user32.dll")]
public static extern IntPtr GetForegroundWindow();
- [DllImport("user32.dll")]
+ [DllImport("user32.dll", SetLastError = true)]
[return: MarshalAs(UnmanagedType.Bool)]
- public static extern bool SetForegroundWindow(IntPtr hWnd);
+ public static extern bool ExitWindowsEx(ExitWindows uFlags, ShutdownReasons dwReason);
- [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
- static extern int GetWindowTextLength(IntPtr hWnd);
+ [DllImport("user32.dll", SetLastError = true)]
+ public static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
- [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
- static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
-
[DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
public static extern IntPtr SendMessageTimeout(
IntPtr hWnd,
@@ -402,16 +399,46 @@
//[DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
//public static extern int RegisterWindowMessage(string lpString);
- [DllImport("user32.dll", SetLastError = true)]
+ [DllImport("user32.dll")]
[return: MarshalAs(UnmanagedType.Bool)]
- public static extern bool ExitWindowsEx(ExitWindows uFlags, ShutdownReason dwReason);
+ private static extern bool SetFocus(IntPtr hWnd);
- [DllImport("user32.dll", SetLastError = true)]
- public static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+ [DllImport("user32.dll")]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ private static extern bool SetForegroundWindow(IntPtr hWnd);
+ [DllImport("user32.dll")]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ private static extern bool BringWindowToTop(IntPtr hWnd);
+
+ //[DllImport("user32.dll")]
+ //[return: MarshalAs(UnmanagedType.Bool)]
+ //private static extern bool ShowWindowAsync(IntPtr hWnd, int nCmdShow);
+
+ [DllImport("user32.dll")]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ private static extern bool AttachThreadInput(int nThreadId, int nThreadIdTo, bool bAttach);
+
+ //[DllImport("user32.dll")]
+ //[return: MarshalAs(UnmanagedType.Bool)]
+ //private static extern bool IsWindowVisible(IntPtr hWnd);
+
+ //[DllImport("user32.dll")]
+ //[return: MarshalAs(UnmanagedType.Bool)]
+ //private static extern bool IsIconic(IntPtr hWnd);
+
+ [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+ private static extern int GetWindowTextLength(IntPtr hWnd);
+
+ [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+ private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
+
[DllImport("user32.dll", SetLastError = true)]
- public static extern int GetWindowThreadProcessId(IntPtr hWnd, out int lpdwProcessId);
+ private static extern int GetWindowThreadProcessId(IntPtr hWnd, out int lpdwProcessId);
+ [DllImport("kernel32.dll")]
+ private static extern int GetCurrentThreadId();
+
#region Net API
[DllImport("netapi32.dll", CharSet = CharSet.Auto, SetLastError = true), SuppressUnmanagedCodeSecurityAttribute]
@@ -444,6 +471,11 @@
#region Methods
+ /// <summary>
+ /// Get the window title for a specified window handle.
+ /// </summary>
+ /// <param name="hWnd">Handle to a window.</param>
+ /// <returns>Window title.</returns>
public static string GetWindowTitle(IntPtr hWnd)
{
int length = GetWindowTextLength(hWnd);
@@ -456,6 +488,65 @@
}
/// <summary>
+ /// Takes a given window from whatever state it is in and makes it the foreground window.
+ /// </summary>
+ /// <param name="hWnd">Handle to window.</param>
+ /// <param name="force">Force from a minimized or hidden state.</param>
+ /// <returns>Success.</returns>
+ public static bool SetForegroundWindow(IntPtr hWnd, bool force)
+ {
+ IntPtr fgWindow = GetForegroundWindow();
+
+ if (hWnd == fgWindow || SetForegroundWindow(hWnd))
+ return true;
+
+ if (force == false)
+ return false;
+
+ if (fgWindow == IntPtr.Zero)
+ return false;
+
+ int fgWindowPID = -1;
+ GetWindowThreadProcessId(fgWindow, out fgWindowPID);
+
+ if (fgWindowPID == -1)
+ return false;
+
+ int curThreadID = GetCurrentThreadId();
+
+ // if we don't attach successfully to the windows thread then we're out of options
+ if (!AttachThreadInput(curThreadID, fgWindowPID, true))
+ return false;
+
+ SetForegroundWindow(hWnd);
+ BringWindowToTop(hWnd);
+ SetFocus(hWnd);
+
+ AttachThreadInput(curThreadID, fgWindowPID, false);
+
+ // we've done all that we can so base our return value on whether we have succeeded or not
+ return (GetForegroundWindow() == hWnd);
+ }
+
+ /// <summary>
+ /// Get the Process ID of the current foreground window.
+ /// </summary>
+ /// <returns>Process ID.</returns>
+ public static int GetForegroundWindowPID()
+ {
+ int pid = -1;
+
+ IntPtr active = GetForegroundWindow();
+
+ if (active.Equals(IntPtr.Zero))
+ return pid;
+
+ GetWindowThreadProcessId(active, out pid);
+
+ return pid;
+ }
+
+ /// <summary>
/// Given a 32-bit integer this method returns the High Word (upper 16 bits).
/// </summary>
/// <param name="n">32-bit integer.</param>
Modified: trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/APipeConnection.cs
===================================================================
--- trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/APipeConnection.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/APipeConnection.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -134,7 +134,7 @@
/// </summary>
/// <param name="disposing">A boolean indicating how the method is called.</param>
#endregion
- protected void Dispose(bool disposing) {
+ protected virtual void Dispose(bool disposing) {
if(!this.disposed) {
NamedPipeWrapper.Close(this.Handle);
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -55,7 +55,7 @@
static extern SafeFileHandle CreateFile(
[MarshalAs(UnmanagedType.LPTStr)] string fileName,
uint fileAccess,
- [MarshalAs(UnmanagedType.U4)] EFileShare fileShare,
+ [MarshalAs(UnmanagedType.U4)] EFileShares fileShare,
//[In, Out, MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(SecurityAttributesMarshaler))] SecurityAttributes lpSecurityAttributes,
IntPtr sa,
[MarshalAs(UnmanagedType.U4)] ECreationDisposition creationDisposition,
@@ -66,24 +66,22 @@
[return: MarshalAs(UnmanagedType.Bool)]
static extern bool CancelIo(SafeFileHandle handle);
- [CLSCompliant(false)]
[Flags]
- public enum EFileShare : uint
+ public enum EFileShares
{
None = 0x00000000,
Read = 0x00000001,
Write = 0x00000002,
- Delete = 0x00000004
+ Delete = 0x00000004,
}
- [CLSCompliant(false)]
- public enum ECreationDisposition : uint
+ public enum ECreationDisposition
{
New = 1,
CreateAlways = 2,
OpenExisting = 3,
OpenAlways = 4,
- TruncateExisting = 5
+ TruncateExisting = 5,
}
[Flags]
@@ -294,7 +292,7 @@
if (devicePath == null)
throw new Exception("No device detected");
- SafeFileHandle deviceHandle = CreateFile(devicePath, GENERIC_READ, EFileShare.Read | EFileShare.Write, IntPtr.Zero, ECreationDisposition.OpenExisting, EFileAttributes.Overlapped, IntPtr.Zero);
+ SafeFileHandle deviceHandle = CreateFile(devicePath, GENERIC_READ, EFileShares.Read | EFileShares.Write, IntPtr.Zero, ECreationDisposition.OpenExisting, EFileAttributes.Overlapped, IntPtr.Zero);
int lastError = Marshal.GetLastWin32Error();
if (lastError != 0)
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginInterface.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginInterface.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginInterface.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -49,7 +49,7 @@
/// <summary>
/// Infrared command learning timed out.
/// </summary>
- Timeout
+ Timeout,
}
#endregion Enumerations
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Keyboard.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Keyboard.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Keyboard.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -17,7 +17,7 @@
byte bVk,
byte bScan,
uint dwFlags,
- UIntPtr dwExtraInfo);
+ IntPtr dwExtraInfo);
#endregion Interop
@@ -26,7 +26,7 @@
/// <summary>
/// Virtual Key Codes.
/// </summary>
- public enum VKey : byte
+ public enum VKey
{
None = 0,
VK_0 = 0x30,
@@ -174,7 +174,7 @@
/// Key Event Types.
/// </summary>
[Flags]
- public enum KeyEvents : uint
+ public enum KeyEvents
{
KeyDown = 0,
ExtendedKey = 1,
@@ -193,7 +193,7 @@
/// <param name="vKey">Virtual key to press.</param>
public static void KeyDown(VKey vKey)
{
- keybd_event((byte)vKey, 0, (uint)KeyEvents.KeyDown, UIntPtr.Zero);
+ keybd_event((byte)vKey, 0, (uint)KeyEvents.KeyDown, IntPtr.Zero);
}
/// <summary>
@@ -202,7 +202,7 @@
/// <param name="vKey">Virtual key to release.</param>
public static void KeyUp(VKey vKey)
{
- keybd_event((byte)vKey, 0, (uint)KeyEvents.KeyUp, UIntPtr.Zero);
+ keybd_event((byte)vKey, 0, (uint)KeyEvents.KeyUp, IntPtr.Zero);
}
/// <summary>
@@ -212,7 +212,7 @@
/// <param name="scan">Scan code.</param>
/// <param name="flags">Event type.</param>
/// <param name="extraInfo">Pointer to additional information.</param>
- public static void Event(VKey vKey, byte scan, KeyEvents flags, UIntPtr extraInfo)
+ public static void Event(VKey vKey, byte scan, KeyEvents flags, IntPtr extraInfo)
{
keybd_event((byte)vKey, scan, (uint)flags, extraInfo);
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceDetectionData.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceDetectionData.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceDetectionData.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -23,17 +23,17 @@
}
[Flags]
- public enum KeyModifiers : uint
+ public enum KeyModifiers
{
- None = 0,
- LeftControl = 1,
- LeftShift = 2,
- LeftAlt = 4,
- LeftWin = 8,
- RightControl = 16,
- RightShift = 32,
- RightAlt = 64,
- RightWin = 128,
+ None = 0,
+ LeftControl = 1,
+ LeftShift = 2,
+ LeftAlt = 4,
+ LeftWin = 8,
+ RightControl = 16,
+ RightShift = 32,
+ RightAlt = 64,
+ RightWin = 128,
}
#endregion Enumerations
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceIrCode.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceIrCode.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceIrCode.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -12,7 +12,7 @@
#region Constants
- public const int DefaultCarrierFrequency = 36000;
+ public const int DefaultCarrierFrequency = 38000;
#endregion Constants
@@ -48,11 +48,8 @@
#region Constructors
public MceIrCode() : this(MceIrCode.DefaultCarrierFrequency, null) { }
-
public MceIrCode(int carrier) : this(carrier, null) { }
-
public MceIrCode(byte[] data) : this(MceIrCode.DefaultCarrierFrequency, data) { }
-
public MceIrCode(int carrier, byte[] data)
{
_carrier = carrier;
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Mouse.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Mouse.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Mouse.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -23,7 +23,7 @@
/// Used to simulate mouse actions.
/// </summary>
[Flags]
- public enum MouseEvents : int
+ public enum MouseEvents
{
None = 0x0000,
Move = 0x0001,
@@ -34,17 +34,17 @@
MiddleDown = 0x0020,
MiddleUp = 0x0040,
Scroll = 0x0800,
- Absolute = 0x8000
+ Absolute = 0x8000,
}
/// <summary>
/// Used to simulate mouse wheel scrolling.
/// </summary>
- public enum ScrollDir : int
+ public enum ScrollDir
{
None = 0,
Up = 120,
- Down = -120
+ Down = -120,
}
#endregion Enumerations
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -14,7 +14,7 @@
#region Enumerations
- enum CodeType : ushort
+ enum CodeType
{
RawOscillated = 0x0000,
RawUnmodulated = 0x0100,
@@ -33,7 +33,7 @@
YamahaNEC = 0x9001,
}
- enum CarrierFrequency : ushort
+ enum CarrierFrequency
{
Khz38 = 0x006D,
Khz36 = 0x0073,
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 2007-08-15 14:22:31 UTC (rev 840)
@@ -75,7 +75,7 @@
PosixSemantics = 0x01000000,
OpenReparsePoint = 0x00200000,
OpenNoRecall = 0x00100000,
- FirstPipeInstance = 0x00080000
+ FirstPipeInstance = 0x00080000,
}
[StructLayout(LayoutKind.Sequential)]
Modified: trunk/plugins/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-08-15 14:08:45 UTC (rev 839)
+++ trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-08-15 14:22:31 UTC (rev 840)
@@ -69,126 +69,248 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Blast (No Window)", "Applications\IR Blast (No Window)\IR Blast (No Window).csproj", "{54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IrssComms", "Common\IrssComms\IrssComms.csproj", "{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|x86.ActiveCfg = Debug|x86
{D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|x86.Build.0 = Debug|x86
+ {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|Any CPU.Build.0 = Release|Any CPU
{D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|x86.ActiveCfg = Release|x86
{D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|x86.Build.0 = Release|x86
+ {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|x86.ActiveCfg = Debug|x86
{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|x86.Build.0 = Debug|x86
+ {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Release|Any CPU.Build.0 = Release|Any CPU
{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Release|x86.ActiveCfg = Release|x86
{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Release|x86.Build.0 = Release|x86
+ {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Debug|x86.ActiveCfg = Debug|x86
{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Debug|x86.Build.0 = Debug|x86
+ {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Release|Any CPU.Build.0 = Release|Any CPU
{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Release|x86.ActiveCfg = Release|x86
{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Release|x86.Build.0 = Release|x86
+ {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Debug|x86.ActiveCfg = Debug|x86
{A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Debug|x86.Build.0 = Debug|x86
+ {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Release|Any CPU.Build.0 = Release|Any CPU
{A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Release|x86.ActiveCfg = Release|x86
{A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Release|x86.Build.0 = Release|x86
+ {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Debug|x86.ActiveCfg = Debug|x86
{46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Debug|x86.Build.0 = Debug|x86
+ {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Release|Any CPU.Build.0 = Release|Any CPU
{46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Release|x86.ActiveCfg = Release|x86
{46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Release|x86.Build.0 = Release|x86
+ {D871AB9A-71B3-4D63-8320-084BAD75064E}.Debug|Any CPU.ActiveCfg = Debug|An...
[truncated message content] |
|
From: <i-...@us...> - 2007-08-15 14:08:56
|
Revision: 839
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=839&view=rev
Author: i-loop
Date: 2007-08-15 07:08:45 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
synced with BlueTwo svn
Modified Paths:
--------------
trunk/skins/BlueTwoBig/Development Version/TVMiniGuide.xml
Removed Paths:
-------------
trunk/skins/BlueTwoBig/Development Version/TVSeries.xml
Modified: trunk/skins/BlueTwoBig/Development Version/TVMiniGuide.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/TVMiniGuide.xml 2007-08-15 07:02:51 UTC (rev 838)
+++ trunk/skins/BlueTwoBig/Development Version/TVMiniGuide.xml 2007-08-15 14:08:45 UTC (rev 839)
@@ -47,8 +47,8 @@
<textYOff3>1</textYOff3>
<IconXOff>12</IconXOff>
<IconYOff>6</IconYOff>
- <spinPosX>530</spinPosX>
- <spinPosY>514</spinPosY>
+ <spinPosX>600</spinPosX>
+ <spinPosY>460</spinPosY>
<spinWidth>16</spinWidth>
<spinHeight>16</spinHeight>
<itemWidth>35</itemWidth>
Deleted: trunk/skins/BlueTwoBig/Development Version/TVSeries.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/TVSeries.xml 2007-08-15 07:02:51 UTC (rev 838)
+++ trunk/skins/BlueTwoBig/Development Version/TVSeries.xml 2007-08-15 14:08:45 UTC (rev 839)
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
- <id>0</id>
- <defaultcontrol>2</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.hover:hover_my tv series.png</define>
- <controls>
- <control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <width>720</width>
- <height>576</height>
- </control>
- <control>
- <description>Number of Files Label</description>
- <type>label</type>
- <id>1</id>
- <posX>260</posX>
- <posY>530</posY>
- <label>#itemcount</label>
- <align>left</align>
- <textcolor>White</textcolor>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- </control>
- <control>
- <description>Selected item Label</description>
- <type>fadelabel</type>
- <id>1</id>
- <posX>660</posX>
- <posY>70</posY>
- <width>400</width>
- <label>#selecteditem</label>
- <font>font14</font>
- <align>right</align>
- <textcolor>White</textcolor>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- </control>
- <control>
- <type>image</type>
- <id>1</id>
- <posX>75</posX>
- <posY>370</posY>
- <texture>#header.hover</texture>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- </control>
- <control>
- <type>image</type>
- <description>Series Logo</description>
- <id>30</id>
- <posX>60</posX>
- <posY>74</posY>
- <width>420</width>
- <height>78</height>
- <texture />
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- </control>
- <control>
- <type>image</type>
- <description>Logo</description>
- <id>68</id>
- <posX>60</posX>
- <posY>16</posY>
- <texture>tvseries_logo.png</texture>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- </control>
- <control>
- <type>textbox</type>
- <description>Title</description>
- <id>40</id>
- <posX>60</posX>
- <posY>158</posY>
- <width>620</width>
- <textcolor>FFFFFFFF</textcolor>
- <font>font16</font>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- </control>
- <control>
- <type>textbox</type>
- <description>Genre</description>
- <id>33</id>
- <posX>60</posX>
- <posY>184</posY>
- <width>620</width>
- <align>right</align>
- <textcolor>FFA9D0F7</textcolor>
- <font>font13</font>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- </control>
- <control>
- <type>textboxscrollup</type>
- <description>Description</description>
- <id>31</id>
- <posX>60</posX>
- <posY>210</posY>
- <width>620</width>
- <height>90</height>
- <seperator>-----------------------------------------------------------------------------------------------------------------------</seperator>
- <textcolor>FFFFFFFF</textcolor>
- <font>font13</font>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- </control>
- <control>
- <type>group</type>
- <layout>StackLayout</layout>
- <description>group element</description>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <posX>60</posX>
- <posY>312</posY>
- <control>
- <description>Back</description>
- <type>button</type>
- <id>2</id>
- <onright>50</onright>
- <onup>5</onup>
- <ondown>3</ondown>
- <label>Back</label>
- </control>
- <control>
- <description>View-As button</description>
- <type>button</type>
- <id>3</id>
- <onright>50</onright>
- <onup>2</onup>
- <ondown>4</ondown>
- <label>100</label>
- </control>
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <id>28</id>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="slide" time="400" start="0,-300">WindowOpen</animation>
- <animation effect="slide" time="400" end="800,0">WindowClose</animation>
- <control>
- <description>composite control consisting of a list control and a thumbnail panel</description>
- <type>facadeview</type>
- <id>50</id>
- <control>
- <description>listcontrol</description>
- <type>listcontrol</type>
- <id>50</id>
- <posY>312</posY>
- <height>250</height>
- <onleft>2</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>2</ondown>
- <spaceBetweenItems>2</spaceBetweenItems>
- </control>
- <control>
- <description>Thumbnail Panel</description>
- <type>thumbnailpanel</type>
- <id>50</id>
- <posY>312</posY>
- <height>230</height>
- <onleft>2</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>2</ondown>
- </control>
- </control>
- </control>
- <import>common.facade.xml</import>
- </controls>
-</window>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <i-...@us...> - 2007-08-15 07:02:54
|
Revision: 838
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=838&view=rev
Author: i-loop
Date: 2007-08-15 00:02:51 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
synced with BlueTwo svn (tweening)
Modified Paths:
--------------
trunk/skins/BlueTwoBig/Development Version/myHome.xml
Modified: trunk/skins/BlueTwoBig/Development Version/myHome.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/myHome.xml 2007-08-14 17:20:36 UTC (rev 837)
+++ trunk/skins/BlueTwoBig/Development Version/myHome.xml 2007-08-15 07:02:51 UTC (rev 838)
@@ -40,6 +40,8 @@
<animation effect="fade" time="500">WindowClose</animation>
<animation effect="zoom" start="20,20" end="100,100" center="384,288" time="500">WindowOpen</animation>
<animation effect="zoom" start="100,100" end="20,20" center="384,288" time="500">WindowClose</animation>
+ <animation effect="rotatey" start="0" end="20" center="525,0" tween="back" ease="easeout" time="500">focus</animation>
+ <animation effect="rotatey" start="20" end="0" center="525,0" tween="back" ease="easeout" time="500">unfocus</animation>
<id>50</id>
<posX>370</posX>
<posY>130</posY>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-08-14 17:20:38
|
Revision: 837
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=837&view=rev
Author: framug
Date: 2007-08-14 10:20:36 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
Added French translation for MPlayer. Thx misterd!
Added Paths:
-----------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_fr.xml
Added: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_fr.xml
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_fr.xml (rev 0)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_fr.xml 2007-08-14 17:20:36 UTC (rev 837)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Language name="English" characters="255">
+ <Section name="unmapped">
+ <String id="0">Vitesse</String>
+ <String id="1">Audio</String>
+ <String id="2">Sous-titres</String>
+ <String id="3">Activé</String>
+ <String id="4">désactivé</String>
+ <String id="5">Recherche</String>
+ <String id="6">Aller à</String>
+ <String id="7">Position sous-titres</String>
+ <String id="8">Taille sous-titres</String>
+ <String id="9">Delai sous-titres</String>
+ <String id="10">Delai audio</String>
+ <String id="11">Aspect ratio</String>
+ <String id="12">Mute</String>
+ <String id="13">Volume</String>
+ <String id="14">Lit le flux</String>
+ <String id="15">Lit Disque</String>
+ <String id="16">Supprimer item</String>
+ </Section>
+</Language>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nor...@us...> - 2007-08-14 09:28:50
|
Revision: 836
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=836&view=rev
Author: northern_sky
Date: 2007-08-14 02:28:48 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
misc cleanup
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -21,10 +21,11 @@
*
*/
-#endregion
+#endregion Copyright (C) 2005-2007 Team MediaPortal
+#region Imports
+
using System;
-
using System.Collections;
using System.Collections.Generic;
using System.IO;
@@ -37,6 +38,7 @@
using System.Data.SQLite;
using GUIPrograms.Items;
+#endregion Imports
namespace GUIPrograms.Database
{
/// <summary>
@@ -45,16 +47,21 @@
/// </summary>
public sealed class DatabaseHandler
{
+ #region Variables
+
private SQLiteConnection sqlLiteConnection = null;
private List<ApplicationItem> globalApplicationItemList = new List<ApplicationItem>();
private readonly string DATABASEFILE = "myProgramsAltDatabaseV1.db3";
private static DatabaseHandler instance = new DatabaseHandler();
+ #endregion Variables
+
+ #region Constructors/Destructors
+
// Explicit static constructor to tell C# compiler
// not to mark type as beforefieldinit
static DatabaseHandler() { }
-
private DatabaseHandler()
{
string DatabasePath = Config.GetFile(Config.Dir.Database, DATABASEFILE);
@@ -89,28 +96,15 @@
}
}
+ #endregion Constructors/Destructors
+
+ #region Properties
+
public static DatabaseHandler DBHandlerInstance
{
get { return instance; }
}
- private void SetPragmas()
- {
- ExecuteStmtNonQuery("PRAGMA default_cache_size=3000");
- ExecuteStmtNonQuery("PRAGMA count_changes=1");
- ExecuteStmtNonQuery("PRAGMA short_column_names=1");
- ExecuteStmtNonQuery("PRAGMA auto_vacuum=1");
- }
-
- /*static void LaunchFilelink(FilelinkItem curLink, bool MPGUIMode)
- {
- ApplicationItem targetApp = globalApplicationItemList.GetAppByID(curLink.TargetAppID);
- if (targetApp != null)
- {
- targetApp.LaunchFile(curLink, MPGUIMode);
- }
- }*/
-
// we can always keep an connection open in sqllite..
//to expensive closing it
public SQLiteConnection SqlLiteConn
@@ -125,167 +119,20 @@
}
}
- /// <summary>
- /// Create db tables etc,if not already exist
- /// </summary>
- /// <returns></returns>
- bool CreateDBTables()
+ public List<ApplicationItem> ApplicationItemList
{
- string sqlStmt = @"CREATE TABLE
- tblApplicationItem
- (
- applicationId INTEGER PRIMARY KEY,
- fatherNodeId INTEGER,
- title TEXT,
- filename TEXT,
- arguments TEXT,
- windowstyle TEXT,
- startupdir TEXT,
- useShellExecute BOOL,
- useQuotes BOOL,
- applicationItemType TEXT,
- source TEXT,
- imagefile TEXT,
- filedirectory TEXT,
- imagedirectory TEXT,
- validExtensions TEXT,
- enabled BOOL,
- importValidImagesOnly BOOL,
- iposition INTEGER,
- refreshGUIAllowed BOOL,
- platformId INTEGER,
- waitForExit BOOL,
- preLaunch TEXT,
- postLaunch TEXT
- )";
-
-
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE tblFileItem (fileid INTEGER PRIMARY KEY, applicationId INTEGER, title TEXT, filename TEXT, imagefile TEXT, genreId INTEGER, genreStyleId INTEGER, country TEXT, manufacturerId INTEGER, year INTEGER, rating INTEGER, overview TEXT, platformId INTEGER, lastTimeLaunched TEXT, launchcount INTEGER, categorydata TEXT, gameInfoUrl TEXT)";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE tblFileLinkItem (applicationId INTEGER, grouperAppID INTEGER, fileID INTEGER, filename TEXT, updateFlag INTEGER)";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE tblSetting (settingid INTEGER PRIMARY KEY, key TEXT, value TEXT)";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE
- tblGenre
- (
- genreId INTEGER PRIMARY KEY,
- genre TEXT
- )";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE
- tblPlatform
- (
- platformId INTEGER PRIMARY KEY,
- platform TEXT
- )";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE
- tblManufacturer
- (
- manufacturerId INTEGER PRIMARY KEY,
- manufacturer TEXT
- )";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE INDEX idxFile1 ON tblFileItem(applicationId)";
- ExecuteStmtNonQuery(sqlStmt);
- sqlStmt = @"CREATE INDEX idxApp1 ON tblApplicationItem(fatherNodeId)";
- ExecuteStmtNonQuery(sqlStmt);
- sqlStmt = @"CREATE UNIQUE INDEX idxFilterItem1 ON tblFileLinkItem(applicationId, fileID, grouperAppID)";
- ExecuteStmtNonQuery(sqlStmt);
-
- return true;
- }
-
- /// <summary>
- /// Inserting some default values so that the db is preloaded
- /// Should always be there.
- /// </summary>
- private void InsertDefaultDBValues()
- {
-
- string sqlStmt = @"INSERT INTO
- tblGenre
- (
- genre
- )
- VALUES
- (
- 'Unknown'
- )";
-
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"INSERT INTO
- tblManufacturer
- (
- manufacturer
- )
- VALUES
- (
- 'Unknown'
- )";
-
-
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"INSERT INTO
- tblPlatform
- (
- platform
- )
- VALUES
- (
- 'Unknown'
- )";
-
- ExecuteStmtNonQuery(sqlStmt);
-
-
- using (SQLiteTransaction transaction = SqlLiteConn.BeginTransaction())
+ get
{
- FillDefaultDBLexiconHelper("tblPlatform", "platform", CreateSystemLexiconList());
- FillDefaultDBLexiconHelper("tblManufacturer", "manufacturer", CreateManufacturerLexiconList());
- FillDefaultDBLexiconHelper("tblGenre", "genre", CreateGenreLexiconList());
-
- transaction.Commit();
+ return globalApplicationItemList;
}
-
}
- private void FillDefaultDBLexiconHelper(string tableName, string columnName, List<string> itemList)
- {
- SQLiteParameter[] paramCollection = new SQLiteParameter[1];
- SQLiteParameter paramInsertValue = new SQLiteParameter("@insertValue", DbType.String);
- paramCollection[0] = paramInsertValue;
+ #endregion Properties
- string sqlStmt = @"
- INSERT INTO
- " + tableName + @"
- (
- " + columnName + @"
- )
- VALUES
- (
- @insertValue
- );";
+ #region Public Methods
- foreach (string insertValue in itemList)
- {
- paramCollection[0].Value = insertValue;
- ExecuteStmtNonQuery(sqlStmt, paramCollection);
- }
- }
+ #region dbsettings
- #region dbsettings
public string ReadSetting(string Key)
{
string sqlStmt = string.Empty;
@@ -310,7 +157,7 @@
return keyValue;
}
- int CountKey(string Key)
+ public int CountKey(string Key)
{
string sqlStmt = string.Empty;
int keyValue = 0;
@@ -347,7 +194,6 @@
WHERE
key = '" + Key + "'";
-
}
else
{
@@ -369,7 +215,6 @@
public int LexiconDataExists(string tableName, string columnName, string fieldValue)
{
-
SQLiteParameter[] parameterArray = new SQLiteParameter[1];
parameterArray[0] = GetParameter<string>(fieldValue, "@fieldValue", DbType.String);
@@ -396,7 +241,6 @@
try
{
-
int lexiconId = ExecuteStmtScalar<Int32>(sqlStmt, parameterArray);
//lexion didnt exist, we save it
@@ -417,78 +261,12 @@
}
- #region default lexiconvalues
-
- private static List<string> CreateGenreLexiconList()
- {
- List<string> genreList = new List<string>();
-
-
- genreList.Add("Shooter");
- genreList.Add("Platform");
- genreList.Add("Adventure");
-
- return genreList;
- }
-
- private static List<string> CreateManufacturerLexiconList()
- {
- List<string> manufacturerList = new List<string>();
-
- manufacturerList.Add("Sega");
- manufacturerList.Add("Nintendo");
- manufacturerList.Add("Konami");
-
- return manufacturerList;
- }
-
- private static List<string> CreateSystemLexiconList()
- {
- List<string> systemList = new List<string>();
- systemList.Add("");
- systemList.Add("Atari 5200");
- systemList.Add("Atari 7800");
- systemList.Add("Atari Lynx");
- systemList.Add("Atari ST");
- systemList.Add("Atari Video Computer System");
- systemList.Add("Commodore 64/128");
- systemList.Add("Commodore Amiga");
- systemList.Add("Game Boy");
- systemList.Add("Game Boy Advance");
- systemList.Add("Game Boy Color");
- systemList.Add("Neo Geo");
- systemList.Add("Nintendo 64");
- systemList.Add("Nintendo Entertainment System");
- systemList.Add("PlayStation");
- systemList.Add("Sega Dreamcast");
- systemList.Add("Sega Game Gear");
- systemList.Add("Sega Genesis");
- systemList.Add("Sega Master System");
- systemList.Add("Super NES");
- systemList.Add("TurboGrafx-16");
- systemList.Add("Arcade");
- systemList.Add("PC");
- return systemList;
- }
-
- #endregion default lexiconvalues
-
- public List<ApplicationItem> ApplicationItemList
- {
- get
- {
- return globalApplicationItemList;
- }
- }
-
public ItemType GetItemType(string columnName, string tableName, int id)
{
ItemType itemType = ItemType.UNKNOWN;
+ string sqlStmt = "SELECT " + columnName + " FROM " + tableName + " WHERE applicationId = " + id;
- string sqlStmt = "select " + columnName + " from " + tableName + " where applicationid = " + id;
-
- itemType = ProgramUtils.StringToSourceType(ExecuteStmtScalar(sqlStmt).ToString());
- return itemType;
+ return ProgramUtils.StringToSourceType(ExecuteStmtScalar(sqlStmt).ToString());
}
#region dataaccess help methods
@@ -499,7 +277,6 @@
try
{
-
using (SQLiteCommand command = new SQLiteCommand(SqlLiteConn))
{
command.CommandText = stmt;
@@ -551,7 +328,6 @@
public T ExecuteStmtScalar<T>(string stmt, SQLiteParameter[] paramcollection)
{
-
object o = null;
try
{
@@ -592,7 +368,7 @@
return o;
}
- public static SQLiteParameter GetParameter<G>(G value, string parameterName, DbType type)
+ public SQLiteParameter GetParameter<G>(G value, string parameterName, DbType type)
{
SQLiteParameter parameter = new SQLiteParameter(parameterName, type);
parameter.Value = value;
@@ -604,28 +380,259 @@
public void LoadAllApplicationItems()
{
- try
+
+ globalApplicationItemList.Clear();
+
+ using (SQLiteCommand command = SqlLiteConn.CreateCommand())
{
- globalApplicationItemList.Clear();
-
- using (SQLiteCommand command = SqlLiteConn.CreateCommand())
+ command.CommandText = "SELECT * FROM tblApplicationItem ORDER BY iposition";
+ using (SQLiteDataReader dataReader = command.ExecuteReader())
{
- command.CommandText = "SELECT * FROM tblApplicationItem order by iposition";
- using (SQLiteDataReader dataReader = command.ExecuteReader())
+ while (dataReader.Read())
{
- while (dataReader.Read())
- {
- ApplicationItem applicationItem = (ApplicationItem)ApplicationItemFactory.AppFactory.GetApplicationItem(GetItemType("applicationItemType", "tblApplicationItem", Convert.ToInt32(dataReader["applicationId"])), dataReader);
- // applicationItem.OnLaunchFilelink += new ApplicationItem.FilelinkLaunchEventHandler(LaunchFilelink);
- globalApplicationItemList.Add(applicationItem);
- }
+ ApplicationItem applicationItem = (ApplicationItem) ItemFactory.ItemFactoryInstance.GetItem(GetItemType("applicationItemType", "tblApplicationItem", Convert.ToInt32(dataReader["applicationId"])), dataReader);
+ // applicationItem.OnLaunchFilelink += new ApplicationItem.FilelinkLaunchEventHandler(LaunchFilelink);
+ globalApplicationItemList.Add(applicationItem);
}
}
}
- catch (SQLiteException ex)
+ }
+
+
+
+ #endregion Public Methods
+
+ #region Private Methods
+
+ private void SetPragmas()
+ {
+ ExecuteStmtNonQuery("PRAGMA default_cache_size=3000");
+ ExecuteStmtNonQuery("PRAGMA count_changes=1");
+ ExecuteStmtNonQuery("PRAGMA short_column_names=1");
+ ExecuteStmtNonQuery("PRAGMA auto_vacuum=1");
+ }
+
+ /// <summary>
+ /// Create db tables etc,if not already exist
+ /// </summary>
+ /// <returns></returns>
+ private bool CreateDBTables()
+ {
+ string sqlStmt = @"CREATE TABLE
+ tblApplicationItem
+ (
+ applicationId INTEGER PRIMARY KEY,
+ fatherNodeId INTEGER,
+ title TEXT,
+ filename TEXT,
+ arguments TEXT,
+ windowstyle TEXT,
+ startupdir TEXT,
+ useShellExecute BOOL,
+ useQuotes BOOL,
+ applicationItemType TEXT,
+ source TEXT,
+ imagefile TEXT,
+ filedirectory TEXT,
+ imagedirectory TEXT,
+ validExtensions TEXT,
+ enabled BOOL,
+ importValidImagesOnly BOOL,
+ iposition INTEGER,
+ refreshGUIAllowed BOOL,
+ platformId INTEGER,
+ waitForExit BOOL,
+ preLaunch TEXT,
+ postLaunch TEXT
+ )";
+
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE tblFileItem (fileid INTEGER PRIMARY KEY, applicationId INTEGER, title TEXT, filename TEXT, imagefile TEXT, genreId INTEGER, genreStyleId INTEGER, country TEXT, manufacturerId INTEGER, year INTEGER, rating INTEGER, overview TEXT, platformId INTEGER, lastTimeLaunched TEXT, launchcount INTEGER, categorydata TEXT, gameInfoUrl TEXT)";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE tblFileLinkItem (applicationId INTEGER, grouperAppID INTEGER, fileID INTEGER, filename TEXT, updateFlag INTEGER)";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE tblSetting (settingid INTEGER PRIMARY KEY, key TEXT, value TEXT)";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE
+ tblGenre
+ (
+ genreId INTEGER PRIMARY KEY,
+ genre TEXT
+ )";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE
+ tblPlatform
+ (
+ platformId INTEGER PRIMARY KEY,
+ platform TEXT
+ )";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE
+ tblManufacturer
+ (
+ manufacturerId INTEGER PRIMARY KEY,
+ manufacturer TEXT
+ )";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE INDEX idxFile1 ON tblFileItem(applicationId)";
+ ExecuteStmtNonQuery(sqlStmt);
+ sqlStmt = @"CREATE INDEX idxApp1 ON tblApplicationItem(fatherNodeId)";
+ ExecuteStmtNonQuery(sqlStmt);
+ sqlStmt = @"CREATE UNIQUE INDEX idxFilterItem1 ON tblFileLinkItem(applicationId, fileID, grouperAppID)";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ return true;
+ }
+
+ /// <summary>
+ /// Inserting some default values so that the db is preloaded
+ /// Should always be there.
+ /// </summary>
+ private void InsertDefaultDBValues()
+ {
+ string sqlStmt = @"INSERT INTO
+ tblGenre
+ (
+ genre
+ )
+ VALUES
+ (
+ 'Unknown'
+ )";
+
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"INSERT INTO
+ tblManufacturer
+ (
+ manufacturer
+ )
+ VALUES
+ (
+ 'Unknown'
+ )";
+
+
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"INSERT INTO
+ tblPlatform
+ (
+ platform
+ )
+ VALUES
+ (
+ 'Unknown'
+ )";
+
+ ExecuteStmtNonQuery(sqlStmt);
+
+ using (SQLiteTransaction transaction = SqlLiteConn.BeginTransaction())
{
- Log.Info("programdatabase exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
+ FillDefaultDBLexiconHelper("tblPlatform", "platform", CreateSystemLexiconList());
+ FillDefaultDBLexiconHelper("tblManufacturer", "manufacturer", CreateManufacturerLexiconList());
+ FillDefaultDBLexiconHelper("tblGenre", "genre", CreateGenreLexiconList());
+
+ transaction.Commit();
}
}
+
+ private void FillDefaultDBLexiconHelper(string tableName, string columnName, List<string> itemList)
+ {
+ SQLiteParameter[] paramCollection = new SQLiteParameter[1];
+ SQLiteParameter paramInsertValue = new SQLiteParameter("@insertValue", DbType.String);
+ paramCollection[0] = paramInsertValue;
+
+ string sqlStmt = @"
+ INSERT INTO
+ " + tableName + @"
+ (
+ " + columnName + @"
+ )
+ VALUES
+ (
+ @insertValue
+ );";
+
+ foreach (string insertValue in itemList)
+ {
+ paramCollection[0].Value = insertValue;
+ ExecuteStmtNonQuery(sqlStmt, paramCollection);
+ }
+ }
+
+ #region default lexiconvalues
+
+ private static List<string> CreateGenreLexiconList()
+ {
+ List<string> genreList = new List<string>();
+
+ genreList.Add("Shooter");
+ genreList.Add("Platform");
+ genreList.Add("Adventure");
+
+ return genreList;
+ }
+
+ private static List<string> CreateManufacturerLexiconList()
+ {
+ List<string> manufacturerList = new List<string>();
+
+ manufacturerList.Add("Sega");
+ manufacturerList.Add("Nintendo");
+ manufacturerList.Add("Konami");
+
+ return manufacturerList;
+ }
+
+ private static List<string> CreateSystemLexiconList()
+ {
+ List<string> systemList = new List<string>();
+ systemList.Add("");
+ systemList.Add("Atari 5200");
+ systemList.Add("Atari 7800");
+ systemList.Add("Atari Lynx");
+ systemList.Add("Atari ST");
+ systemList.Add("Atari Video Computer System");
+ systemList.Add("Commodore 64/128");
+ systemList.Add("Commodore Amiga");
+ systemList.Add("Game Boy");
+ systemList.Add("Game Boy Advance");
+ systemList.Add("Game Boy Color");
+ systemList.Add("Neo Geo");
+ systemList.Add("Nintendo 64");
+ systemList.Add("Nintendo Entertainment System");
+ systemList.Add("PlayStation");
+ systemList.Add("Sega Dreamcast");
+ systemList.Add("Sega Game Gear");
+ systemList.Add("Sega Genesis");
+ systemList.Add("Sega Master System");
+ systemList.Add("Super NES");
+ systemList.Add("TurboGrafx-16");
+ systemList.Add("Arcade");
+ systemList.Add("PC");
+
+ return systemList;
+ }
+
+ #endregion default lexiconvalues
+
+ #endregion Private Methods
+
+ /*static void LaunchFilelink(FilelinkItem curLink, bool MPGUIMode)
+ {
+ ApplicationItem targetApp = globalApplicationItemList.GetAppByID(curLink.TargetAppID);
+ if (targetApp != null)
+ {
+ targetApp.LaunchFile(curLink, MPGUIMode);
+ }
+ }*/
}
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -679,7 +679,7 @@
{
if (SaveAppItem())
{
- ApplicationItem newApplication = (ApplicationItem)ApplicationItemFactory.AppFactory.GetApplicationItem(newSourceType, null);
+ ApplicationItem newApplication = (ApplicationItem) ItemFactory.ItemFactoryInstance.GetItem(newSourceType, null);
globalApplicationList.Add(newApplication);
newApplication.FatherID = GetTreeNodeApplicationItemId();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -1128,7 +1128,7 @@
/* public ApplicationItem CloneAppItem(ApplicationItem sourceApp)
{
- ApplicationItem newApp = (ApplicationItem)ApplicationItemFactory.AppFactory.GetApplicationItem(sqlDB, sourceApp.SourceType, null, 0);
+ ApplicationItem newApp = (ApplicationItem)ItemFactory.itemFactoryInstance.GetItem(sqlDB, sourceApp.SourceType, null, 0);
newApp.Assign(sourceApp);
newApp.ApplicationItemId = -1; // to force a sql INSERT when written
Add(newApp);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -519,12 +519,12 @@
{
if ( ViewHandler.IsFilterQuery )
{
- FilterItem curFile = ( FilterItem ) ApplicationItemFactory.AppFactory.GetApplicationItem( ItemType.FILTERITEM, dataReader );
+ FilterItem curFile = (FilterItem) itemFactoryInstance.GetItem(ItemType.FILTERITEM, dataReader);
ItemList.Add( curFile );
}
else
{
- FileItem curFile = ( FileItem ) ApplicationItemFactory.AppFactory.GetApplicationItem( ItemType.FILEITEM, dataReader );
+ FileItem curFile = (FileItem) itemFactoryInstance.GetItem(ItemType.FILEITEM, dataReader);
ItemList.Add( curFile );
}
}
@@ -761,29 +761,29 @@
SQLiteParameter[] parameterArray = new SQLiteParameter[23];
ApplicationItemId = GetNewAppID(); // important to avoid subsequent inserts!
//params for question + values
- parameterArray[0] = DatabaseHandler.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
- parameterArray[1] = DatabaseHandler.GetParameter<int>( FatherID, "@fatherNodeId", DbType.Int32);
- parameterArray[2] = DatabaseHandler.GetParameter<string>( Title, "@title", DbType.String);
- parameterArray[3] = DatabaseHandler.GetParameter<string>( Filename, "@filename", DbType.String );
- parameterArray[4] = DatabaseHandler.GetParameter<string>( Arguments, "@arguments", DbType.String);
- parameterArray[5] = DatabaseHandler.GetParameter<string>( ProgramUtils.WindowStyleToStr( WindowStyle ), "@windowStyle", DbType.String);
- parameterArray[6] = DatabaseHandler.GetParameter<string>( StartupDir, "@startupDir", DbType.String );
- parameterArray[7] = DatabaseHandler.GetParameter<bool>( UseShellExecute, "@useShellExecute", DbType.Boolean );
- parameterArray[8] = DatabaseHandler.GetParameter<bool>( UseQuotes, "@useQuotes", DbType.Boolean);
- parameterArray[9] = DatabaseHandler.GetParameter<string>( ProgramUtils.ApplicationTypeToString( SourceType ), "@applicationItemType", DbType.String );
- parameterArray[10] = DatabaseHandler.GetParameter<string>( Source, "@source", DbType.String);
- parameterArray[11] = DatabaseHandler.GetParameter<string>( imageFile, "@imageFile", DbType.String );
- parameterArray[12] = DatabaseHandler.GetParameter<string>( FileDirectory, "@fileDirectory", DbType.String );
- parameterArray[13] = DatabaseHandler.GetParameter<string>( ImageDirectory, "@imageDirectory", DbType.String );
- parameterArray[14] = DatabaseHandler.GetParameter<string>( ValidExtensions, "@validExtensions", DbType.String);
- parameterArray[15] = DatabaseHandler.GetParameter<bool>( ImportValidImagesOnly, "@importValidImagesOnly", DbType.Boolean );
- parameterArray[16] = DatabaseHandler.GetParameter<int>( Position, "@position", DbType.Int32 );
- parameterArray[17] = DatabaseHandler.GetParameter<bool>( Enabled, "@enabled", DbType.Boolean);
- parameterArray[18] = DatabaseHandler.GetParameter<bool>( RefreshGUIAllowed, "@refreshGUIAllowed", DbType.Boolean );
- parameterArray[19] = DatabaseHandler.GetParameter<int>( PlatformId, "@platformId", DbType.Int32);
- parameterArray[20] = DatabaseHandler.GetParameter<bool>( WaitForExit, "@waitForExit", DbType.Boolean);
- parameterArray[21] = DatabaseHandler.GetParameter<string>( PreLaunch, "@preLaunch", DbType.String);
- parameterArray[22] = DatabaseHandler.GetParameter<string>( PostLaunch, "@postLaunch", DbType.String);
+ parameterArray[0] = dbHandlerInstance.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
+ parameterArray[1] = dbHandlerInstance.GetParameter<int>( FatherID, "@fatherNodeId", DbType.Int32);
+ parameterArray[2] = dbHandlerInstance.GetParameter<string>( Title, "@title", DbType.String);
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>( Filename, "@filename", DbType.String );
+ parameterArray[4] = dbHandlerInstance.GetParameter<string>( Arguments, "@arguments", DbType.String);
+ parameterArray[5] = dbHandlerInstance.GetParameter<string>( ProgramUtils.WindowStyleToStr( WindowStyle ), "@windowStyle", DbType.String);
+ parameterArray[6] = dbHandlerInstance.GetParameter<string>( StartupDir, "@startupDir", DbType.String );
+ parameterArray[7] = dbHandlerInstance.GetParameter<bool>( UseShellExecute, "@useShellExecute", DbType.Boolean );
+ parameterArray[8] = dbHandlerInstance.GetParameter<bool>( UseQuotes, "@useQuotes", DbType.Boolean);
+ parameterArray[9] = dbHandlerInstance.GetParameter<string>( ProgramUtils.ApplicationTypeToString( SourceType ), "@applicationItemType", DbType.String );
+ parameterArray[10] = dbHandlerInstance.GetParameter<string>( Source, "@source", DbType.String);
+ parameterArray[11] = dbHandlerInstance.GetParameter<string>( imageFile, "@imageFile", DbType.String );
+ parameterArray[12] = dbHandlerInstance.GetParameter<string>( FileDirectory, "@fileDirectory", DbType.String );
+ parameterArray[13] = dbHandlerInstance.GetParameter<string>( ImageDirectory, "@imageDirectory", DbType.String );
+ parameterArray[14] = dbHandlerInstance.GetParameter<string>( ValidExtensions, "@validExtensions", DbType.String);
+ parameterArray[15] = dbHandlerInstance.GetParameter<bool>( ImportValidImagesOnly, "@importValidImagesOnly", DbType.Boolean );
+ parameterArray[16] = dbHandlerInstance.GetParameter<int>( Position, "@position", DbType.Int32 );
+ parameterArray[17] = dbHandlerInstance.GetParameter<bool>( Enabled, "@enabled", DbType.Boolean);
+ parameterArray[18] = dbHandlerInstance.GetParameter<bool>( RefreshGUIAllowed, "@refreshGUIAllowed", DbType.Boolean );
+ parameterArray[19] = dbHandlerInstance.GetParameter<int>( PlatformId, "@platformId", DbType.Int32);
+ parameterArray[20] = dbHandlerInstance.GetParameter<bool>( WaitForExit, "@waitForExit", DbType.Boolean);
+ parameterArray[21] = dbHandlerInstance.GetParameter<string>( PreLaunch, "@preLaunch", DbType.String);
+ parameterArray[22] = dbHandlerInstance.GetParameter<string>( PostLaunch, "@postLaunch", DbType.String);
// " + ProgramUtils.TrueOrFalseToInt(UseShellExecute.ToString()) + @",
//'" + ProgramUtils.ApplicationTypeToString(SourceType) + @"',
@@ -866,29 +866,29 @@
SQLiteParameter[] parameterArray = new SQLiteParameter[23];
//params for question + values
- parameterArray[0] = DatabaseHandler.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
- parameterArray[1] = DatabaseHandler.GetParameter<int>( FatherID, "@fatherNodeId", DbType.Int32 );
- parameterArray[2] = DatabaseHandler.GetParameter<string>( Title, "@title", DbType.String );
- parameterArray[3] = DatabaseHandler.GetParameter<string>( Filename, "@filename", DbType.String );
- parameterArray[4] = DatabaseHandler.GetParameter<string>( Arguments, "@arguments", DbType.String);
- parameterArray[5] = DatabaseHandler.GetParameter<string>( ProgramUtils.WindowStyleToStr( WindowStyle ), "@windowStyle", DbType.String );
- parameterArray[6] = DatabaseHandler.GetParameter<string>( StartupDir, "@startupDir", DbType.String);
- parameterArray[7] = DatabaseHandler.GetParameter<bool>( UseShellExecute, "@useShellExecute", DbType.Boolean );
- parameterArray[8] = DatabaseHandler.GetParameter<bool>( UseQuotes, "@useQuotes", DbType.Boolean);
- parameterArray[9] = DatabaseHandler.GetParameter<string>( ProgramUtils.ApplicationTypeToString( SourceType ), "@applicationItemType", DbType.String);
- parameterArray[10] = DatabaseHandler.GetParameter<string>( Source, "@source", DbType.String );
- parameterArray[11] = DatabaseHandler.GetParameter<string>( imageFile, "@imageFile", DbType.String );
- parameterArray[12] = DatabaseHandler.GetParameter<string>( FileDirectory, "@fileDirectory", DbType.String );
- parameterArray[13] = DatabaseHandler.GetParameter<string>( ImageDirectory, "@imageDirectory", DbType.String );
- parameterArray[14] = DatabaseHandler.GetParameter<string>( ValidExtensions, "@validExtensions", DbType.String);
- parameterArray[15] = DatabaseHandler.GetParameter<bool>( ImportValidImagesOnly, "@importValidImagesOnly", DbType.Boolean );
- parameterArray[16] = DatabaseHandler.GetParameter<int>( Position, "@position", DbType.Int32);
- parameterArray[17] = DatabaseHandler.GetParameter<bool>( Enabled, "@enabled", DbType.Boolean);
- parameterArray[18] = DatabaseHandler.GetParameter<bool>( RefreshGUIAllowed, "@refreshGUIAllowed", DbType.Boolean );
- parameterArray[19] = DatabaseHandler.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
- parameterArray[20] = DatabaseHandler.GetParameter<bool>( WaitForExit, "@waitForExit", DbType.Boolean );
- parameterArray[21] = DatabaseHandler.GetParameter<string>( PreLaunch, "@preLaunch", DbType.String );
- parameterArray[22] = DatabaseHandler.GetParameter<string>( PostLaunch, "@postLaunch", DbType.String );
+ parameterArray[0] = dbHandlerInstance.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
+ parameterArray[1] = dbHandlerInstance.GetParameter<int>( FatherID, "@fatherNodeId", DbType.Int32 );
+ parameterArray[2] = dbHandlerInstance.GetParameter<string>( Title, "@title", DbType.String );
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>( Filename, "@filename", DbType.String );
+ parameterArray[4] = dbHandlerInstance.GetParameter<string>( Arguments, "@arguments", DbType.String);
+ parameterArray[5] = dbHandlerInstance.GetParameter<string>( ProgramUtils.WindowStyleToStr( WindowStyle ), "@windowStyle", DbType.String );
+ parameterArray[6] = dbHandlerInstance.GetParameter<string>( StartupDir, "@startupDir", DbType.String);
+ parameterArray[7] = dbHandlerInstance.GetParameter<bool>( UseShellExecute, "@useShellExecute", DbType.Boolean );
+ parameterArray[8] = dbHandlerInstance.GetParameter<bool>( UseQuotes, "@useQuotes", DbType.Boolean);
+ parameterArray[9] = dbHandlerInstance.GetParameter<string>( ProgramUtils.ApplicationTypeToString( SourceType ), "@applicationItemType", DbType.String);
+ parameterArray[10] = dbHandlerInstance.GetParameter<string>( Source, "@source", DbType.String );
+ parameterArray[11] = dbHandlerInstance.GetParameter<string>( imageFile, "@imageFile", DbType.String );
+ parameterArray[12] = dbHandlerInstance.GetParameter<string>( FileDirectory, "@fileDirectory", DbType.String );
+ parameterArray[13] = dbHandlerInstance.GetParameter<string>( ImageDirectory, "@imageDirectory", DbType.String );
+ parameterArray[14] = dbHandlerInstance.GetParameter<string>( ValidExtensions, "@validExtensions", DbType.String);
+ parameterArray[15] = dbHandlerInstance.GetParameter<bool>( ImportValidImagesOnly, "@importValidImagesOnly", DbType.Boolean );
+ parameterArray[16] = dbHandlerInstance.GetParameter<int>( Position, "@position", DbType.Int32);
+ parameterArray[17] = dbHandlerInstance.GetParameter<bool>( Enabled, "@enabled", DbType.Boolean);
+ parameterArray[18] = dbHandlerInstance.GetParameter<bool>( RefreshGUIAllowed, "@refreshGUIAllowed", DbType.Boolean );
+ parameterArray[19] = dbHandlerInstance.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
+ parameterArray[20] = dbHandlerInstance.GetParameter<bool>( WaitForExit, "@waitForExit", DbType.Boolean );
+ parameterArray[21] = dbHandlerInstance.GetParameter<string>( PreLaunch, "@preLaunch", DbType.String );
+ parameterArray[22] = dbHandlerInstance.GetParameter<string>( PostLaunch, "@postLaunch", DbType.String );
try
{
@@ -936,7 +936,7 @@
if ( ApplicationItemId == -1 ) return;
SQLiteParameter[] paramArray = new SQLiteParameter[1];
- paramArray[0] = DatabaseHandler.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
+ paramArray[0] = dbHandlerInstance.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
try
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -32,23 +32,24 @@
namespace GUIPrograms.Items
{
/// <summary>
- /// Factory object that creates the matchin Application descendant class
+ /// Factory like object that creates the matchin Application descendant class
/// depending on the sourceType parameter
/// Descendant classes differ in LOADING and REFRESHING filelists
/// </summary>
- public class ApplicationItemFactory
+ public class ItemFactory
{
- static public ApplicationItemFactory AppFactory = new ApplicationItemFactory();
-
- // singleton. Dont allow any instance of this class
- private ApplicationItemFactory() { }
+ static private ItemFactory itemFactoryInstance = new ItemFactory();
- static ApplicationItemFactory()
+ public static ItemFactory ItemFactoryInstance
{
- // nothing to create......
+ get { return ItemFactory.itemFactoryInstance; }
}
+
+ // singleton. Dont allow any instance of this class
+ private ItemFactory() { }
+ static ItemFactory() { }
- public BaseItem GetApplicationItem(ItemType sourceType,SQLiteDataReader dataReader)
+ public BaseItem GetItem(ItemType sourceType,SQLiteDataReader dataReader)
{
BaseItem item = null;
switch (sourceType)
@@ -81,7 +82,7 @@
private ApplicationItem AppItemFactory(SQLiteDataReader dataReader,ItemType sourceType)
{
- ApplicationItem item = null;//= (ApplicationItem)appFactory.GetApplicationItem(sqlDB, ProgramUtils.GetSourceType(results, recordIndex, "applicationItemType"), null, 0);
+ ApplicationItem item = null;//= (ApplicationItem)appFactory.GetItem(sqlDB, ProgramUtils.GetSourceType(results, recordIndex, "applicationItemType"), null, 0);
switch (sourceType)
{
@@ -130,8 +131,6 @@
return item;
}
-
-
private FileItem FileItemFactory(SQLiteDataReader dataReader)
{
FileItem newFile = new FileItem();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -137,12 +137,12 @@
{
if ( ViewHandler.IsFilterQuery )
{
- FilterItem curFile = ( FilterItem ) ApplicationItemFactory.AppFactory.GetApplicationItem( ItemType.FILTERITEM, dataReader );
+ FilterItem curFile = ( FilterItem ) itemFactoryInstance.GetItem( ItemType.FILTERITEM, dataReader );
ItemList.Add( curFile );
}
else
{
- FileItem curFile = ( FileItem ) ApplicationItemFactory.AppFactory.GetApplicationItem( ItemType.FILEITEM, dataReader );
+ FileItem curFile = ( FileItem ) itemFactoryInstance.GetItem( ItemType.FILEITEM, dataReader );
ItemList.Add( curFile );
}
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -23,6 +23,7 @@
{
protected DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
+ protected ItemFactory itemFactoryInstance = ItemFactory.ItemFactoryInstance;
public ProgramViewHandler ViewHandler = ProgramViewHandler.Instance;
public string filePath = "";
//s protected FilelinkItemList fileLinks = null;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -460,22 +460,22 @@
SQLiteParameter[] parameterArray = new SQLiteParameter[15];
// parameterArray[0] = GetParameter<int>( ApplicationItemId, "@fileid", DbType.Int32, "applicationId" );
- parameterArray[0] = DatabaseHandler.GetParameter<int>( AppID, "@applicationId", DbType.Int32 );
- parameterArray[1] = DatabaseHandler.GetParameter<string>( Title, "@title", DbType.String );
- parameterArray[2] = DatabaseHandler.GetParameter<string>( Filename, "@filename", DbType.String );
- parameterArray[3] = DatabaseHandler.GetParameter<string>( Imagefile, "@imagefile", DbType.String );
- parameterArray[4] = DatabaseHandler.GetParameter<int>( GenreId, "@genreId", DbType.Int32 );
- parameterArray[5] = DatabaseHandler.GetParameter<int>( GenreStyleId, "@genreStyleId", DbType.Int32 );
- parameterArray[6] = DatabaseHandler.GetParameter<string>( Country, "@country", DbType.String );
- parameterArray[7] = DatabaseHandler.GetParameter<int>( ManufacturerId, "@manufacturerId", DbType.Int32 );
- parameterArray[8] = DatabaseHandler.GetParameter<int>( Year, "@year", DbType.Int32 );
- parameterArray[9] = DatabaseHandler.GetParameter<int>( Rating, "@rating", DbType.Int32 );
- parameterArray[10] = DatabaseHandler.GetParameter<string>( Overview, "@overview", DbType.String );
- parameterArray[11] = DatabaseHandler.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
- parameterArray[12] = DatabaseHandler.GetParameter<DateTime>( LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime );
- parameterArray[13] = DatabaseHandler.GetParameter<int>( LaunchCount, "@launchcount", DbType.Int32 );
- parameterArray[14] = DatabaseHandler.GetParameter<string>( GameInfoURL, "@gameInfoUrl", DbType.String );
- // parameterArray[16] = DatabaseHandler.GetParameter<bool>( IsFolder, "@isFolder", DbType.Boolean );
+ parameterArray[0] = dbHandlerInstance.GetParameter<int>( AppID, "@applicationId", DbType.Int32 );
+ parameterArray[1] = dbHandlerInstance.GetParameter<string>( Title, "@title", DbType.String );
+ parameterArray[2] = dbHandlerInstance.GetParameter<string>( Filename, "@filename", DbType.String );
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>( Imagefile, "@imagefile", DbType.String );
+ parameterArray[4] = dbHandlerInstance.GetParameter<int>( GenreId, "@genreId", DbType.Int32 );
+ parameterArray[5] = dbHandlerInstance.GetParameter<int>( GenreStyleId, "@genreStyleId", DbType.Int32 );
+ parameterArray[6] = dbHandlerInstance.GetParameter<string>( Country, "@country", DbType.String );
+ parameterArray[7] = dbHandlerInstance.GetParameter<int>( ManufacturerId, "@manufacturerId", DbType.Int32 );
+ parameterArray[8] = dbHandlerInstance.GetParameter<int>( Year, "@year", DbType.Int32 );
+ parameterArray[9] = dbHandlerInstance.GetParameter<int>( Rating, "@rating", DbType.Int32 );
+ parameterArray[10] = dbHandlerInstance.GetParameter<string>( Overview, "@overview", DbType.String );
+ parameterArray[11] = dbHandlerInstance.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
+ parameterArray[12] = dbHandlerInstance.GetParameter<DateTime>( LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime );
+ parameterArray[13] = dbHandlerInstance.GetParameter<int>( LaunchCount, "@launchcount", DbType.Int32 );
+ parameterArray[14] = dbHandlerInstance.GetParameter<string>( GameInfoURL, "@gameInfoUrl", DbType.String );
+ // parameterArray[16] = dbHandlerInstance.GetParameter<bool>( IsFolder, "@isFolder", DbType.Boolean );
try
{
@@ -539,23 +539,23 @@
{
SQLiteParameter[] parameterArray = new SQLiteParameter[16];
- parameterArray[0] = DatabaseHandler.GetParameter<int>( FileID, "@fileid", DbType.Int32);
- parameterArray[1] = DatabaseHandler.GetParameter<int>( AppID, "@applicationId", DbType.Int32 );
- parameterArray[2] = DatabaseHandler.GetParameter<string>( Title, "@title", DbType.String );
- parameterArray[3] = DatabaseHandler.GetParameter<string>( Filename, "@filename", DbType.String );
- parameterArray[4] = DatabaseHandler.GetParameter<string>( Imagefile, "@imagefile", DbType.String );
- parameterArray[5] = DatabaseHandler.GetParameter<int>( GenreId, "@genreId", DbType.Int32 );
- parameterArray[6] = DatabaseHandler.GetParameter<int>( GenreStyleId, "@genreStyleId", DbType.Int32 );
- parameterArray[7] = DatabaseHandler.GetParameter<string>( Country, "@country", DbType.String );
- parameterArray[8] = DatabaseHandler.GetParameter<int>( ManufacturerId, "@manufacturerId", DbType.Int32);
- parameterArray[9] = DatabaseHandler.GetParameter<int>( Year, "@year", DbType.Int32 );
- parameterArray[10] = DatabaseHandler.GetParameter<int>( Rating, "@rating", DbType.Int32 );
- parameterArray[11] = DatabaseHandler.GetParameter<string>( Overview, "@overview", DbType.String );
- parameterArray[12] = DatabaseHandler.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
- parameterArray[13] = DatabaseHandler.GetParameter<DateTime>( LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime );
- parameterArray[14] = DatabaseHandler.GetParameter<int>( LaunchCount, "@launchcount", DbType.Int32 );
- parameterArray[15] = DatabaseHandler.GetParameter<string>( GameInfoURL, "@gameInfoUrl", DbType.String );
- // parameterArray[17] = DatabaseHandler.GetParameter<bool>( IsFolder, "@isFolder", DbType.Boolean );
+ parameterArray[0] = dbHandlerInstance.GetParameter<int>( FileID, "@fileid", DbType.Int32);
+ parameterArray[1] = dbHandlerInstance.GetParameter<int>( AppID, "@applicationId", DbType.Int32 );
+ parameterArray[2] = dbHandlerInstance.GetParameter<string>( Title, "@title", DbType.String );
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>( Filename, "@filename", DbType.String );
+ parameterArray[4] = dbHandlerInstance.GetParameter<string>( Imagefile, "@imagefile", DbType.String );
+ parameterArray[5] = dbHandlerInstance.GetParameter<int>( GenreId, "@genreId", DbType.Int32 );
+ parameterArray[6] = dbHandlerInstance.GetParameter<int>( GenreStyleId, "@genreStyleId", DbType.Int32 );
+ parameterArray[7] = dbHandlerInstance.GetParameter<string>( Country, "@country", DbType.String );
+ parameterArray[8] = dbHandlerInstance.GetParameter<int>( ManufacturerId, "@manufacturerId", DbType.Int32);
+ parameterArray[9] = dbHandlerInstance.GetParameter<int>( Year, "@year", DbType.Int32 );
+ parameterArray[10] = dbHandlerInstance.GetParameter<int>( Rating, "@rating", DbType.Int32 );
+ parameterArray[11] = dbHandlerInstance.GetParameter<string>( Overview, "@overview", DbType.String );
+ parameterArray[12] = dbHandlerInstance.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
+ parameterArray[13] = dbHandlerInstance.GetParameter<DateTime>( LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime );
+ parameterArray[14] = dbHandlerInstance.GetParameter<int>( LaunchCount, "@launchcount", DbType.Int32 );
+ parameterArray[15] = dbHandlerInstance.GetParameter<string>( GameInfoURL, "@gameInfoUrl", DbType.String );
+ // parameterArray[17] = dbHandlerInstance.GetParameter<bool>( IsFolder, "@isFolder", DbType.Boolean );
string sqlStmt = @"
UPDATE
@@ -591,9 +591,9 @@
LaunchCount = LaunchCount + 1;
SQLiteParameter[] parameterArray = new SQLiteParameter[3];
- parameterArray[0] = DatabaseHandler.GetParameter<DateTime>(LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime);
- parameterArray[1] = DatabaseHandler.GetParameter<int>(LaunchCount, "@launchCount", DbType.Int32);
- parameterArray[2] = DatabaseHandler.GetParameter<int>(FileID, "@fileId", DbType.Int32);
+ parameterArray[0] = dbHandlerInstance.GetParameter<DateTime>(LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime);
+ parameterArray[1] = dbHandlerInstance.GetParameter<int>(LaunchCount, "@launchCount", DbType.Int32);
+ parameterArray[2] = dbHandlerInstance.GetParameter<int>(FileID, "@fileId", DbType.Int32);
try
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -99,10 +99,10 @@
private void Insert()
{
SQLiteParameter[] parameterArray = new SQLiteParameter[3];
- parameterArray[0] = DatabaseHandler.GetParameter<int>(TargetAppID,"@targetApplicationItemId",DbType.Int32);
- parameterArray[1] = DatabaseHandler.GetParameter<int>(AppID,"@applicationItemId",DbType.Int32);
- parameterArray[2] = DatabaseHandler.GetParameter<int>(FileID,"@fileId",DbType.Int32);
- parameterArray[3] = DatabaseHandler.GetParameter<string>(Filename,"@filename",DbType.String);
+ parameterArray[0] = dbHandlerInstance.GetParameter<int>(TargetAppID,"@targetApplicationItemId",DbType.Int32);
+ parameterArray[1] = dbHandlerInstance.GetParameter<int>(AppID,"@applicationItemId",DbType.Int32);
+ parameterArray[2] = dbHandlerInstance.GetParameter<int>(FileID,"@fileId",DbType.Int32);
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>(Filename,"@filename",DbType.String);
try
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <i-...@us...> - 2007-08-14 06:47:50
|
Revision: 835
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=835&view=rev
Author: i-loop
Date: 2007-08-13 23:47:43 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
synced with mp bluetwo
Modified Paths:
--------------
trunk/skins/BlueTwoBig/Development Version/BasicHome.xml
Modified: trunk/skins/BlueTwoBig/Development Version/BasicHome.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/BasicHome.xml 2007-08-13 23:50:51 UTC (rev 834)
+++ trunk/skins/BlueTwoBig/Development Version/BasicHome.xml 2007-08-14 06:47:43 UTC (rev 835)
@@ -103,8 +103,8 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(6)</visible>
- <animation effect="slide" start="0,0" end="-213,81" time="400" acceleration="-0.4" >visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500">visiblechange</animation>
+ <animation effect="slide" start="0,0" end="-213,81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM Video</description>
@@ -130,7 +130,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(5)</visible>
- <animation effect="slide" start="-213,81" end="-426,0" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="-213,81" end="-426,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
@@ -157,7 +157,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(4)</visible>
- <animation effect="slide" start="-426,0" end="-213,-74" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="-426,0" end="-213,-74" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
@@ -184,7 +184,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(3)</visible>
- <animation effect="slide" start="-213,-74" end="0,0" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="-213,-74" end="0,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
@@ -265,7 +265,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(6)</visible>
- <animation effect="slide" start="0,0" end="213,74" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="0,0" end="213,74" time="400" acceleration="-0.4" reversible="false" >visiblechange</animation>
</control>
<control>
<description>home BM FFS</description>
@@ -291,8 +291,8 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(5)</visible>
- <animation effect="slide" start="213,74" end="0,155" time="400" acceleration="-0.4" >visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500">visiblechange</animation>
+ <animation effect="slide" start="213,74" end="0,155" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM FFS</description>
@@ -318,7 +318,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(4)</visible>
- <animation effect="slide" start="0,155" end="-213,74" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="0,155" end="-213,74" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
@@ -345,7 +345,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(3)</visible>
- <animation effect="slide" start="-213,74" end="0,0" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="-213,74" end="0,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
@@ -428,7 +428,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(6)</visible>
- <animation effect="slide" start="0,0" end="213,-74" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="0,0" end="213,-74" time="400" acceleration="-0.4" reversible="false" >visiblechange</animation>
</control>
<control>
<description>home BM Music</description>
@@ -454,7 +454,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(5)</visible>
- <animation effect="slide" start="213,-74" end="426,0" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="213,-74" end="426,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
@@ -481,8 +481,8 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(4)</visible>
- <animation effect="slide" start="426,0" end="213,81" time="400" acceleration="-0.4" >visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500">visiblechange</animation>
+ <animation effect="slide" start="426,0" end="213,81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM Music</description>
@@ -508,7 +508,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(3)</visible>
- <animation effect="slide" start="213,81" end="0,0" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="213,81" end="0,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
@@ -588,7 +588,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(6)</visible>
- <animation effect="slide" start="0,0" end="-213,-81" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="0,0" end="-213,-81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM Pictures</description>
@@ -614,7 +614,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(5)</visible>
- <animation effect="slide" start="-213,-81" end="0,-155" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="-213,-81" end="0,-155" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
@@ -641,7 +641,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(4)</visible>
- <animation effect="slide" start="0,-155" end="213,-81" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="0,-155" end="213,-81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
@@ -669,8 +669,8 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(3)</visible>
- <animation effect="slide" start="213,-81" end="0,0" time="400" acceleration="-0.4" >visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500">visiblechange</animation>
+ <animation effect="slide" start="213,-81" end="0,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
</control>
!....................................................
@@ -699,7 +699,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(66)</visible>
- <animation effect="slide" start="0,0" end="-213,-74" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="0,0" end="-213,-74" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM Video</description>
@@ -725,7 +725,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(33)</visible>
- <animation effect="slide" start="-213,-74" end="-426,0" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="-213,-74" end="-426,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
@@ -752,9 +752,9 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(44)</visible>
- <animation effect="slide" start="-426,0" end="-213,81" time="400" acceleration="-0.4" >visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500">visiblechange</animation>
-
+ <animation effect="slide" start="-426,0" end="-213,81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
+
</control>
<control>
<description>home BM Video</description>
@@ -808,7 +808,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(66)</visible>
- <animation effect="slide" start="0,0" end="-213,74" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="0,0" end="-213,74" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM FFS</description>
@@ -834,8 +834,8 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(33)</visible>
- <animation effect="slide" start="-213,74" end="0,155" time="400" acceleration="-0.4" >visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500">visiblechange</animation>
+ <animation effect="slide" start="-213,74" end="0,155" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM FFS</description>
@@ -861,7 +861,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(44)</visible>
- <animation effect="slide" start="0,155" end="213,74" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="0,155" end="213,74" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
@@ -888,7 +888,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(55)</visible>
- <animation effect="slide" start="213,74" end="0,0" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="213,74" end="0,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
@@ -916,8 +916,8 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(66)</visible>
- <animation effect="slide" start="0,0" end="213,81" time="400" acceleration="-0.4" >visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500">visiblechange</animation>
+ <animation effect="slide" start="0,0" end="213,81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM Music</description>
@@ -943,7 +943,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(33)</visible>
- <animation effect="slide" start="213,81" end="426,0" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="213,81" end="426,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
@@ -970,7 +970,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(44)</visible>
- <animation effect="slide" start="426,0" end="213,-74" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="426,0" end="213,-74" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM Music</description>
@@ -996,7 +996,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(55)</visible>
- <animation effect="slide" start="213,-74" end="0,0" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="213,-74" end="0,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
@@ -1024,7 +1024,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(66)</visible>
- <animation effect="slide" start="0,0" end="213,-81" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="0,0" end="213,-81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM Pictures</description>
@@ -1050,7 +1050,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(33)</visible>
- <animation effect="slide" start="213,-81" end="0,-155" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="213,-81" end="0,-155" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
<control>
@@ -1077,7 +1077,7 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(44)</visible>
- <animation effect="slide" start="0,-155" end="-213,-81" time="400" acceleration="-0.4" >visiblechange</animation>
+ <animation effect="slide" start="0,-155" end="-213,-81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
</control>
@@ -1105,8 +1105,8 @@
<onup>21</onup>
<ondown>66</ondown>
<visible>Control.HasFocus(55)</visible>
- <animation effect="slide" start="-213,-81" end="0,0" time="400" acceleration="-0.4" >visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500">visiblechange</animation>
+ <animation effect="slide" start="-213,-81" end="0,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
</control>
<control>
<type>image</type>
@@ -1115,7 +1115,7 @@
<posY>190</posY>
<texture>Backspin.png</texture>
<visible>![Control.HasFocus(6)|Control.HasFocus(5)|Control.HasFocus(4)|Control.HasFocus(3)|Control.HasFocus(33)|Control.HasFocus(44)|Control.HasFocus(55)|Control.HasFocus(66)]</visible>
- <animation effect="zoom" start="100,100" end="99,99" center="0,0" time="500">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="99,99" center="0,0" time="500" reversible="false">visiblechange</animation>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
</control>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nor...@us...> - 2007-08-13 23:50:57
|
Revision: 834
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=834&view=rev
Author: northern_sky
Date: 2007-08-13 16:50:51 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/README.txt
Modified: trunk/plugins/myGUIProgramsAlt/README.txt
===================================================================
--- trunk/plugins/myGUIProgramsAlt/README.txt 2007-08-13 23:44:56 UTC (rev 833)
+++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-08-13 23:50:51 UTC (rev 834)
@@ -44,15 +44,51 @@
special appitem. Same approch as the dynamic checkboxes
+---------------------
+.: Things to clear :.
+---------------------
+
+Name:
+MyEmu...?
+
+
+Add some more specific emulator support..
+ - using emulator ids??? yes at some point. this could benefit automatic downloads etc
+ - easier application image assigning together with thumbsdir -> we also could provide icons for most common system
+
+
+"Minimize MP before starting a file" as a new option for application items:
+ - sometimes after starting a file (here with fullscreen DirectX PC games, i.e. NFS Most Wanted)
+ MP use too much resources, so the started game slows down and is impossible to play properly
+ - tried it already, but did not get it working properly
+ i used messaging of mp (Messages: MP_SEND_TO_TRAY, MP_SEND_TO_TRAY_DONE, MP_RESTORE_FROM_TRAY, MP_RESTORE_FROM_TRAY_DONE)
+ - how it can work:
+ -> GUIListItem clicked -> WaitForExit-true? -> MinimizeMPonFileLunch-true?
+ --> Minimize MP by sending MP_SEND_TO_TRAY
+ --> wait for MP_SEND_TO_TRAY_DONE
+ -> start file -> wait for fileExit -> IsMPinTray-true?
+ --> Restore MP by sending MP_RESTORE_FROM_TRAY
+ --> wait for MP_RESTORE_FROM_TRAY_DONE
+ -> now it should be able to work with GUI again
+
+Pause/Close Games by input devices:
+ - Gamepads/Joysticks:
+ # try to use MediaPortal's DirectInput feature -> Configuration -> Remote -> DirectInput
+ # or joystick..don't know, there is joy2key and scripting too..
+ - Remotes, in general, maybe we should handle it like DirectInput
+ imo lower priority, if you play with keyboard, use it to close the app, if you play with joystick try first point
+
+---- Suggested features i won't do --------------
+
+ - BackUp feature? - I you wanna do it.... ...Same goes for report features.
+
ThumbnailSupport:
- [low] genre: thumbs for genre, for example it could be created on AllGame lookup, for first file with this genre
----------------------
-.: Things to clear :.
----------------------
-Comment: lets fix some more of the above issues and then head for these?
+Iso mounting -> pro/contra??? The user can easliy script this.
+Fixed by chefkoch ... can i remove this?
---------------------------------------------------------------------------------
- How do we want to handle images in future? -
Currently it is really strange for example if we need to recreate the db from the scratch, you always have to set up the whole stuff.
@@ -91,37 +127,3 @@
--------------------------------------------------------------------------------------
Above: maybe add an advanced option for the user. In short, allowing a merge between "easy setup" (as above)
and total control filepaths etc.
-
-MyEmu...i think
-
-
-Add some more specific emulator support..
- - using emulator ids??? yes at some point. this could benefit automatic downloads etc
- - easier application image assigning together with thumbsdir -> we also could provide icons for most common system
-
-Iso mounting -> pro/contra???
-
-"Minimize MP before starting a file" as a new option for application items:
- - sometimes after starting a file (here with fullscreen DirectX PC games, i.e. NFS Most Wanted)
- MP use too much resources, so the started game slows down and is impossible to play properly
- - tried it already, but did not get it working properly
- i used messaging of mp (Messages: MP_SEND_TO_TRAY, MP_SEND_TO_TRAY_DONE, MP_RESTORE_FROM_TRAY, MP_RESTORE_FROM_TRAY_DONE)
- - how it can work:
- -> GUIListItem clicked -> WaitForExit-true? -> MinimizeMPonFileLunch-true?
- --> Minimize MP by sending MP_SEND_TO_TRAY
- --> wait for MP_SEND_TO_TRAY_DONE
- -> start file -> wait for fileExit -> IsMPinTray-true?
- --> Restore MP by sending MP_RESTORE_FROM_TRAY
- --> wait for MP_RESTORE_FROM_TRAY_DONE
- -> now it should be able to work with GUI again
-
-Pause/Close Games by input devices:
- - Gamepads/Joysticks:
- # try to use MediaPortal's DirectInput feature -> Configuration -> Remote -> DirectInput
- # or joystick..don't know, there is joy2key and scripting too..
- - Remotes, in general, maybe we should handle it like DirectInput
- imo lower priority, if you play with keyboard, use it to close the app, if you play with joystick try first point
-
-----Suggested features i won't do--------------
-
- - What about an BackUp feature? - I you wanna do it.... ...Same goes for report features.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nor...@us...> - 2007-08-13 23:44:59
|
Revision: 833
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=833&view=rev
Author: northern_sky
Date: 2007-08-13 16:44:56 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
made dbhandler real singelton,fixed a viewbug
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -41,32 +41,33 @@
{
/// <summary>
/// DBhandling methods
+ /// Singleton. Dont allow any instance of this class
/// </summary>
- public class DatabaseHandler
+ public sealed class DatabaseHandler
{
+ private SQLiteConnection sqlLiteConnection = null;
+ private List<ApplicationItem> globalApplicationItemList = new List<ApplicationItem>();
+ private readonly string DATABASEFILE = "myProgramsAltDatabaseV1.db3";
- private static SQLiteConnection sqlLiteConn = null;
+ private static DatabaseHandler instance = new DatabaseHandler();
+ // Explicit static constructor to tell C# compiler
+ // not to mark type as beforefieldinit
+ static DatabaseHandler() { }
- static List<ApplicationItem> globalApplicationItemList = new List<ApplicationItem>();
- private const string DATABASEFILE = "myProgramsAltDatabaseV1.db3";
-
- // singleton. Dont allow any instance of this class
- private DatabaseHandler() { }
-
- static DatabaseHandler()
+ private DatabaseHandler()
{
string DatabasePath = Config.GetFile(Config.Dir.Database, DATABASEFILE);
+ string connString = string.Empty;
try
{
-
//check if database exists
if (!File.Exists(DatabasePath))
{
SQLiteConnection.CreateFile(DatabasePath);
- string connString = "Data Source=" + Config.GetFile(Config.Dir.Database, DATABASEFILE);
- sqlLiteConn = new SQLiteConnection(connString);
+ connString = "Data Source=" + Config.GetFile(Config.Dir.Database, DATABASEFILE);
+ sqlLiteConnection = new SQLiteConnection(connString);
SetPragmas();
@@ -78,24 +79,27 @@
}
else
{
- string connString = "Data Source=" + Config.GetFile(Config.Dir.Database, DATABASEFILE) + ";Version=3";
- sqlLiteConn = new SQLiteConnection(connString);
+ connString = "Data Source=" + Config.GetFile(Config.Dir.Database, DATABASEFILE) + ";Version=3";
+ sqlLiteConnection = new SQLiteConnection(connString);
}
- //globalApplicationItemList = new ApplicationItemList(sqlDB, new ApplicationItem.FilelinkLaunchEventHandler(LaunchFilelink));
- LoadAllApplicationItems();
}
catch (SQLiteException ex)
{
- Log.Info("programdatabase exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
+ Log.Info("DatabaseHandler() exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
}
}
- static private void SetPragmas()
+
+ public static DatabaseHandler DBHandlerInstance
{
+ get { return instance; }
+ }
+
+ private void SetPragmas()
+ {
ExecuteStmtNonQuery("PRAGMA default_cache_size=3000");
ExecuteStmtNonQuery("PRAGMA count_changes=1");
ExecuteStmtNonQuery("PRAGMA short_column_names=1");
ExecuteStmtNonQuery("PRAGMA auto_vacuum=1");
-
}
/*static void LaunchFilelink(FilelinkItem curLink, bool MPGUIMode)
@@ -109,15 +113,15 @@
// we can always keep an connection open in sqllite..
//to expensive closing it
- public static SQLiteConnection SqlLiteConn
+ public SQLiteConnection SqlLiteConn
{
get
{
- if (sqlLiteConn.State == ConnectionState.Closed)
+ if (sqlLiteConnection.State == ConnectionState.Closed)
{
- sqlLiteConn.Open();
+ sqlLiteConnection.Open();
}
- return sqlLiteConn;
+ return sqlLiteConnection;
}
}
@@ -125,67 +129,70 @@
/// Create db tables etc,if not already exist
/// </summary>
/// <returns></returns>
- static bool CreateDBTables()
+ bool CreateDBTables()
{
string sqlStmt = @"CREATE TABLE
tblApplicationItem
- (
- applicationId INTEGER PRIMARY KEY,
- fatherNodeId INTEGER,
- title TEXT,
- filename TEXT,
- arguments TEXT,
- windowstyle TEXT,
- startupdir TEXT,
- useShellExecute BOOL,
- useQuotes BOOL,
- applicationItemType TEXT,
- source TEXT,
- imagefile TEXT,
- filedirectory TEXT,
- imagedirectory TEXT,
- validExtensions TEXT,
- enabled BOOL,
- importValidImagesOnly BOOL,
- iposition INTEGER,
- refreshGUIAllowed BOOL,
- platformId INTEGER,
- waitForExit BOOL,
- preLaunch TEXT,
- postLaunch TEXT
- )";
+ (
+ applicationId INTEGER PRIMARY KEY,
+ fatherNodeId INTEGER,
+ title TEXT,
+ filename TEXT,
+ arguments TEXT,
+ windowstyle TEXT,
+ startupdir TEXT,
+ useShellExecute BOOL,
+ useQuotes BOOL,
+ applicationItemType TEXT,
+ source TEXT,
+ imagefile TEXT,
+ filedirectory TEXT,
+ imagedirectory TEXT,
+ validExtensions TEXT,
+ enabled BOOL,
+ importValidImagesOnly BOOL,
+ iposition INTEGER,
+ refreshGUIAllowed BOOL,
+ platformId INTEGER,
+ waitForExit BOOL,
+ preLaunch TEXT,
+ postLaunch TEXT
+ )";
ExecuteStmtNonQuery(sqlStmt);
-
sqlStmt = @"CREATE TABLE tblFileItem (fileid INTEGER PRIMARY KEY, applicationId INTEGER, title TEXT, filename TEXT, imagefile TEXT, genreId INTEGER, genreStyleId INTEGER, country TEXT, manufacturerId INTEGER, year INTEGER, rating INTEGER, overview TEXT, platformId INTEGER, lastTimeLaunched TEXT, launchcount INTEGER, categorydata TEXT, gameInfoUrl TEXT)";
ExecuteStmtNonQuery(sqlStmt);
+
sqlStmt = @"CREATE TABLE tblFileLinkItem (applicationId INTEGER, grouperAppID INTEGER, fileID INTEGER, filename TEXT, updateFlag INTEGER)";
ExecuteStmtNonQuery(sqlStmt);
+
sqlStmt = @"CREATE TABLE tblSetting (settingid INTEGER PRIMARY KEY, key TEXT, value TEXT)";
ExecuteStmtNonQuery(sqlStmt);
sqlStmt = @"CREATE TABLE
- tblGenre
- (
- genreId INTEGER PRIMARY KEY,
- genre TEXT
- )";
+ tblGenre
+ (
+ genreId INTEGER PRIMARY KEY,
+ genre TEXT
+ )";
ExecuteStmtNonQuery(sqlStmt);
+
sqlStmt = @"CREATE TABLE
- tblPlatform
- (
- platformId INTEGER PRIMARY KEY,
- platform TEXT
- )";
+ tblPlatform
+ (
+ platformId INTEGER PRIMARY KEY,
+ platform TEXT
+ )";
ExecuteStmtNonQuery(sqlStmt);
+
sqlStmt = @"CREATE TABLE
- tblManufacturer
- (
- manufacturerId INTEGER PRIMARY KEY,
- manufacturer TEXT
- )";
+ tblManufacturer
+ (
+ manufacturerId INTEGER PRIMARY KEY,
+ manufacturer TEXT
+ )";
ExecuteStmtNonQuery(sqlStmt);
sqlStmt = @"CREATE INDEX idxFile1 ON tblFileItem(applicationId)";
@@ -202,7 +209,7 @@
/// Inserting some default values so that the db is preloaded
/// Should always be there.
/// </summary>
- private static void InsertDefaultDBValues()
+ private void InsertDefaultDBValues()
{
string sqlStmt = @"INSERT INTO
@@ -254,7 +261,7 @@
}
- private static void FillDefaultDBLexiconHelper(string tableName, string columnName, List<string> itemList)
+ private void FillDefaultDBLexiconHelper(string tableName, string columnName, List<string> itemList)
{
SQLiteParameter[] paramCollection = new SQLiteParameter[1];
SQLiteParameter paramInsertValue = new SQLiteParameter("@insertValue", DbType.String);
@@ -273,15 +280,13 @@
foreach (string insertValue in itemList)
{
-
-
paramCollection[0].Value = insertValue;
ExecuteStmtNonQuery(sqlStmt, paramCollection);
}
}
#region dbsettings
- static public string ReadSetting(string Key)
+ public string ReadSetting(string Key)
{
string sqlStmt = string.Empty;
@@ -305,7 +310,7 @@
return keyValue;
}
- static int CountKey(string Key)
+ int CountKey(string Key)
{
string sqlStmt = string.Empty;
int keyValue = 0;
@@ -322,12 +327,12 @@
return keyValue;
}
- static public bool KeyExists(string Key)
+ public bool KeyExists(string Key)
{
return (CountKey(Key) > 0);
}
- static public void WriteSetting(string Key, string Value)
+ public void WriteSetting(string Key, string Value)
{
string sqlStmt = string.Empty;
@@ -355,21 +360,19 @@
ExecuteStmtNonQuery(sqlStmt);
}
- static public void DeleteSetting(string Key)
+ public void DeleteSetting(string Key)
{
-
string sqlStmt = "DELETE FROM tblSetting WHERE key = '" + Key + "'";
ExecuteStmtNonQuery(sqlStmt);
}
#endregion dbsettings
- public static int LexiconDataExists(string tableName, string columnName, string fieldValue)
+ public int LexiconDataExists(string tableName, string columnName, string fieldValue)
{
SQLiteParameter[] parameterArray = new SQLiteParameter[1];
parameterArray[0] = GetParameter<string>(fieldValue, "@fieldValue", DbType.String);
-
string sqlStmt = @"
SELECT
" + columnName + @"id
@@ -415,6 +418,7 @@
#region default lexiconvalues
+
private static List<string> CreateGenreLexiconList()
{
List<string> genreList = new List<string>();
@@ -469,9 +473,7 @@
#endregion default lexiconvalues
-
-
- static public List<ApplicationItem> ApplicationItemList
+ public List<ApplicationItem> ApplicationItemList
{
get
{
@@ -479,7 +481,7 @@
}
}
- static public ItemType GetItemType(string columnName, string tableName, int id)
+ public ItemType GetItemType(string columnName, string tableName, int id)
{
ItemType itemType = ItemType.UNKNOWN;
@@ -491,7 +493,7 @@
#region dataaccess help methods
- public static DataTable ExecuteStmtDataTable(string stmt)
+ public DataTable ExecuteStmtDataTable(string stmt)
{
DataTable dataTable = new DataTable();
@@ -514,7 +516,7 @@
return dataTable;
}
- public static void ExecuteStmtNonQuery(string stmt)
+ public void ExecuteStmtNonQuery(string stmt)
{
try
{
@@ -530,7 +532,7 @@
}
}
- public static void ExecuteStmtNonQuery(string stmt, SQLiteParameter[] paramcollection)
+ public void ExecuteStmtNonQuery(string stmt, SQLiteParameter[] paramcollection)
{
try
{
@@ -547,7 +549,7 @@
}
}
- public static T ExecuteStmtScalar<T>(string stmt, SQLiteParameter[] paramcollection)
+ public T ExecuteStmtScalar<T>(string stmt, SQLiteParameter[] paramcollection)
{
object o = null;
@@ -564,7 +566,6 @@
return (T)Convert.ChangeType(o, typeof(T));
}
return default(T);
-
}
}
catch (Exception exception)
@@ -573,9 +574,7 @@
}
}
-
-
- public static object ExecuteStmtScalar(string stmt)
+ public object ExecuteStmtScalar(string stmt)
{
object o = null;
try
@@ -603,7 +602,7 @@
#endregion dataaccess help methods
- public static void LoadAllApplicationItems()
+ public void LoadAllApplicationItems()
{
try
{
@@ -620,7 +619,6 @@
// applicationItem.OnLaunchFilelink += new ApplicationItem.FilelinkLaunchEventHandler(LaunchFilelink);
globalApplicationItemList.Add(applicationItem);
}
-
}
}
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -40,7 +40,7 @@
{
public partial class AppSettingsFilesView : UserControl
{
- private List<ApplicationItem> apps = DatabaseHandler.ApplicationItemList;
+ private List<ApplicationItem> apps = DatabaseHandler.DBHandlerInstance.ApplicationItemList;
public event EventHandler OnRefreshClick;
private ApplicationItem currentApplication = null;
public event EventHandler OnImageFolderSearch;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -108,7 +108,7 @@
List<ListItem> listItemList = new List<ListItem>();
- SQLiteCommand command = DatabaseHandler.SqlLiteConn.CreateCommand();
+ SQLiteCommand command = DatabaseHandler.DBHandlerInstance.SqlLiteConn.CreateCommand();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -44,6 +44,7 @@
public partial class SettingsBase : UserControl
{
protected ConditionChecker conditionChecker = new ConditionChecker();
+ protected DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
public SettingsBase()
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -53,7 +53,7 @@
base.LoadSettings(curApp);
// plugin title
- titleTextBox.Text = DatabaseHandler.ReadSetting(ProgramUtils.cPLUGINTITLE);
+ titleTextBox.Text = dbHandlerInstance.ReadSetting(ProgramUtils.cPLUGINTITLE);
if (titleTextBox.Text == "")
{
// PluginTitle.Text = GUILocalizeStrings.Get(0);
@@ -77,15 +77,15 @@
// plugin title
if (titleTextBox.Text == ProgramUtils.cDefaultPluginTitle || titleTextBox.Text == "")
- DatabaseHandler.DeleteSetting(ProgramUtils.cPLUGINTITLE);
+ dbHandlerInstance.DeleteSetting(ProgramUtils.cPLUGINTITLE);
else
- DatabaseHandler.WriteSetting(ProgramUtils.cPLUGINTITLE, titleTextBox.Text);
+ dbHandlerInstance.WriteSetting(ProgramUtils.cPLUGINTITLE, titleTextBox.Text);
// sleep time
- DatabaseHandler.WriteSetting(ProgramUtils.cSLIDESPEED, sleepTimeNumericUpDown.Value.ToString());
+ dbHandlerInstance.WriteSetting(ProgramUtils.cSLIDESPEED, sleepTimeNumericUpDown.Value.ToString());
// use mp thumbs dir
- DatabaseHandler.WriteSetting(ProgramUtils.cUSE_MP_THUMBS_DIR, checkBoxUseThumbsDir.Checked.ToString());
+ dbHandlerInstance.WriteSetting(ProgramUtils.cUSE_MP_THUMBS_DIR, checkBoxUseThumbsDir.Checked.ToString());
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -57,7 +57,8 @@
#region Variables
- private List<ApplicationItem> globalApplicationList = DatabaseHandler.ApplicationItemList;
+ private DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
+ private List<ApplicationItem> globalApplicationList;// = DatabaseHandler.DBHandlerInstance.ApplicationItemList;
private AppSettingsDirCache appSettingsDirCache = new AppSettingsDirCache();
private AppSettingsMame appSettingsMame = new AppSettingsMame();
private AppSettingsGamebase appSettingsGameBase = new AppSettingsGamebase();
@@ -79,7 +80,9 @@
public SetupForm()
{
InitializeComponent();
-
+ //globalApplicationItemList = new ApplicationItemList(sqlDB, new ApplicationItem.FilelinkLaunchEventHandler(LaunchFilelink));
+ dbHandlerInstance.LoadAllApplicationItems();
+ globalApplicationList = dbHandlerInstance.ApplicationItemList;
appSettingsFileEditView.OnRefreshClick += new EventHandler(this.RefreshClick);
//when imagefolder was clicked on filesview...
appSettingsFileEditView.OnImageFolderSearch += new EventHandler(this.ImageSearchClick);
@@ -654,7 +657,7 @@
//ADD POSITION CHECK?
- DatabaseHandler.LoadAllApplicationItems();
+ dbHandlerInstance.LoadAllApplicationItems();
UpdateTree();
}
}
@@ -688,7 +691,7 @@
}
newApplication.SourceType = newSourceType;
newApplication.InsertOrUpdateSettings();
- DatabaseHandler.LoadAllApplicationItems();
+ dbHandlerInstance.LoadAllApplicationItems();
UpdateTree();
@@ -896,7 +899,7 @@
}
}
- DatabaseHandler.LoadAllApplicationItems();
+ dbHandlerInstance.LoadAllApplicationItems();
UpdateTree();
}
}
@@ -951,9 +954,9 @@
}
//close conn
- if (DatabaseHandler.SqlLiteConn.State == ConnectionState.Open)
+ if (dbHandlerInstance.SqlLiteConn.State == ConnectionState.Open)
{
- DatabaseHandler.SqlLiteConn.Close();
+ dbHandlerInstance.SqlLiteConn.Close();
}
}
@@ -1099,7 +1102,7 @@
try
{
- DatabaseHandler.ExecuteStmtNonQuery(sqlStmt);
+ dbHandlerInstance.ExecuteStmtNonQuery(sqlStmt);
}
catch (Exception exception)
{
@@ -1123,7 +1126,7 @@
try
{
- DatabaseHandler.ExecuteStmtNonQuery(sqlStmt);
+ dbHandlerInstance.ExecuteStmtNonQuery(sqlStmt);
}
catch (Exception exception)
{
@@ -1147,7 +1150,7 @@
try
{
- DatabaseHandler.ExecuteStmtNonQuery(sqlStmt);
+ dbHandlerInstance.ExecuteStmtNonQuery(sqlStmt);
}
catch (Exception exception)
{
@@ -1170,7 +1173,7 @@
" + column + @" <> 1 ";
try
{
- DatabaseHandler.ExecuteStmtNonQuery(sqlStmt);
+ dbHandlerInstance.ExecuteStmtNonQuery(sqlStmt);
}
catch (Exception exception)
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -70,7 +70,7 @@
/// false : plugin does not need its own button on home</returns>
public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
{
- string strText = DatabaseHandler.ReadSetting(ProgramUtils.cPLUGINTITLE);
+ string strText = dbHandlerInstance.ReadSetting(ProgramUtils.cPLUGINTITLE);
if ((strText != "") && (strText != null))
{
strButtonText = strText;
@@ -403,6 +403,8 @@
public GUIPrograms()
{
+ dbHandlerInstance.LoadAllApplicationItems();
+ globalApplicationList = dbHandlerInstance.ApplicationItemList;
GetID = (int)Window.WINDOW_FILES;
LoadSettings();
skipInit = true;
@@ -426,9 +428,9 @@
}
- if (DatabaseHandler.SqlLiteConn.State == ConnectionState.Open)
+ if (dbHandlerInstance.SqlLiteConn.State == ConnectionState.Open)
{
- DatabaseHandler.SqlLiteConn.Close();
+ dbHandlerInstance.SqlLiteConn.Close();
}
}
@@ -468,11 +470,12 @@
static int startWindow = (int)GUIWindow.Window.WINDOW_FILES;
protected ProgramSort.SortMethod currentSortMethod = ProgramSort.SortMethod.Title;
+ protected DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
bool currentSortAsc = true;
ProgramViewHandler viewHandler = ProgramViewHandler.Instance;
- List<ApplicationItem> allApplicationsList = DatabaseHandler.ApplicationItemList;
+ List<ApplicationItem> globalApplicationList;// dbHandlerInstance.ApplicationItemList;
public MapSettings mapSettings = new MapSettings();
DirectoryHistory itemHistory = new DirectoryHistory();
public ApplicationItem lastApp = null;
@@ -779,7 +782,7 @@
}
else
{
- string strText = DatabaseHandler.ReadSetting(ProgramUtils.cPLUGINTITLE);
+ string strText = dbHandlerInstance.ReadSetting(ProgramUtils.cPLUGINTITLE);
if ((strText != "") && (strText != null))
{
GUIPropertyManager.SetProperty("#curheader", strText);
@@ -1076,7 +1079,7 @@
{
List<ApplicationItem> applicationItemList = new List<ApplicationItem>();
- foreach (ApplicationItem curApp in allApplicationsList)
+ foreach (ApplicationItem curApp in globalApplicationList)
{
if (curApp.FatherID == FatherID)
{
@@ -1101,7 +1104,7 @@
public int GetMaxPosition(int fatherID)
{
int res = 0;
- foreach (ApplicationItem curApp in allApplicationsList)
+ foreach (ApplicationItem curApp in globalApplicationList)
{
if ((curApp.FatherID == fatherID) && (curApp.Position > res))
{
@@ -1113,7 +1116,7 @@
public ApplicationItem GetAppByID(int targetAppID)
{
- foreach (ApplicationItem curApp in allApplicationsList)
+ foreach (ApplicationItem curApp in globalApplicationList)
{
if (curApp.ApplicationItemId == targetAppID)
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -42,6 +42,7 @@
public class GamebaseImport
{
private ApplicationItem applicationItem = null;
+
// event: read new file
public delegate void MyEventHandler(string informationMessage, int progressBarCtr);
@@ -68,16 +69,16 @@
string strGenre1 = myReader["ParentGenre"].ToString();
string strGenre2 = myReader["Genre"].ToString();
- int LexiconId = DatabaseHandler.LexiconDataExists("tblGenre", "genre", strGenre1);
+ int LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblGenre", "genre", strGenre1);
curFile.GenreId = LexiconId;
- LexiconId = DatabaseHandler.LexiconDataExists("tblGenre", "genre", strGenre2);
+ LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblGenre", "genre", strGenre2);
curFile.GenreStyleId = LexiconId;
// todo: country
curFile.Country = "";
- LexiconId = DatabaseHandler.LexiconDataExists("tblManufacturer", "manufacturer", myReader["Publisher"].ToString());
+ LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblManufacturer", "manufacturer", myReader["Publisher"].ToString());
curFile.ManufacturerId = LexiconId;
curFile.Year = Convert.ToInt32(myReader["Year"]);
curFile.Rating = Convert.ToInt32(myReader["Rating"]) * 2;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -308,8 +308,8 @@
localRomNames.Reverse();
double total = localRomNames.Count;
-
- using (SQLiteTransaction transaction = DatabaseHandler.SqlLiteConn.BeginTransaction())
+
+ using (SQLiteTransaction transaction = DatabaseHandler.DBHandlerInstance.SqlLiteConn.BeginTransaction())
{
foreach (string fileName in localRomNames)
{//
@@ -337,7 +337,7 @@
{
curFile.Year = Convert.ToInt32(match.Groups["year"].Value);
- int LexiconId = DatabaseHandler.LexiconDataExists("tblManufacturer", "manufacturer", match.Groups["manufacturer"].Value);
+ int LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblManufacturer", "manufacturer", match.Groups["manufacturer"].Value);
curFile.ManufacturerId = LexiconId;
@@ -420,7 +420,7 @@
ProcessFullEntry(curFile, fullEntry);
ProcessGenreEntry(curFile, genreEntry);
- int LexiconId = DatabaseHandler.LexiconDataExists("tblPlatform", "platform", "Arcade");
+ int LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblPlatform", "platform", "Arcade");
curFile.PlatformId = LexiconId;
curFile.Rating = 5;
@@ -475,10 +475,10 @@
{
genres[z] = tmpArr[z];
}
- int LexiconId = DatabaseHandler.LexiconDataExists("tblGenre", "genre", genres[0].ToString());
+ int LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblGenre", "genre", genres[0].ToString());
curFile.GenreId = LexiconId;
- LexiconId = DatabaseHandler.LexiconDataExists("tblGenre", "genre", genres[1].ToString());
+ LexiconId = DatabaseHandler.DBHandlerInstance.LexiconDataExists("tblGenre", "genre", genres[1].ToString());
curFile.GenreStyleId = LexiconId;
}
// mspacman=Maze
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -510,7 +510,7 @@
filePath = pathSubfolders;
string sqlQuery = ViewHandler.BuildQuery( appID, pathSubfolders );
- using ( SQLiteCommand command = DatabaseHandler.SqlLiteConn.CreateCommand() )
+ using (SQLiteCommand command = dbHandlerInstance.SqlLiteConn.CreateCommand())
{
command.CommandText = sqlQuery;
using ( SQLiteDataReader dataReader = command.ExecuteReader() )
@@ -746,7 +746,7 @@
int result = 0;
// won't work in multiuser environment :)
string sqlStmt = "SELECT MAX(applicationId) FROM tblApplicationItem";
- object o = DatabaseHandler.ExecuteStmtScalar( sqlStmt );
+ object o = dbHandlerInstance.ExecuteStmtScalar( sqlStmt );
if ( o.ToString() != "" )
{
result = Convert.ToInt32( o );
@@ -850,7 +850,7 @@
@postLaunch
)";
- DatabaseHandler.ExecuteStmtNonQuery( sqlStmt, parameterArray );
+ dbHandlerInstance.ExecuteStmtNonQuery( sqlStmt, parameterArray );
}
catch ( SQLiteException ex )
{
@@ -922,7 +922,7 @@
WHERE applicationId = @applicationItemId";
- DatabaseHandler.ExecuteStmtNonQuery( sqlStmt, parameterArray ); ;
+ dbHandlerInstance.ExecuteStmtNonQuery( sqlStmt, parameterArray ); ;
}
catch ( SQLiteException ex )
{
@@ -942,7 +942,7 @@
{
DeleteFiles();
DeleteFileLinks(paramArray);
- DatabaseHandler.ExecuteStmtNonQuery( "DELETE FROM tblApplicationItem WHERE applicationId = @applicationItemId",paramArray);
+ dbHandlerInstance.ExecuteStmtNonQuery( "DELETE FROM tblApplicationItem WHERE applicationId = @applicationItemId",paramArray);
}
catch ( SQLiteException ex )
{
@@ -957,7 +957,7 @@
try
{
- DatabaseHandler.ExecuteStmtNonQuery( "DELETE FROM tblFileItem WHERE applicationId = " +ApplicationItemId );
+ dbHandlerInstance.ExecuteStmtNonQuery( "DELETE FROM tblFileItem WHERE applicationId = " +ApplicationItemId );
}
catch ( SQLiteException ex )
{
@@ -971,7 +971,7 @@
try
{
- DatabaseHandler.ExecuteStmtNonQuery( "DELETE FROM tblFileLinkItem WHERE applicationId = @applicationItemId OR grouperappid = @applicationItemId",paramArray );
+ dbHandlerInstance.ExecuteStmtNonQuery( "DELETE FROM tblFileLinkItem WHERE applicationId = @applicationItemId OR grouperappid = @applicationItemId",paramArray );
}
catch ( SQLiteException ex )
{
@@ -1026,9 +1026,9 @@
try
{
// 1) initialize TAG.. // update command to fix one single link
- DatabaseHandler.ExecuteStmtNonQuery( "update tblFileLinkItem set updateFlag = 1234 where applicationId = " + ApplicationItemId );
+ dbHandlerInstance.ExecuteStmtNonQuery( "update tblFileLinkItem set updateFlag = 1234 where applicationId = " + ApplicationItemId );
- dataTable = DatabaseHandler.ExecuteStmtDataTable( sqlSelectDataToFix );
+ dataTable = dbHandlerInstance.ExecuteStmtDataTable( sqlSelectDataToFix );
// 2) fix all fileids of the newly imported files
@@ -1038,13 +1038,13 @@
{
newFileID = Convert.ToInt32( row["newfileid"] );
filenameToFix = row["filename"].ToString();
- DatabaseHandler.ExecuteStmtNonQuery( "update tblFileLinkItem set fileID = " + newFileID + ", updateFlag = 0 where applicationId = " + ApplicationItemId + " and filename = '" + filenameToFix + "'" );
+ dbHandlerInstance.ExecuteStmtNonQuery( "update tblFileLinkItem set fileID = " + newFileID + ", updateFlag = 0 where applicationId = " + ApplicationItemId + " and filename = '" + filenameToFix + "'" );
}
// 3) delete untouched links ( they were not imported anymore )
- DatabaseHandler.ExecuteStmtNonQuery( @"delete from tblFileLinkItem where applicationId = " + ApplicationItemId + " and updateFlag = 1234" );
+ dbHandlerInstance.ExecuteStmtNonQuery( @"delete from tblFileLinkItem where applicationId = " + ApplicationItemId + " and updateFlag = 1234" );
}
catch ( SQLiteException ex )
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -236,7 +236,7 @@
}
private void ImportDirectory(string[] fileDirPaths, bool mpGuiMode)
{
- using ( SQLiteTransaction transaction = DatabaseHandler.SqlLiteConn.BeginTransaction() )
+ using ( SQLiteTransaction transaction = dbHandlerInstance.SqlLiteConn.BeginTransaction() )
{
//get all maindirs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -113,7 +113,7 @@
item.StartupDir = (string)dataReader["startupdir"];
item.UseShellExecute =(bool) dataReader["useShellExecute"];
item.UseQuotes =(bool) dataReader["useQuotes"];
- item.SourceType = (ItemType) DatabaseHandler.GetItemType("applicationItemType","tblApplicationItem",item.ApplicationItemId);
+ item.SourceType = (ItemType) DatabaseHandler.DBHandlerInstance.GetItemType("applicationItemType","tblApplicationItem",item.ApplicationItemId);
item.Source = (string)dataReader["source"];
item.Imagefile = (string)dataReader["imagefile"];
item.FileDirectory = (string)dataReader["filedirectory"];
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -128,7 +128,7 @@
filePath = pathSubfolders;
- using ( SQLiteCommand command = DatabaseHandler.SqlLiteConn.CreateCommand() )
+ using ( SQLiteCommand command = dbHandlerInstance.SqlLiteConn.CreateCommand() )
{
command.CommandText = strSQL;
using ( SQLiteDataReader dataReader = command.ExecuteReader() )
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -22,8 +22,7 @@
public abstract class BaseItem
{
-
- protected static SQLiteConnection sqlDB = DatabaseHandler.SqlLiteConn;
+ protected DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
public ProgramViewHandler ViewHandler = ProgramViewHandler.Instance;
public string filePath = "";
//s protected FilelinkItemList fileLinks = null;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -521,7 +521,7 @@
- DatabaseHandler.ExecuteStmtNonQuery( sqlStmt, parameterArray );
+ dbHandlerInstance.ExecuteStmtNonQuery( sqlStmt, parameterArray );
}
catch ( SQLiteException ex )
@@ -576,7 +576,7 @@
WHERE
fileid = @fileId";
- DatabaseHandler.ExecuteStmtNonQuery(sqlStmt,parameterArray);
+ dbHandlerInstance.ExecuteStmtNonQuery(sqlStmt,parameterArray);
}
catch ( SQLiteException ex )
{
@@ -598,7 +598,7 @@
try
{
- DatabaseHandler.ExecuteStmtNonQuery(@"
+ dbHandlerInstance.ExecuteStmtNonQuery(@"
UPDATE
tblFileItem SET
@@ -634,8 +634,8 @@
{
try
{
- DatabaseHandler.ExecuteStmtNonQuery( @"DELETE FROM tblFileLinkItem WHERE fileid = " + this.FileID );
- DatabaseHandler.ExecuteStmtNonQuery( @"DELETE FROM tblFileItem WHERE fileid = " + this.FileID );
+ dbHandlerInstance.ExecuteStmtNonQuery( @"DELETE FROM tblFileLinkItem WHERE fileid = " + this.FileID );
+ dbHandlerInstance.ExecuteStmtNonQuery( @"DELETE FROM tblFileItem WHERE fileid = " + this.FileID );
}
catch ( SQLiteException ex )
@@ -720,16 +720,16 @@
{
if ( this.FileInfoFavourite != null )
{
- int LexiconId = DatabaseHandler.LexiconDataExists( "tblGenre", "genre", FileInfoFavourite.Genre );
+ int LexiconId = dbHandlerInstance.LexiconDataExists( "tblGenre", "genre", FileInfoFavourite.Genre );
this.GenreId = LexiconId;
- LexiconId = DatabaseHandler.LexiconDataExists( "tblGenre", "genre", FileInfoFavourite.GenreStyle );
+ LexiconId = dbHandlerInstance.LexiconDataExists("tblGenre", "genre", FileInfoFavourite.GenreStyle);
this.GenreStyleId = LexiconId;
- LexiconId = DatabaseHandler.LexiconDataExists( "tblManufacturer", "manufacturer", FileInfoFavourite.Manufacturer );
+ LexiconId = dbHandlerInstance.LexiconDataExists( "tblManufacturer", "manufacturer", FileInfoFavourite.Manufacturer );
this.ManufacturerId = LexiconId;
- LexiconId = DatabaseHandler.LexiconDataExists( "tblPlatform", "platform", FileInfoFavourite.Platform );
+ LexiconId = dbHandlerInstance.LexiconDataExists( "tblPlatform", "platform", FileInfoFavourite.Platform );
this.PlatformId = LexiconId;
if (importTitle)
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -77,7 +77,7 @@
try
{
- DatabaseHandler.ExecuteStmtNonQuery(String.Format(String.Format("DELETE FROM tblFileLinkItem WHERE applicationId = {0} AND grouperAppID = {1} AND fileID = {2}", this.TargetAppID,
+ dbHandlerInstance.ExecuteStmtNonQuery(String.Format(String.Format("DELETE FROM tblFileLinkItem WHERE applicationId = {0} AND grouperAppID = {1} AND fileID = {2}", this.TargetAppID,
this.AppID, this.FileID)));
}
catch (SQLiteException ex)
@@ -90,7 +90,7 @@
private bool Exists()
{
- bool res = (bool) DatabaseHandler.ExecuteStmtScalar(String.Format("SELECT COUNT(*) FROM tblFileLinkItem WHERE applicationId = {0} AND grouperAppID = {1} AND fileID = {2}", this.TargetAppID,
+ bool res = (bool) dbHandlerInstance.ExecuteStmtScalar(String.Format("SELECT COUNT(*) FROM tblFileLinkItem WHERE applicationId = {0} AND grouperAppID = {1} AND fileID = {2}", this.TargetAppID,
this.AppID, this.FileID));
return res ;
@@ -106,7 +106,7 @@
try
{
- DatabaseHandler.ExecuteStmtNonQuery(@"
+ dbHandlerInstance.ExecuteStmtNonQuery(@"
INSERT INTO
tblFileLinkItem
(
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -383,7 +383,7 @@
try
{
- SQLiteCommand command = new SQLiteCommand(DatabaseHandler.SqlLiteConn);
+ SQLiteCommand command = new SQLiteCommand(DatabaseHandler.DBHandlerInstance.SqlLiteConn);
command.CommandText = sqlStmt;
using (SQLiteDataReader dataReader = command.ExecuteReader())
@@ -412,7 +412,7 @@
{
int sleepTime;
- if (int.TryParse(DatabaseHandler.ReadSetting(ProgramUtils.cSLIDESPEED), out sleepTime))
+ if (int.TryParse(DatabaseHandler.DBHandlerInstance.ReadSetting(ProgramUtils.cSLIDESPEED), out sleepTime))
return sleepTime;
else
return cDefaultSleepTime;
@@ -422,7 +422,7 @@
{
bool useThumbsDir;
- if (bool.TryParse(DatabaseHandler.ReadSetting(ProgramUtils.cUSE_MP_THUMBS_DIR), out useThumbsDir))
+ if (bool.TryParse(DatabaseHandler.DBHandlerInstance.ReadSetting(ProgramUtils.cUSE_MP_THUMBS_DIR), out useThumbsDir))
return useThumbsDir;
else
return true;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-08-13 18:00:08 UTC (rev 832)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-08-13 23:44:56 UTC (rev 833)
@@ -470,7 +470,7 @@
if (sqlSelect.Distinct)
{
- return "SELECT DISTINCT TRIM(title) FROM (" + sqlSelect.AsSQL + ")";
+ return "SELECT DISTINCT TRIM(title) as title FROM (" + sqlSelect.AsSQL + ")";
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-08-13 18:00:12
|
Revision: 832
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=832&view=rev
Author: misterd_sf
Date: 2007-08-13 11:00:08 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
Added Spanish translation for MPlayer. Thx patricon!
Added Paths:
-----------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_es.xml
Added: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_es.xml
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_es.xml (rev 0)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_es.xml 2007-08-13 18:00:08 UTC (rev 832)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Language name="Spanish" characters="255">
+ <Section name="unmapped">
+ <String id="0">Velocidad</String>
+ <String id="1">Audio</String>
+ <String id="2">Subtitulos</String>
+ <String id="3">habilitado</String>
+ <String id="4">deshabilitado</String>
+ <String id="5">Buscar</String>
+ <String id="6">Saltar a</String>
+ <String id="7">Posicion de subtitulos</String>
+ <String id="8">Tamaño de subtitulos</String>
+ <String id="9">Retraso de subtitulos</String>
+ <String id="10">Retraso de audio</String>
+ <String id="11">Relación de aspecto</String>
+ <String id="12">Sin sonido</String>
+ <String id="13">Volumen</String>
+ <String id="14">Reproducir flujo</String>
+ <String id="15">Reproducir disco</String>
+ <String id="16">Borrar elemento</String>
+ </Section>
+</Language>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-08-13 15:37:09
|
Revision: 831
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=831&view=rev
Author: and-81
Date: 2007-08-13 08:37:07 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.Designer.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.resx
trunk/plugins/IR Server Suite/Common/IrssUtils/TransceiverInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginInterface.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/IgorPlug USB Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/WinLirc Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/BlastCommand.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/LearnIR.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/BlastCommand.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/LearnIR.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/BlastCommand.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/LearnIR.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/BlastCommand.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/LearnIR.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Plugins/MCE Replacement Transceiver/
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -52,7 +52,6 @@
this.groupBoxSetup = new System.Windows.Forms.GroupBox();
this.comboBoxComputer = new System.Windows.Forms.ComboBox();
this.groupBoxCommands = new System.Windows.Forms.GroupBox();
- this.comboBoxSpeed = new System.Windows.Forms.ComboBox();
this.comboBoxPort = new System.Windows.Forms.ComboBox();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.buttonHelp = new System.Windows.Forms.Button();
@@ -329,7 +328,6 @@
//
this.groupBoxCommands.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.groupBoxCommands.Controls.Add(this.comboBoxSpeed);
this.groupBoxCommands.Controls.Add(this.comboBoxPort);
this.groupBoxCommands.Controls.Add(this.buttonCrash);
this.groupBoxCommands.Controls.Add(this.buttonBlast);
@@ -344,16 +342,6 @@
this.groupBoxCommands.TabStop = false;
this.groupBoxCommands.Text = "Commands";
//
- // comboBoxSpeed
- //
- this.comboBoxSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxSpeed.FormattingEnabled = true;
- this.comboBoxSpeed.Location = new System.Drawing.Point(168, 50);
- this.comboBoxSpeed.Name = "comboBoxSpeed";
- this.comboBoxSpeed.Size = new System.Drawing.Size(80, 21);
- this.comboBoxSpeed.TabIndex = 4;
- this.toolTip.SetToolTip(this.comboBoxSpeed, "Speed to blast IR at");
- //
// comboBoxPort
//
this.comboBoxPort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -429,7 +417,6 @@
private System.Windows.Forms.GroupBox groupBoxCommands;
private System.Windows.Forms.ToolTip toolTip;
private System.Windows.Forms.ComboBox comboBoxPort;
- private System.Windows.Forms.ComboBox comboBoxSpeed;
private System.Windows.Forms.ComboBox comboBoxComputer;
private System.Windows.Forms.Button buttonHelp;
}
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -141,10 +141,6 @@
comboBoxPort.Items.Add("None");
comboBoxPort.SelectedIndex = 0;
- comboBoxSpeed.Items.Clear();
- comboBoxSpeed.Items.Add("None");
- comboBoxSpeed.SelectedIndex = 0;
-
ArrayList networkPCs = IrssUtils.Win32.GetNetworkComputers();
if (networkPCs != null)
{
@@ -192,10 +188,6 @@
comboBoxPort.Items.Clear();
comboBoxPort.Items.AddRange(_transceiverInfo.Ports);
comboBoxPort.SelectedIndex = 0;
-
- comboBoxSpeed.Items.Clear();
- comboBoxSpeed.Items.AddRange(_transceiverInfo.Speeds);
- comboBoxSpeed.SelectedIndex = 0;
return;
}
@@ -327,7 +319,7 @@
return true;
}
- bool BlastIR(string fileName, string port, string speed)
+ bool BlastIR(string fileName, string port)
{
try
{
@@ -336,14 +328,12 @@
FileStream file = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);
- byte[] outData = new byte[8 + port.Length + speed.Length + file.Length];
+ byte[] outData = new byte[4 + port.Length + file.Length];
BitConverter.GetBytes(port.Length).CopyTo(outData, 0);
Encoding.ASCII.GetBytes(port).CopyTo(outData, 4);
- BitConverter.GetBytes(speed.Length).CopyTo(outData, 4 + port.Length);
- Encoding.ASCII.GetBytes(speed).CopyTo(outData, 8 + port.Length);
- file.Read(outData, 8 + port.Length + speed.Length, (int)file.Length);
+ file.Read(outData, 4 + port.Length, (int)file.Length);
file.Close();
PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Blast", outData);
@@ -433,7 +423,7 @@
return;
}
- if (BlastIR(TempIRFile, comboBoxPort.SelectedItem as string, comboBoxSpeed.SelectedItem as string))
+ if (BlastIR(TempIRFile, comboBoxPort.SelectedItem as string))
AddStatusLine("Blasting");
else
AddStatusLine("Can't Blast");
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -850,14 +850,10 @@
if (portLen > 0)
_pluginTransmit.SetPort(Encoding.ASCII.GetString(data, 4, portLen));
- int speedLen = BitConverter.ToInt32(data, 4 + portLen);
- if (speedLen > 0)
- _pluginTransmit.SetSpeed(Encoding.ASCII.GetString(data, 4 + portLen + 4, speedLen));
+ byte[] fileData = new byte[data.Length - (4 + portLen)];
+ for (int index = 4 + portLen; index < data.Length; index++)
+ fileData[index - (4 + portLen)] = data[index];
- byte[] fileData = new byte[data.Length - (4 + portLen + 4 + speedLen)];
- for (int index = (4 + portLen + 4 + speedLen); index < data.Length; index++)
- fileData[index - (4 + portLen + 4 + speedLen)] = data[index];
-
string tempFile = Path.GetTempFileName();
FileStream fileStream = new FileStream(tempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
@@ -1086,7 +1082,6 @@
{
transceiverInfo.Name = _pluginTransmit.Name;
transceiverInfo.Ports = _pluginTransmit.AvailablePorts;
- transceiverInfo.Speeds = _pluginTransmit.AvailableSpeeds;
transceiverInfo.CanLearn = _pluginTransmit.CanLearn;
transceiverInfo.CanTransmit = _pluginTransmit.CanTransmit;
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.Designer.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.Designer.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -29,8 +29,6 @@
private void InitializeComponent()
{
this.labelIRFile = new System.Windows.Forms.Label();
- this.labelBlasterSpeed = new System.Windows.Forms.Label();
- this.comboBoxSpeed = new System.Windows.Forms.ComboBox();
this.labelBlasterPort = new System.Windows.Forms.Label();
this.comboBoxPort = new System.Windows.Forms.ComboBox();
this.labelIRCommandFile = new System.Windows.Forms.Label();
@@ -48,24 +46,6 @@
this.labelIRFile.Text = "IR Command:";
this.labelIRFile.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
- // labelBlasterSpeed
- //
- this.labelBlasterSpeed.Location = new System.Drawing.Point(8, 72);
- this.labelBlasterSpeed.Name = "labelBlasterSpeed";
- this.labelBlasterSpeed.Size = new System.Drawing.Size(88, 21);
- this.labelBlasterSpeed.TabIndex = 4;
- this.labelBlasterSpeed.Text = "Blaster speed:";
- this.labelBlasterSpeed.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // comboBoxSpeed
- //
- this.comboBoxSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxSpeed.FormattingEnabled = true;
- this.comboBoxSpeed.Location = new System.Drawing.Point(96, 72);
- this.comboBoxSpeed.Name = "comboBoxSpeed";
- this.comboBoxSpeed.Size = new System.Drawing.Size(104, 21);
- this.comboBoxSpeed.TabIndex = 5;
- //
// labelBlasterPort
//
this.labelBlasterPort.Location = new System.Drawing.Point(8, 40);
@@ -99,10 +79,10 @@
// buttonTest
//
this.buttonTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonTest.Location = new System.Drawing.Point(8, 112);
+ this.buttonTest.Location = new System.Drawing.Point(8, 72);
this.buttonTest.Name = "buttonTest";
this.buttonTest.Size = new System.Drawing.Size(56, 24);
- this.buttonTest.TabIndex = 6;
+ this.buttonTest.TabIndex = 4;
this.buttonTest.Text = "Test";
this.buttonTest.UseVisualStyleBackColor = true;
this.buttonTest.Click += new System.EventHandler(this.buttonTest_Click);
@@ -110,10 +90,10 @@
// buttonOK
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonOK.Location = new System.Drawing.Point(160, 112);
+ this.buttonOK.Location = new System.Drawing.Point(160, 72);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(56, 24);
- this.buttonOK.TabIndex = 7;
+ this.buttonOK.TabIndex = 5;
this.buttonOK.Text = "OK";
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
@@ -122,10 +102,10 @@
//
this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.buttonCancel.Location = new System.Drawing.Point(224, 112);
+ this.buttonCancel.Location = new System.Drawing.Point(224, 72);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(56, 24);
- this.buttonCancel.TabIndex = 8;
+ this.buttonCancel.TabIndex = 6;
this.buttonCancel.Text = "Cancel";
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
@@ -136,20 +116,18 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.buttonCancel;
- this.ClientSize = new System.Drawing.Size(288, 144);
+ this.ClientSize = new System.Drawing.Size(288, 104);
this.Controls.Add(this.buttonOK);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonTest);
this.Controls.Add(this.labelIRCommandFile);
- this.Controls.Add(this.labelBlasterSpeed);
- this.Controls.Add(this.comboBoxSpeed);
this.Controls.Add(this.labelBlasterPort);
this.Controls.Add(this.comboBoxPort);
this.Controls.Add(this.labelIRFile);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(294, 176);
+ this.MinimumSize = new System.Drawing.Size(294, 130);
this.Name = "BlastCommand";
this.ShowIcon = false;
this.ShowInTaskbar = false;
@@ -162,8 +140,6 @@
#endregion
private System.Windows.Forms.Label labelIRFile;
- private System.Windows.Forms.Label labelBlasterSpeed;
- private System.Windows.Forms.ComboBox comboBoxSpeed;
private System.Windows.Forms.Label labelBlasterPort;
private System.Windows.Forms.ComboBox comboBoxPort;
private System.Windows.Forms.Label labelIRCommandFile;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -20,10 +20,9 @@
{
get
{
- return String.Format("{0}|{1}|{2}",
+ return String.Format("{0}|{1}",
labelIRCommandFile.Text,
- comboBoxPort.SelectedItem as string,
- comboBoxSpeed.SelectedItem as string);
+ comboBoxPort.SelectedItem as string);
}
}
@@ -35,7 +34,7 @@
{
InitializeComponent();
- SetupPortsAndSpeeds();
+ SetupPorts();
labelIRCommandFile.Text = file;
}
@@ -43,7 +42,7 @@
{
InitializeComponent();
- SetupPortsAndSpeeds();
+ SetupPorts();
if (commands == null)
return;
@@ -52,20 +51,14 @@
if (comboBoxPort.Items.Contains(commands[1]))
comboBoxPort.SelectedItem = commands[1];
-
- if (comboBoxSpeed.Items.Contains(commands[2]))
- comboBoxSpeed.SelectedItem = commands[2];
}
#endregion Constructors
- void SetupPortsAndSpeeds()
+ void SetupPorts()
{
comboBoxPort.Items.AddRange(Program.TransceiverInformation.Ports);
comboBoxPort.SelectedIndex = 0;
-
- comboBoxSpeed.Items.AddRange(Program.TransceiverInformation.Speeds);
- comboBoxSpeed.SelectedIndex = 0;
}
#region Buttons
@@ -92,8 +85,7 @@
try
{
Program.BlastIR(Common.FolderIRCommands + fileName + Common.FileExtensionIR,
- comboBoxPort.SelectedItem as string,
- comboBoxSpeed.SelectedItem as string);
+ comboBoxPort.SelectedItem as string);
}
catch (Exception ex)
{
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -40,8 +40,6 @@
this.buttonSet = new System.Windows.Forms.Button();
this.tabControl = new System.Windows.Forms.TabControl();
this.tabPageBlastIR = new System.Windows.Forms.TabPage();
- this.labelBlasterSpeed = new System.Windows.Forms.Label();
- this.comboBoxSpeed = new System.Windows.Forms.ComboBox();
this.buttonLearnIR = new System.Windows.Forms.Button();
this.labelBlasterPort = new System.Windows.Forms.Label();
this.comboBoxIRCode = new System.Windows.Forms.ComboBox();
@@ -169,13 +167,13 @@
this.checkBoxMouseMoveUp = new System.Windows.Forms.CheckBox();
this.labelMouseMove = new System.Windows.Forms.Label();
this.numericUpDownMouseMove = new System.Windows.Forms.NumericUpDown();
+ this.tabPageMisc = new System.Windows.Forms.TabPage();
+ this.labelMiscCommand = new System.Windows.Forms.Label();
+ this.comboBoxMiscCommand = new System.Windows.Forms.ComboBox();
this.buttonTest = new System.Windows.Forms.Button();
this.buttonCancel = new System.Windows.Forms.Button();
this.buttonOK = new System.Windows.Forms.Button();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
- this.tabPageMisc = new System.Windows.Forms.TabPage();
- this.labelMiscCommand = new System.Windows.Forms.Label();
- this.comboBoxMiscCommand = new System.Windows.Forms.ComboBox();
this.groupBoxButton.SuspendLayout();
this.groupBoxSet.SuspendLayout();
this.tabControl.SuspendLayout();
@@ -320,8 +318,6 @@
//
// tabPageBlastIR
//
- this.tabPageBlastIR.Controls.Add(this.labelBlasterSpeed);
- this.tabPageBlastIR.Controls.Add(this.comboBoxSpeed);
this.tabPageBlastIR.Controls.Add(this.buttonLearnIR);
this.tabPageBlastIR.Controls.Add(this.labelBlasterPort);
this.tabPageBlastIR.Controls.Add(this.comboBoxIRCode);
@@ -335,31 +331,13 @@
this.tabPageBlastIR.Text = "Blast IR";
this.tabPageBlastIR.UseVisualStyleBackColor = true;
//
- // labelBlasterSpeed
- //
- this.labelBlasterSpeed.Location = new System.Drawing.Point(8, 80);
- this.labelBlasterSpeed.Name = "labelBlasterSpeed";
- this.labelBlasterSpeed.Size = new System.Drawing.Size(88, 21);
- this.labelBlasterSpeed.TabIndex = 4;
- this.labelBlasterSpeed.Text = "Blaster speed:";
- this.labelBlasterSpeed.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // comboBoxSpeed
- //
- this.comboBoxSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxSpeed.FormattingEnabled = true;
- this.comboBoxSpeed.Location = new System.Drawing.Point(96, 80);
- this.comboBoxSpeed.Name = "comboBoxSpeed";
- this.comboBoxSpeed.Size = new System.Drawing.Size(120, 21);
- this.comboBoxSpeed.TabIndex = 5;
- //
// buttonLearnIR
//
this.buttonLearnIR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonLearnIR.Location = new System.Drawing.Point(360, 176);
this.buttonLearnIR.Name = "buttonLearnIR";
this.buttonLearnIR.Size = new System.Drawing.Size(64, 24);
- this.buttonLearnIR.TabIndex = 6;
+ this.buttonLearnIR.TabIndex = 4;
this.buttonLearnIR.Text = "Learn";
this.toolTips.SetToolTip(this.buttonLearnIR, "Click here to add a new IR Command to the list");
this.buttonLearnIR.UseVisualStyleBackColor = true;
@@ -1013,52 +991,52 @@
this.toolStripSeparator2,
this.specialKeysToolStripMenuItem});
this.contextMenuStripKeystrokes.Name = "contextMenuStripKeystrokes";
- this.contextMenuStripKeystrokes.Size = new System.Drawing.Size(145, 148);
+ this.contextMenuStripKeystrokes.Size = new System.Drawing.Size(139, 148);
//
// cutToolStripMenuItem
//
this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
- this.cutToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.cutToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.cutToolStripMenuItem.Text = "Cut";
this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click);
//
// copyToolStripMenuItem
//
this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
- this.copyToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.copyToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.copyToolStripMenuItem.Text = "Copy";
this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
//
// pasteToolStripMenuItem
//
this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
- this.pasteToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.pasteToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.pasteToolStripMenuItem.Text = "Paste";
this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(135, 6);
//
// selectAllToolStripMenuItem
//
this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
- this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.selectAllToolStripMenuItem.Text = "Select All";
this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
//
// selectNoneToolStripMenuItem
//
this.selectNoneToolStripMenuItem.Name = "selectNoneToolStripMenuItem";
- this.selectNoneToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.selectNoneToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.selectNoneToolStripMenuItem.Text = "Select None";
this.selectNoneToolStripMenuItem.Click += new System.EventHandler(this.selectNoneToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(141, 6);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(135, 6);
//
// specialKeysToolStripMenuItem
//
@@ -1084,7 +1062,7 @@
this.scrollLockToolStripMenuItem,
this.tabToolStripMenuItem});
this.specialKeysToolStripMenuItem.Name = "specialKeysToolStripMenuItem";
- this.specialKeysToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.specialKeysToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.specialKeysToolStripMenuItem.Text = "Special Keys";
//
// arrowsToolStripMenuItem
@@ -1095,34 +1073,34 @@
this.leftToolStripMenuItem,
this.rightToolStripMenuItem});
this.arrowsToolStripMenuItem.Name = "arrowsToolStripMenuItem";
- this.arrowsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.arrowsToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.arrowsToolStripMenuItem.Text = "Arrows";
//
// upToolStripMenuItem
//
this.upToolStripMenuItem.Name = "upToolStripMenuItem";
- this.upToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.upToolStripMenuItem.Size = new System.Drawing.Size(105, 22);
this.upToolStripMenuItem.Text = "Up";
this.upToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// downToolStripMenuItem
//
this.downToolStripMenuItem.Name = "downToolStripMenuItem";
- this.downToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.downToolStripMenuItem.Size = new System.Drawing.Size(105, 22);
this.downToolStripMenuItem.Text = "Down";
this.downToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// leftToolStripMenuItem
//
this.leftToolStripMenuItem.Name = "leftToolStripMenuItem";
- this.leftToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.leftToolStripMenuItem.Size = new System.Drawing.Size(105, 22);
this.leftToolStripMenuItem.Text = "Left";
this.leftToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// rightToolStripMenuItem
//
this.rightToolStripMenuItem.Name = "rightToolStripMenuItem";
- this.rightToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.rightToolStripMenuItem.Size = new System.Drawing.Size(105, 22);
this.rightToolStripMenuItem.Text = "Right";
this.rightToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1146,118 +1124,118 @@
this.f15ToolStripMenuItem,
this.f16ToolStripMenuItem});
this.functionKeysToolStripMenuItem.Name = "functionKeysToolStripMenuItem";
- this.functionKeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.functionKeysToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.functionKeysToolStripMenuItem.Text = "Function Keys";
//
// f1ToolStripMenuItem
//
this.f1ToolStripMenuItem.Name = "f1ToolStripMenuItem";
- this.f1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f1ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f1ToolStripMenuItem.Text = "F1";
this.f1ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f2ToolStripMenuItem
//
this.f2ToolStripMenuItem.Name = "f2ToolStripMenuItem";
- this.f2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f2ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f2ToolStripMenuItem.Text = "F2";
this.f2ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f3ToolStripMenuItem
//
this.f3ToolStripMenuItem.Name = "f3ToolStripMenuItem";
- this.f3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f3ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f3ToolStripMenuItem.Text = "F3";
this.f3ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f4ToolStripMenuItem
//
this.f4ToolStripMenuItem.Name = "f4ToolStripMenuItem";
- this.f4ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f4ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f4ToolStripMenuItem.Text = "F4";
this.f4ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f5ToolStripMenuItem
//
this.f5ToolStripMenuItem.Name = "f5ToolStripMenuItem";
- this.f5ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f5ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f5ToolStripMenuItem.Text = "F5";
this.f5ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f6ToolStripMenuItem
//
this.f6ToolStripMenuItem.Name = "f6ToolStripMenuItem";
- this.f6ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f6ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f6ToolStripMenuItem.Text = "F6";
this.f6ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f7ToolStripMenuItem
//
this.f7ToolStripMenuItem.Name = "f7ToolStripMenuItem";
- this.f7ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f7ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f7ToolStripMenuItem.Text = "F7";
this.f7ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f8ToolStripMenuItem
//
this.f8ToolStripMenuItem.Name = "f8ToolStripMenuItem";
- this.f8ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f8ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f8ToolStripMenuItem.Text = "F8";
this.f8ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f9ToolStripMenuItem
//
this.f9ToolStripMenuItem.Name = "f9ToolStripMenuItem";
- this.f9ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f9ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f9ToolStripMenuItem.Text = "F9";
this.f9ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f10ToolStripMenuItem
//
this.f10ToolStripMenuItem.Name = "f10ToolStripMenuItem";
- this.f10ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f10ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f10ToolStripMenuItem.Text = "F10";
this.f10ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f11ToolStripMenuItem
//
this.f11ToolStripMenuItem.Name = "f11ToolStripMenuItem";
- this.f11ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f11ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f11ToolStripMenuItem.Text = "F11";
this.f11ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f12ToolStripMenuItem
//
this.f12ToolStripMenuItem.Name = "f12ToolStripMenuItem";
- this.f12ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f12ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f12ToolStripMenuItem.Text = "F12";
this.f12ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f13ToolStripMenuItem
//
this.f13ToolStripMenuItem.Name = "f13ToolStripMenuItem";
- this.f13ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f13ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f13ToolStripMenuItem.Text = "F13";
this.f13ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f14ToolStripMenuItem
//
this.f14ToolStripMenuItem.Name = "f14ToolStripMenuItem";
- this.f14ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f14ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f14ToolStripMenuItem.Text = "F14";
this.f14ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f15ToolStripMenuItem
//
this.f15ToolStripMenuItem.Name = "f15ToolStripMenuItem";
- this.f15ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f15ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f15ToolStripMenuItem.Text = "F15";
this.f15ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f16ToolStripMenuItem
//
this.f16ToolStripMenuItem.Name = "f16ToolStripMenuItem";
- this.f16ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f16ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f16ToolStripMenuItem.Text = "F16";
this.f16ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1269,34 +1247,34 @@
this.multiplyToolStripMenuItem,
this.divideToolStripMenuItem});
this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem";
- this.keypadToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.keypadToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.keypadToolStripMenuItem.Text = "Keypad";
//
// addToolStripMenuItem
//
this.addToolStripMenuItem.Name = "addToolStripMenuItem";
- this.addToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
+ this.addToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.addToolStripMenuItem.Text = "Add";
this.addToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// subtractToolStripMenuItem
//
this.subtractToolStripMenuItem.Name = "subtractToolStripMenuItem";
- this.subtractToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
+ this.subtractToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.subtractToolStripMenuItem.Text = "Subtract";
this.subtractToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// multiplyToolStripMenuItem
//
this.multiplyToolStripMenuItem.Name = "multiplyToolStripMenuItem";
- this.multiplyToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
+ this.multiplyToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.multiplyToolStripMenuItem.Text = "Multiply";
this.multiplyToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// divideToolStripMenuItem
//
this.divideToolStripMenuItem.Name = "divideToolStripMenuItem";
- this.divideToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
+ this.divideToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.divideToolStripMenuItem.Text = "Divide";
this.divideToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1307,137 +1285,137 @@
this.controlToolStripMenuItem,
this.shiftToolStripMenuItem});
this.modifiersToolStripMenuItem.Name = "modifiersToolStripMenuItem";
- this.modifiersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.modifiersToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.modifiersToolStripMenuItem.Text = "Modifiers";
//
// altToolStripMenuItem
//
this.altToolStripMenuItem.Name = "altToolStripMenuItem";
- this.altToolStripMenuItem.Size = new System.Drawing.Size(120, 22);
+ this.altToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.altToolStripMenuItem.Text = "Alt";
this.altToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// controlToolStripMenuItem
//
this.controlToolStripMenuItem.Name = "controlToolStripMenuItem";
- this.controlToolStripMenuItem.Size = new System.Drawing.Size(120, 22);
+ this.controlToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.controlToolStripMenuItem.Text = "Control";
this.controlToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// shiftToolStripMenuItem
//
this.shiftToolStripMenuItem.Name = "shiftToolStripMenuItem";
- this.shiftToolStripMenuItem.Size = new System.Drawing.Size(120, 22);
+ this.shiftToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.shiftToolStripMenuItem.Text = "Shift";
this.shiftToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(145, 6);
//
// backspaceToolStripMenuItem
//
this.backspaceToolStripMenuItem.Name = "backspaceToolStripMenuItem";
- this.backspaceToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.backspaceToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.backspaceToolStripMenuItem.Text = "Backspace";
this.backspaceToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// breakToolStripMenuItem
//
this.breakToolStripMenuItem.Name = "breakToolStripMenuItem";
- this.breakToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.breakToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.breakToolStripMenuItem.Text = "Break";
this.breakToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// capsLockToolStripMenuItem
//
this.capsLockToolStripMenuItem.Name = "capsLockToolStripMenuItem";
- this.capsLockToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.capsLockToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.capsLockToolStripMenuItem.Text = "Caps Lock";
this.capsLockToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// delToolStripMenuItem
//
this.delToolStripMenuItem.Name = "delToolStripMenuItem";
- this.delToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.delToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.delToolStripMenuItem.Text = "Delete";
this.delToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// endToolStripMenuItem
//
this.endToolStripMenuItem.Name = "endToolStripMenuItem";
- this.endToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.endToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.endToolStripMenuItem.Text = "End";
this.endToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// enterToolStripMenuItem
//
this.enterToolStripMenuItem.Name = "enterToolStripMenuItem";
- this.enterToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.enterToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.enterToolStripMenuItem.Text = "Enter";
this.enterToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// escapeToolStripMenuItem
//
this.escapeToolStripMenuItem.Name = "escapeToolStripMenuItem";
- this.escapeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.escapeToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.escapeToolStripMenuItem.Text = "Escape";
this.escapeToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// helpToolStripMenuItem
//
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
- this.helpToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.helpToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.helpToolStripMenuItem.Text = "Help";
this.helpToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// homeToolStripMenuItem
//
this.homeToolStripMenuItem.Name = "homeToolStripMenuItem";
- this.homeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.homeToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.homeToolStripMenuItem.Text = "Home";
this.homeToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// insToolStripMenuItem
//
this.insToolStripMenuItem.Name = "insToolStripMenuItem";
- this.insToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.insToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.insToolStripMenuItem.Text = "Insert";
this.insToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// numLockToolStripMenuItem
//
this.numLockToolStripMenuItem.Name = "numLockToolStripMenuItem";
- this.numLockToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.numLockToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.numLockToolStripMenuItem.Text = "Num Lock";
this.numLockToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// pageDownToolStripMenuItem
//
this.pageDownToolStripMenuItem.Name = "pageDownToolStripMenuItem";
- this.pageDownToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.pageDownToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.pageDownToolStripMenuItem.Text = "Page Down";
this.pageDownToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// pageUpToolStripMenuItem
//
this.pageUpToolStripMenuItem.Name = "pageUpToolStripMenuItem";
- this.pageUpToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.pageUpToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.pageUpToolStripMenuItem.Text = "Page Up";
this.pageUpToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// scrollLockToolStripMenuItem
//
this.scrollLockToolStripMenuItem.Name = "scrollLockToolStripMenuItem";
- this.scrollLockToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.scrollLockToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.scrollLockToolStripMenuItem.Text = "Scroll Lock";
this.scrollLockToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// tabToolStripMenuItem
//
this.tabToolStripMenuItem.Name = "tabToolStripMenuItem";
- this.tabToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.tabToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.tabToolStripMenuItem.Text = "Tab";
this.tabToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1641,6 +1619,36 @@
0,
0});
//
+ // tabPageMisc
+ //
+ this.tabPageMisc.Controls.Add(this.labelMiscCommand);
+ this.tabPageMisc.Controls.Add(this.comboBoxMiscCommand);
+ this.tabPageMisc.Location = new System.Drawing.Point(4, 22);
+ this.tabPageMisc.Name = "tabPageMisc";
+ this.tabPageMisc.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPageMisc.Size = new System.Drawing.Size(432, 206);
+ this.tabPageMisc.TabIndex = 7;
+ this.tabPageMisc.Text = "Misc";
+ this.tabPageMisc.UseVisualStyleBackColor = true;
+ //
+ // labelMiscCommand
+ //
+ this.labelMiscCommand.Location = new System.Drawing.Point(8, 16);
+ this.labelMiscCommand.Name = "labelMiscCommand";
+ this.labelMiscCommand.Size = new System.Drawing.Size(88, 21);
+ this.labelMiscCommand.TabIndex = 0;
+ this.labelMiscCommand.Text = "Command:";
+ this.labelMiscCommand.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // comboBoxMiscCommand
+ //
+ this.comboBoxMiscCommand.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxMiscCommand.FormattingEnabled = true;
+ this.comboBoxMiscCommand.Location = new System.Drawing.Point(96, 16);
+ this.comboBoxMiscCommand.Name = "comboBoxMiscCommand";
+ this.comboBoxMiscCommand.Size = new System.Drawing.Size(328, 21);
+ this.comboBoxMiscCommand.TabIndex = 1;
+ //
// buttonTest
//
this.buttonTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -1676,36 +1684,6 @@
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
//
- // tabPageMisc
- //
- this.tabPageMisc.Controls.Add(this.labelMiscCommand);
- this.tabPageMisc.Controls.Add(this.comboBoxMiscCommand);
- this.tabPageMisc.Location = new System.Drawing.Point(4, 22);
- this.tabPageMisc.Name = "tabPageMisc";
- this.tabPageMisc.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageMisc.Size = new System.Drawing.Size(432, 206);
- this.tabPageMisc.TabIndex = 7;
- this.tabPageMisc.Text = "Misc";
- this.tabPageMisc.UseVisualStyleBackColor = true;
- //
- // labelMiscCommand
- //
- this.labelMiscCommand.Location = new System.Drawing.Point(8, 16);
- this.labelMiscCommand.Name = "labelMiscCommand";
- this.labelMiscCommand.Size = new System.Drawing.Size(88, 21);
- this.labelMiscCommand.TabIndex = 0;
- this.labelMiscCommand.Text = "Command:";
- this.labelMiscCommand.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // comboBoxMiscCommand
- //
- this.comboBoxMiscCommand.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxMiscCommand.FormattingEnabled = true;
- this.comboBoxMiscCommand.Location = new System.Drawing.Point(96, 16);
- this.comboBoxMiscCommand.Name = "comboBoxMiscCommand";
- this.comboBoxMiscCommand.Size = new System.Drawing.Size(328, 21);
- this.comboBoxMiscCommand.TabIndex = 1;
- //
// ButtonMappingForm
//
this.AcceptButton = this.buttonOK;
@@ -1771,8 +1749,6 @@
private System.Windows.Forms.Button buttonSet;
private System.Windows.Forms.TabControl tabControl;
private System.Windows.Forms.TabPage tabPageBlastIR;
- private System.Windows.Forms.Label labelBlasterSpeed;
- private System.Windows.Forms.ComboBox comboBoxSpeed;
private System.Windows.Forms.Button buttonLearnIR;
private System.Windows.Forms.Label labelBlasterPort;
private System.Windows.Forms.ComboBox comboBoxIRCode;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -106,11 +106,6 @@
if (comboBoxPort.Items.Count > 0)
comboBoxPort.SelectedIndex = 0;
- comboBoxSpeed.Items.Clear();
- comboBoxSpeed.Items.AddRange(Program.TransceiverInformation.Speeds);
- if (comboBoxSpeed.Items.Count > 0)
- comboBoxSpeed.SelectedIndex = 0;
-
// Setup Serial tab
comboBoxComPort.Items.Clear();
comboBoxComPort.Items.AddRange(SerialPort.GetPortNames());
@@ -151,7 +146,7 @@
prefix = _command.Substring(0, find + 2);
suffix = _command.Substring(find + 2);
}
-
+
switch (prefix)
{
case Common.CmdPrefixBlast:
@@ -161,7 +156,6 @@
tabControl.SelectTab(tabPageBlastIR);
comboBoxIRCode.SelectedItem = commands[0];
comboBoxPort.SelectedItem = commands[1];
- comboBoxSpeed.SelectedItem = commands[2];
break;
}
@@ -323,11 +317,10 @@
case "tabPageBlastIR":
{
textBoxCommand.Text = _command =
- String.Format("{0}{1}|{2}|{3}",
+ String.Format("{0}{1}|{2}",
Common.CmdPrefixBlast,
comboBoxIRCode.SelectedItem as string,
- comboBoxPort.SelectedItem as string,
- comboBoxSpeed.SelectedItem as string);
+ comboBoxPort.SelectedItem as string);
break;
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.Designer.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.Designer.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -38,8 +38,6 @@
this.groupBoxStatus = new System.Windows.Forms.GroupBox();
this.comboBoxPort = new System.Windows.Forms.ComboBox();
this.labelPort = new System.Windows.Forms.Label();
- this.labelSpeed = new System.Windows.Forms.Label();
- this.comboBoxSpeed = new System.Windows.Forms.ComboBox();
this.groupBoxTest = new System.Windows.Forms.GroupBox();
this.groupBoxStatus.SuspendLayout();
this.groupBoxTest.SuspendLayout();
@@ -48,7 +46,7 @@
// buttonDone
//
this.buttonDone.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonDone.Location = new System.Drawing.Point(216, 176);
+ this.buttonDone.Location = new System.Drawing.Point(216, 152);
this.buttonDone.Name = "buttonDone";
this.buttonDone.Size = new System.Drawing.Size(56, 24);
this.buttonDone.TabIndex = 5;
@@ -73,7 +71,7 @@
// buttonLearn
//
this.buttonLearn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonLearn.Location = new System.Drawing.Point(8, 176);
+ this.buttonLearn.Location = new System.Drawing.Point(8, 152);
this.buttonLearn.Name = "buttonLearn";
this.buttonLearn.Size = new System.Drawing.Size(56, 24);
this.buttonLearn.TabIndex = 4;
@@ -101,11 +99,12 @@
//
// buttonTest
//
+ this.buttonTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonTest.Enabled = false;
- this.buttonTest.Location = new System.Drawing.Point(200, 40);
+ this.buttonTest.Location = new System.Drawing.Point(200, 16);
this.buttonTest.Name = "buttonTest";
this.buttonTest.Size = new System.Drawing.Size(56, 24);
- this.buttonTest.TabIndex = 4;
+ this.buttonTest.TabIndex = 2;
this.buttonTest.Text = "Test";
this.buttonTest.UseVisualStyleBackColor = true;
this.buttonTest.Click += new System.EventHandler(this.buttonTest_Click);
@@ -126,7 +125,7 @@
//
this.comboBoxPort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxPort.FormattingEnabled = true;
- this.comboBoxPort.Location = new System.Drawing.Point(8, 40);
+ this.comboBoxPort.Location = new System.Drawing.Point(64, 16);
this.comboBoxPort.Name = "comboBoxPort";
this.comboBoxPort.Size = new System.Drawing.Size(88, 21);
this.comboBoxPort.TabIndex = 1;
@@ -135,41 +134,21 @@
//
this.labelPort.Location = new System.Drawing.Point(8, 16);
this.labelPort.Name = "labelPort";
- this.labelPort.Size = new System.Drawing.Size(88, 24);
+ this.labelPort.Size = new System.Drawing.Size(56, 21);
this.labelPort.TabIndex = 0;
this.labelPort.Text = "Port:";
this.labelPort.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
- // labelSpeed
- //
- this.labelSpeed.Location = new System.Drawing.Point(104, 16);
- this.labelSpeed.Name = "labelSpeed";
- this.labelSpeed.Size = new System.Drawing.Size(88, 24);
- this.labelSpeed.TabIndex = 2;
- this.labelSpeed.Text = "Speed:";
- this.labelSpeed.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // comboBoxSpeed
- //
- this.comboBoxSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxSpeed.FormattingEnabled = true;
- this.comboBoxSpeed.Location = new System.Drawing.Point(104, 40);
- this.comboBoxSpeed.Name = "comboBoxSpeed";
- this.comboBoxSpeed.Size = new System.Drawing.Size(88, 21);
- this.comboBoxSpeed.TabIndex = 3;
- //
// groupBoxTest
//
this.groupBoxTest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBoxTest.Controls.Add(this.comboBoxPort);
- this.groupBoxTest.Controls.Add(this.labelSpeed);
this.groupBoxTest.Controls.Add(this.buttonTest);
- this.groupBoxTest.Controls.Add(this.comboBoxSpeed);
this.groupBoxTest.Controls.Add(this.labelPort);
this.groupBoxTest.Location = new System.Drawing.Point(8, 96);
this.groupBoxTest.Name = "groupBoxTest";
- this.groupBoxTest.Size = new System.Drawing.Size(264, 72);
+ this.groupBoxTest.Size = new System.Drawing.Size(264, 48);
this.groupBoxTest.TabIndex = 3;
this.groupBoxTest.TabStop = false;
this.groupBoxTest.Text = "Test";
@@ -179,7 +158,7 @@
this.AcceptButton = this.buttonDone;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(280, 207);
+ this.ClientSize = new System.Drawing.Size(280, 184);
this.Controls.Add(this.groupBoxTest);
this.Controls.Add(this.buttonDone);
this.Controls.Add(this.groupBoxStatus);
@@ -188,7 +167,7 @@
this.Controls.Add(this.textBoxName);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(288, 234);
+ this.MinimumSize = new System.Drawing.Size(288, 220);
this.Name = "LearnIR";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
@@ -211,8 +190,6 @@
private System.Windows.Forms.GroupBox groupBoxStatus;
private System.Windows.Forms.ComboBox comboBoxPort;
private System.Windows.Forms.Label labelPort;
- private System.Windows.Forms.Label labelSpeed;
- private System.Windows.Forms.ComboBox comboBoxSpeed;
private System.Windows.Forms.GroupBox groupBoxTest;
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -53,10 +53,6 @@
comboBoxPort.Items.Clear();
comboBoxPort.Items.AddRange(Program.TransceiverInformation.Ports);
comboBoxPort.SelectedIndex = 0;
-
- comboBoxSpeed.Items.Clear();
- comboBoxSpeed.Items.AddRange(Program.TransceiverInformation.Speeds);
- comboBoxSpeed.SelectedIndex = 0;
}
#endregion Constructor
@@ -163,8 +159,7 @@
try
{
Program.BlastIR(Common.FolderIRCommands + command + Common.FileExtensionIR,
- comboBoxPort.SelectedItem as string,
- comboBoxSpeed.SelectedItem as string);
+ comboBoxPort.SelectedItem as string);
}
catch (Exception ex)
{
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -1232,7 +1232,7 @@
case Common.XmlTagBlast:
{
string[] commands = Common.SplitBlastCommand(commandProperty);
- BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1], commands[2]);
+ BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]);
break;
}
@@ -1345,8 +1345,7 @@
/// </summary>
/// <param name="fileName">File to blast (absolute path).</param>
/// <param name="port">Port to blast to.</param>
- /// <param name="speed">Speed to blast at.</param>
- internal static void BlastIR(string fileName, string port, string speed)
+ internal static void BlastIR(string fileName, string port)
{
if (!_registered)
throw new Exception("Cannot Blast, not registered ...
[truncated message content] |
|
From: <mis...@us...> - 2007-08-13 12:57:25
|
Revision: 830
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=830&view=rev
Author: misterd_sf
Date: 2007-08-13 05:57:24 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
Forgot Project file
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.csproj
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.csproj
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.csproj 2007-08-13 11:14:54 UTC (rev 829)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.csproj 2007-08-13 12:57:24 UTC (rev 830)
@@ -82,8 +82,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Content Include="Language\strings_de.xml" />
- <Content Include="Language\strings_en.xml" />
<Content Include="SampleConfiguration\MPlayer_GUIPlugin.xml" />
<Content Include="SkinFiles\BlueTwo 16x9\myMPlayer.xml" />
<Content Include="SkinFiles\BlueTwo 4x3\myMPlayer.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-08-13 11:14:55
|
Revision: 829
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=829&view=rev
Author: misterd_sf
Date: 2007-08-13 04:14:54 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
- Redesign Configuration form of External Player
- Added new features: Audio Delay, Subtitle Delay, Subtitle position, Subtitle/OSD size can now be changed during playback
- Added localization support for GUI and external player
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.csproj
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.csproj
Added Paths:
-----------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_de.xml
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_en.xml
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/LocalizeStrings.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/LocalizeStrings.cs
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-08-13 08:55:30 UTC (rev 828)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-08-13 11:14:54 UTC (rev 829)
@@ -47,18 +47,10 @@
private void InitializeComponent() {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigurationForm));
this.okButton = new System.Windows.Forms.Button();
- this.label1 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
this.rebuildIndex = new System.Windows.Forms.CheckBox();
this.priorityBoost = new System.Windows.Forms.CheckBox();
this.label5 = new System.Windows.Forms.Label();
this.optionalArguments = new System.Windows.Forms.TextBox();
- this.soundOutputDriver = new System.Windows.Forms.ComboBox();
- this.postProcessing = new System.Windows.Forms.ComboBox();
- this.aspectRatio = new System.Windows.Forms.ComboBox();
- this.deinterlace = new System.Windows.Forms.ComboBox();
this.cancelButton = new System.Windows.Forms.Button();
this.mplayerPath = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label();
@@ -66,25 +58,39 @@
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.general_Tab = new System.Windows.Forms.TabPage();
- this.label6 = new System.Windows.Forms.Label();
- this.videoOutputDriver = new System.Windows.Forms.ComboBox();
- this.subtitles = new System.Windows.Forms.CheckBox();
this.label30 = new System.Windows.Forms.Label();
this.cacheSize = new System.Windows.Forms.ComboBox();
- this.label29 = new System.Windows.Forms.Label();
- this.soundOutputDevice = new System.Windows.Forms.ComboBox();
- this.passthroughAC3_DTS = new System.Windows.Forms.CheckBox();
this.label22 = new System.Windows.Forms.Label();
this.osdFont = new System.Windows.Forms.ComboBox();
- this.audioNormalize = new System.Windows.Forms.CheckBox();
+ this.video_Tab = new System.Windows.Forms.TabPage();
+ this.subtitleDelayStep = new System.Windows.Forms.NumericUpDown();
+ this.label31 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.videoOutputDriver = new System.Windows.Forms.ComboBox();
+ this.subtitles = new System.Windows.Forms.CheckBox();
this.framedrop = new System.Windows.Forms.CheckBox();
this.directRendering = new System.Windows.Forms.CheckBox();
this.doubleBuffering = new System.Windows.Forms.CheckBox();
this.label21 = new System.Windows.Forms.Label();
+ this.noiseDenoise = new System.Windows.Forms.ComboBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.deinterlace = new System.Windows.Forms.ComboBox();
+ this.aspectRatio = new System.Windows.Forms.ComboBox();
+ this.postProcessing = new System.Windows.Forms.ComboBox();
+ this.audio_Tab = new System.Windows.Forms.TabPage();
+ this.audioDelayStep = new System.Windows.Forms.NumericUpDown();
+ this.label32 = new System.Windows.Forms.Label();
+ this.label29 = new System.Windows.Forms.Label();
+ this.soundOutputDevice = new System.Windows.Forms.ComboBox();
+ this.passthroughAC3_DTS = new System.Windows.Forms.CheckBox();
+ this.audioNormalize = new System.Windows.Forms.CheckBox();
this.label7 = new System.Windows.Forms.Label();
- this.noiseDenoise = new System.Windows.Forms.ComboBox();
this.audioChannels = new System.Windows.Forms.ComboBox();
- this.video_audio_Tab = new System.Windows.Forms.TabPage();
+ this.label1 = new System.Windows.Forms.Label();
+ this.soundOutputDriver = new System.Windows.Forms.ComboBox();
+ this.extension_Tab = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.label26 = new System.Windows.Forms.Label();
this.audioPlayerUse = new System.Windows.Forms.CheckBox();
@@ -134,7 +140,11 @@
this.fontDialog1 = new System.Windows.Forms.FontDialog();
this.tabControl1.SuspendLayout();
this.general_Tab.SuspendLayout();
- this.video_audio_Tab.SuspendLayout();
+ this.video_Tab.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.subtitleDelayStep)).BeginInit();
+ this.audio_Tab.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.audioDelayStep)).BeginInit();
+ this.extension_Tab.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.dvd_vcd_svcd_streams_Tab.SuspendLayout();
@@ -142,7 +152,7 @@
//
// okButton
//
- this.okButton.Location = new System.Drawing.Point(18, 511);
+ this.okButton.Location = new System.Drawing.Point(25, 460);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.TabIndex = 3;
@@ -150,41 +160,9 @@
this.okButton.UseVisualStyleBackColor = true;
this.okButton.Click += new System.EventHandler(this.okButton_Click);
//
- // label1
- //
- this.label1.Location = new System.Drawing.Point(3, 14);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(117, 23);
- this.label1.TabIndex = 8;
- this.label1.Text = "Sound output driver:";
- //
- // label2
- //
- this.label2.Location = new System.Drawing.Point(3, 95);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(117, 23);
- this.label2.TabIndex = 9;
- this.label2.Text = "Postprocessing:";
- //
- // label3
- //
- this.label3.Location = new System.Drawing.Point(3, 122);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(117, 23);
- this.label3.TabIndex = 10;
- this.label3.Text = "Aspect Ratio:";
- //
- // label4
- //
- this.label4.Location = new System.Drawing.Point(3, 149);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(117, 23);
- this.label4.TabIndex = 11;
- this.label4.Text = "Deinterlace:";
- //
// rebuildIndex
//
- this.rebuildIndex.Location = new System.Drawing.Point(6, 318);
+ this.rebuildIndex.Location = new System.Drawing.Point(9, 98);
this.rebuildIndex.Name = "rebuildIndex";
this.rebuildIndex.Size = new System.Drawing.Size(188, 23);
this.rebuildIndex.TabIndex = 12;
@@ -193,7 +171,7 @@
//
// priorityBoost
//
- this.priorityBoost.Location = new System.Drawing.Point(6, 347);
+ this.priorityBoost.Location = new System.Drawing.Point(9, 127);
this.priorityBoost.Name = "priorityBoost";
this.priorityBoost.Size = new System.Drawing.Size(188, 23);
this.priorityBoost.TabIndex = 13;
@@ -202,7 +180,7 @@
//
// label5
//
- this.label5.Location = new System.Drawing.Point(3, 286);
+ this.label5.Location = new System.Drawing.Point(6, 72);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(117, 23);
this.label5.TabIndex = 14;
@@ -210,70 +188,15 @@
//
// optionalArguments
//
- this.optionalArguments.Location = new System.Drawing.Point(122, 283);
+ this.optionalArguments.Location = new System.Drawing.Point(125, 69);
this.optionalArguments.Name = "optionalArguments";
this.optionalArguments.Size = new System.Drawing.Size(260, 20);
this.optionalArguments.TabIndex = 15;
//
- // soundOutputDriver
- //
- this.soundOutputDriver.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.soundOutputDriver.FormattingEnabled = true;
- this.soundOutputDriver.Items.AddRange(new object[] {
- "(don\'t decode sound)",
- "(don\'t play sound)",
- "Win32",
- "DirectSound"});
- this.soundOutputDriver.Location = new System.Drawing.Point(122, 11);
- this.soundOutputDriver.Name = "soundOutputDriver";
- this.soundOutputDriver.Size = new System.Drawing.Size(260, 21);
- this.soundOutputDriver.TabIndex = 16;
- this.soundOutputDriver.SelectedIndexChanged += new System.EventHandler(this.soundOutputDriver_SelectedIndexChanged);
- //
- // postProcessing
- //
- this.postProcessing.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.postProcessing.FormattingEnabled = true;
- this.postProcessing.Items.AddRange(new object[] {
- "Off",
- "Automatic",
- "Maximum quality"});
- this.postProcessing.Location = new System.Drawing.Point(122, 92);
- this.postProcessing.Name = "postProcessing";
- this.postProcessing.Size = new System.Drawing.Size(260, 21);
- this.postProcessing.TabIndex = 17;
- //
- // aspectRatio
- //
- this.aspectRatio.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.aspectRatio.FormattingEnabled = true;
- this.aspectRatio.Items.AddRange(new object[] {
- "Autodetect",
- "4:3",
- "16:9",
- "2,35"});
- this.aspectRatio.Location = new System.Drawing.Point(122, 119);
- this.aspectRatio.Name = "aspectRatio";
- this.aspectRatio.Size = new System.Drawing.Size(260, 21);
- this.aspectRatio.TabIndex = 18;
- //
- // deinterlace
- //
- this.deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.deinterlace.FormattingEnabled = true;
- this.deinterlace.Items.AddRange(new object[] {
- "Off",
- "Simple",
- "Adaptive"});
- this.deinterlace.Location = new System.Drawing.Point(122, 146);
- this.deinterlace.Name = "deinterlace";
- this.deinterlace.Size = new System.Drawing.Size(260, 21);
- this.deinterlace.TabIndex = 19;
- //
// cancelButton
//
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.Location = new System.Drawing.Point(348, 511);
+ this.cancelButton.Location = new System.Drawing.Point(327, 460);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
this.cancelButton.TabIndex = 20;
@@ -283,7 +206,7 @@
//
// mplayerPath
//
- this.mplayerPath.Location = new System.Drawing.Point(122, 434);
+ this.mplayerPath.Location = new System.Drawing.Point(125, 156);
this.mplayerPath.Name = "mplayerPath";
this.mplayerPath.Size = new System.Drawing.Size(174, 20);
this.mplayerPath.TabIndex = 21;
@@ -291,7 +214,7 @@
//
// label8
//
- this.label8.Location = new System.Drawing.Point(3, 437);
+ this.label8.Location = new System.Drawing.Point(6, 159);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(117, 23);
this.label8.TabIndex = 22;
@@ -299,7 +222,7 @@
//
// folderSearch
//
- this.folderSearch.Location = new System.Drawing.Point(302, 432);
+ this.folderSearch.Location = new System.Drawing.Point(309, 154);
this.folderSearch.Name = "folderSearch";
this.folderSearch.Size = new System.Drawing.Size(76, 23);
this.folderSearch.TabIndex = 23;
@@ -314,92 +237,40 @@
// tabControl1
//
this.tabControl1.Controls.Add(this.general_Tab);
- this.tabControl1.Controls.Add(this.video_audio_Tab);
+ this.tabControl1.Controls.Add(this.video_Tab);
+ this.tabControl1.Controls.Add(this.audio_Tab);
+ this.tabControl1.Controls.Add(this.extension_Tab);
this.tabControl1.Controls.Add(this.dvd_vcd_svcd_streams_Tab);
this.tabControl1.Location = new System.Drawing.Point(12, 12);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(411, 493);
+ this.tabControl1.Size = new System.Drawing.Size(411, 431);
this.tabControl1.TabIndex = 24;
//
// general_Tab
//
- this.general_Tab.Controls.Add(this.label6);
- this.general_Tab.Controls.Add(this.videoOutputDriver);
- this.general_Tab.Controls.Add(this.subtitles);
this.general_Tab.Controls.Add(this.label30);
this.general_Tab.Controls.Add(this.cacheSize);
- this.general_Tab.Controls.Add(this.label29);
- this.general_Tab.Controls.Add(this.soundOutputDevice);
- this.general_Tab.Controls.Add(this.passthroughAC3_DTS);
this.general_Tab.Controls.Add(this.label22);
this.general_Tab.Controls.Add(this.osdFont);
- this.general_Tab.Controls.Add(this.audioNormalize);
- this.general_Tab.Controls.Add(this.framedrop);
- this.general_Tab.Controls.Add(this.directRendering);
- this.general_Tab.Controls.Add(this.doubleBuffering);
- this.general_Tab.Controls.Add(this.label21);
- this.general_Tab.Controls.Add(this.label7);
- this.general_Tab.Controls.Add(this.noiseDenoise);
- this.general_Tab.Controls.Add(this.audioChannels);
- this.general_Tab.Controls.Add(this.label1);
this.general_Tab.Controls.Add(this.folderSearch);
- this.general_Tab.Controls.Add(this.label2);
this.general_Tab.Controls.Add(this.label8);
this.general_Tab.Controls.Add(this.mplayerPath);
- this.general_Tab.Controls.Add(this.label3);
- this.general_Tab.Controls.Add(this.label4);
this.general_Tab.Controls.Add(this.rebuildIndex);
- this.general_Tab.Controls.Add(this.deinterlace);
this.general_Tab.Controls.Add(this.priorityBoost);
- this.general_Tab.Controls.Add(this.aspectRatio);
this.general_Tab.Controls.Add(this.label5);
- this.general_Tab.Controls.Add(this.postProcessing);
this.general_Tab.Controls.Add(this.optionalArguments);
- this.general_Tab.Controls.Add(this.soundOutputDriver);
this.general_Tab.Location = new System.Drawing.Point(4, 22);
this.general_Tab.Name = "general_Tab";
this.general_Tab.Padding = new System.Windows.Forms.Padding(3);
- this.general_Tab.Size = new System.Drawing.Size(403, 467);
+ this.general_Tab.Size = new System.Drawing.Size(403, 405);
this.general_Tab.TabIndex = 0;
this.general_Tab.Text = "General";
this.general_Tab.UseVisualStyleBackColor = true;
//
- // label6
- //
- this.label6.Location = new System.Drawing.Point(3, 68);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(117, 23);
- this.label6.TabIndex = 41;
- this.label6.Text = "Video output driver:";
- //
- // videoOutputDriver
- //
- this.videoOutputDriver.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.videoOutputDriver.FormattingEnabled = true;
- this.videoOutputDriver.Items.AddRange(new object[] {
- "DirectX",
- "DirectX - No Acceleration",
- "OpenGL",
- "OpenGL2"});
- this.videoOutputDriver.Location = new System.Drawing.Point(122, 65);
- this.videoOutputDriver.Name = "videoOutputDriver";
- this.videoOutputDriver.Size = new System.Drawing.Size(260, 21);
- this.videoOutputDriver.TabIndex = 40;
- this.videoOutputDriver.SelectedIndexChanged += new System.EventHandler(this.videoOutputDriver_SelectedIndexChanged);
- //
- // subtitles
- //
- this.subtitles.Location = new System.Drawing.Point(200, 405);
- this.subtitles.Name = "subtitles";
- this.subtitles.Size = new System.Drawing.Size(178, 23);
- this.subtitles.TabIndex = 39;
- this.subtitles.Text = "Enable subtitles";
- this.subtitles.UseVisualStyleBackColor = true;
- //
// label30
//
- this.label30.Location = new System.Drawing.Point(3, 259);
+ this.label30.Location = new System.Drawing.Point(6, 45);
this.label30.Name = "label30";
this.label30.Size = new System.Drawing.Size(117, 23);
this.label30.TabIndex = 38;
@@ -412,46 +283,15 @@
"2048",
"4096",
"8192"});
- this.cacheSize.Location = new System.Drawing.Point(122, 256);
+ this.cacheSize.Location = new System.Drawing.Point(126, 42);
this.cacheSize.Name = "cacheSize";
this.cacheSize.Size = new System.Drawing.Size(260, 21);
this.cacheSize.TabIndex = 37;
this.cacheSize.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.cacheSize_KeyPress);
//
- // label29
- //
- this.label29.Location = new System.Drawing.Point(3, 41);
- this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(117, 23);
- this.label29.TabIndex = 36;
- this.label29.Text = "Sound output device:";
- //
- // soundOutputDevice
- //
- this.soundOutputDevice.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.soundOutputDevice.FormattingEnabled = true;
- this.soundOutputDevice.Items.AddRange(new object[] {
- "(don\'t decode sound)",
- "(don\'t play sound)",
- "Win32",
- "DirectSound"});
- this.soundOutputDevice.Location = new System.Drawing.Point(122, 38);
- this.soundOutputDevice.Name = "soundOutputDevice";
- this.soundOutputDevice.Size = new System.Drawing.Size(260, 21);
- this.soundOutputDevice.TabIndex = 35;
- //
- // passthroughAC3_DTS
- //
- this.passthroughAC3_DTS.Location = new System.Drawing.Point(6, 405);
- this.passthroughAC3_DTS.Name = "passthroughAC3_DTS";
- this.passthroughAC3_DTS.Size = new System.Drawing.Size(178, 23);
- this.passthroughAC3_DTS.TabIndex = 34;
- this.passthroughAC3_DTS.Text = "Passthrough AC3/DTS";
- this.passthroughAC3_DTS.UseVisualStyleBackColor = true;
- //
// label22
//
- this.label22.Location = new System.Drawing.Point(3, 232);
+ this.label22.Location = new System.Drawing.Point(6, 18);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(117, 23);
this.label22.TabIndex = 33;
@@ -461,63 +301,123 @@
//
this.osdFont.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.osdFont.FormattingEnabled = true;
- this.osdFont.Location = new System.Drawing.Point(122, 229);
+ this.osdFont.Location = new System.Drawing.Point(125, 15);
this.osdFont.Name = "osdFont";
this.osdFont.Size = new System.Drawing.Size(260, 21);
this.osdFont.TabIndex = 32;
//
- // audioNormalize
+ // video_Tab
//
- this.audioNormalize.Location = new System.Drawing.Point(200, 376);
- this.audioNormalize.Name = "audioNormalize";
- this.audioNormalize.Size = new System.Drawing.Size(178, 23);
- this.audioNormalize.TabIndex = 31;
- this.audioNormalize.Text = "Volume normalize";
- this.audioNormalize.UseVisualStyleBackColor = true;
+ this.video_Tab.Controls.Add(this.subtitleDelayStep);
+ this.video_Tab.Controls.Add(this.label31);
+ this.video_Tab.Controls.Add(this.label6);
+ this.video_Tab.Controls.Add(this.videoOutputDriver);
+ this.video_Tab.Controls.Add(this.subtitles);
+ this.video_Tab.Controls.Add(this.framedrop);
+ this.video_Tab.Controls.Add(this.directRendering);
+ this.video_Tab.Controls.Add(this.doubleBuffering);
+ this.video_Tab.Controls.Add(this.label21);
+ this.video_Tab.Controls.Add(this.noiseDenoise);
+ this.video_Tab.Controls.Add(this.label2);
+ this.video_Tab.Controls.Add(this.label3);
+ this.video_Tab.Controls.Add(this.label4);
+ this.video_Tab.Controls.Add(this.deinterlace);
+ this.video_Tab.Controls.Add(this.aspectRatio);
+ this.video_Tab.Controls.Add(this.postProcessing);
+ this.video_Tab.Location = new System.Drawing.Point(4, 22);
+ this.video_Tab.Name = "video_Tab";
+ this.video_Tab.Padding = new System.Windows.Forms.Padding(3);
+ this.video_Tab.Size = new System.Drawing.Size(403, 405);
+ this.video_Tab.TabIndex = 4;
+ this.video_Tab.Text = "Video";
+ this.video_Tab.UseVisualStyleBackColor = true;
//
+ // subtitleDelayStep
+ //
+ this.subtitleDelayStep.Location = new System.Drawing.Point(125, 150);
+ this.subtitleDelayStep.Name = "subtitleDelayStep";
+ this.subtitleDelayStep.Size = new System.Drawing.Size(260, 20);
+ this.subtitleDelayStep.TabIndex = 57;
+ this.subtitleDelayStep.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ //
+ // label31
+ //
+ this.label31.Location = new System.Drawing.Point(6, 152);
+ this.label31.Name = "label31";
+ this.label31.Size = new System.Drawing.Size(117, 30);
+ this.label31.TabIndex = 56;
+ this.label31.Text = "Subtitle Delay Step (msec):";
+ //
+ // label6
+ //
+ this.label6.Location = new System.Drawing.Point(6, 18);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(117, 23);
+ this.label6.TabIndex = 55;
+ this.label6.Text = "Video output driver:";
+ //
+ // videoOutputDriver
+ //
+ this.videoOutputDriver.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.videoOutputDriver.FormattingEnabled = true;
+ this.videoOutputDriver.Items.AddRange(new object[] {
+ "DirectX",
+ "DirectX - No Acceleration",
+ "OpenGL",
+ "OpenGL2"});
+ this.videoOutputDriver.Location = new System.Drawing.Point(125, 15);
+ this.videoOutputDriver.Name = "videoOutputDriver";
+ this.videoOutputDriver.Size = new System.Drawing.Size(260, 21);
+ this.videoOutputDriver.TabIndex = 54;
+ //
+ // subtitles
+ //
+ this.subtitles.Location = new System.Drawing.Point(9, 272);
+ this.subtitles.Name = "subtitles";
+ this.subtitles.Size = new System.Drawing.Size(178, 23);
+ this.subtitles.TabIndex = 53;
+ this.subtitles.Text = "Enable subtitles";
+ this.subtitles.UseVisualStyleBackColor = true;
+ //
// framedrop
//
- this.framedrop.Location = new System.Drawing.Point(6, 376);
+ this.framedrop.Location = new System.Drawing.Point(9, 185);
this.framedrop.Name = "framedrop";
this.framedrop.Size = new System.Drawing.Size(188, 23);
- this.framedrop.TabIndex = 30;
+ this.framedrop.TabIndex = 52;
this.framedrop.Text = "Framedrop";
this.framedrop.UseVisualStyleBackColor = true;
//
// directRendering
//
- this.directRendering.Location = new System.Drawing.Point(200, 318);
+ this.directRendering.Location = new System.Drawing.Point(9, 214);
this.directRendering.Name = "directRendering";
this.directRendering.Size = new System.Drawing.Size(178, 23);
- this.directRendering.TabIndex = 29;
+ this.directRendering.TabIndex = 51;
this.directRendering.Text = "Direct Rendering";
this.directRendering.UseVisualStyleBackColor = true;
//
// doubleBuffering
//
- this.doubleBuffering.Location = new System.Drawing.Point(200, 347);
+ this.doubleBuffering.Location = new System.Drawing.Point(9, 243);
this.doubleBuffering.Name = "doubleBuffering";
this.doubleBuffering.Size = new System.Drawing.Size(178, 23);
- this.doubleBuffering.TabIndex = 28;
+ this.doubleBuffering.TabIndex = 50;
this.doubleBuffering.Text = "Double Buffering";
this.doubleBuffering.UseVisualStyleBackColor = true;
//
// label21
//
- this.label21.Location = new System.Drawing.Point(3, 205);
+ this.label21.Location = new System.Drawing.Point(6, 126);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(117, 23);
- this.label21.TabIndex = 27;
+ this.label21.TabIndex = 49;
this.label21.Text = "Noise/Denoise:";
//
- // label7
- //
- this.label7.Location = new System.Drawing.Point(3, 176);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(117, 23);
- this.label7.TabIndex = 26;
- this.label7.Text = "Audio Channels:";
- //
// noiseDenoise
//
this.noiseDenoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -527,11 +427,162 @@
"Noise",
"High Quality Denoise",
"Denoise"});
- this.noiseDenoise.Location = new System.Drawing.Point(122, 202);
+ this.noiseDenoise.Location = new System.Drawing.Point(125, 123);
this.noiseDenoise.Name = "noiseDenoise";
this.noiseDenoise.Size = new System.Drawing.Size(260, 21);
- this.noiseDenoise.TabIndex = 25;
+ this.noiseDenoise.TabIndex = 48;
//
+ // label2
+ //
+ this.label2.Location = new System.Drawing.Point(6, 45);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(117, 23);
+ this.label2.TabIndex = 42;
+ this.label2.Text = "Postprocessing:";
+ //
+ // label3
+ //
+ this.label3.Location = new System.Drawing.Point(6, 72);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(117, 23);
+ this.label3.TabIndex = 43;
+ this.label3.Text = "Aspect Ratio:";
+ //
+ // label4
+ //
+ this.label4.Location = new System.Drawing.Point(6, 99);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(117, 23);
+ this.label4.TabIndex = 44;
+ this.label4.Text = "Deinterlace:";
+ //
+ // deinterlace
+ //
+ this.deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.deinterlace.FormattingEnabled = true;
+ this.deinterlace.Items.AddRange(new object[] {
+ "Off",
+ "Simple",
+ "Adaptive"});
+ this.deinterlace.Location = new System.Drawing.Point(125, 96);
+ this.deinterlace.Name = "deinterlace";
+ this.deinterlace.Size = new System.Drawing.Size(260, 21);
+ this.deinterlace.TabIndex = 47;
+ //
+ // aspectRatio
+ //
+ this.aspectRatio.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.aspectRatio.FormattingEnabled = true;
+ this.aspectRatio.Items.AddRange(new object[] {
+ "Autodetect",
+ "4:3",
+ "16:9",
+ "2,35"});
+ this.aspectRatio.Location = new System.Drawing.Point(125, 69);
+ this.aspectRatio.Name = "aspectRatio";
+ this.aspectRatio.Size = new System.Drawing.Size(260, 21);
+ this.aspectRatio.TabIndex = 46;
+ //
+ // postProcessing
+ //
+ this.postProcessing.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.postProcessing.FormattingEnabled = true;
+ this.postProcessing.Items.AddRange(new object[] {
+ "Off",
+ "Automatic",
+ "Maximum quality"});
+ this.postProcessing.Location = new System.Drawing.Point(125, 42);
+ this.postProcessing.Name = "postProcessing";
+ this.postProcessing.Size = new System.Drawing.Size(260, 21);
+ this.postProcessing.TabIndex = 45;
+ //
+ // audio_Tab
+ //
+ this.audio_Tab.Controls.Add(this.audioDelayStep);
+ this.audio_Tab.Controls.Add(this.label32);
+ this.audio_Tab.Controls.Add(this.label29);
+ this.audio_Tab.Controls.Add(this.soundOutputDevice);
+ this.audio_Tab.Controls.Add(this.passthroughAC3_DTS);
+ this.audio_Tab.Controls.Add(this.audioNormalize);
+ this.audio_Tab.Controls.Add(this.label7);
+ this.audio_Tab.Controls.Add(this.audioChannels);
+ this.audio_Tab.Controls.Add(this.label1);
+ this.audio_Tab.Controls.Add(this.soundOutputDriver);
+ this.audio_Tab.Location = new System.Drawing.Point(4, 22);
+ this.audio_Tab.Name = "audio_Tab";
+ this.audio_Tab.Size = new System.Drawing.Size(403, 405);
+ this.audio_Tab.TabIndex = 5;
+ this.audio_Tab.Text = "Audio";
+ this.audio_Tab.UseVisualStyleBackColor = true;
+ //
+ // audioDelayStep
+ //
+ this.audioDelayStep.Location = new System.Drawing.Point(125, 96);
+ this.audioDelayStep.Name = "audioDelayStep";
+ this.audioDelayStep.Size = new System.Drawing.Size(260, 20);
+ this.audioDelayStep.TabIndex = 59;
+ this.audioDelayStep.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ //
+ // label32
+ //
+ this.label32.Location = new System.Drawing.Point(3, 98);
+ this.label32.Name = "label32";
+ this.label32.Size = new System.Drawing.Size(117, 31);
+ this.label32.TabIndex = 58;
+ this.label32.Text = "Audio Delay Step (msec):";
+ //
+ // label29
+ //
+ this.label29.Location = new System.Drawing.Point(3, 42);
+ this.label29.Name = "label29";
+ this.label29.Size = new System.Drawing.Size(117, 23);
+ this.label29.TabIndex = 44;
+ this.label29.Text = "Sound output device:";
+ //
+ // soundOutputDevice
+ //
+ this.soundOutputDevice.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.soundOutputDevice.FormattingEnabled = true;
+ this.soundOutputDevice.Items.AddRange(new object[] {
+ "(don\'t decode sound)",
+ "(don\'t play sound)",
+ "Win32",
+ "DirectSound"});
+ this.soundOutputDevice.Location = new System.Drawing.Point(125, 42);
+ this.soundOutputDevice.Name = "soundOutputDevice";
+ this.soundOutputDevice.Size = new System.Drawing.Size(260, 21);
+ this.soundOutputDevice.TabIndex = 43;
+ //
+ // passthroughAC3_DTS
+ //
+ this.passthroughAC3_DTS.Location = new System.Drawing.Point(6, 132);
+ this.passthroughAC3_DTS.Name = "passthroughAC3_DTS";
+ this.passthroughAC3_DTS.Size = new System.Drawing.Size(178, 23);
+ this.passthroughAC3_DTS.TabIndex = 42;
+ this.passthroughAC3_DTS.Text = "Passthrough AC3/DTS";
+ this.passthroughAC3_DTS.UseVisualStyleBackColor = true;
+ //
+ // audioNormalize
+ //
+ this.audioNormalize.Location = new System.Drawing.Point(6, 161);
+ this.audioNormalize.Name = "audioNormalize";
+ this.audioNormalize.Size = new System.Drawing.Size(178, 23);
+ this.audioNormalize.TabIndex = 41;
+ this.audioNormalize.Text = "Volume normalize";
+ this.audioNormalize.UseVisualStyleBackColor = true;
+ //
+ // label7
+ //
+ this.label7.Location = new System.Drawing.Point(3, 69);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(117, 23);
+ this.label7.TabIndex = 40;
+ this.label7.Text = "Audio Channels:";
+ //
// audioChannels
//
this.audioChannels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -541,23 +592,45 @@
"Stereo",
"Surround",
"Full 5.1"});
- this.audioChannels.Location = new System.Drawing.Point(122, 173);
+ this.audioChannels.Location = new System.Drawing.Point(125, 69);
this.audioChannels.Name = "audioChannels";
this.audioChannels.Size = new System.Drawing.Size(260, 21);
- this.audioChannels.TabIndex = 24;
+ this.audioChannels.TabIndex = 39;
//
- // video_audio_Tab
+ // label1
//
- this.video_audio_Tab.Controls.Add(this.groupBox2);
- this.video_audio_Tab.Controls.Add(this.groupBox1);
- this.video_audio_Tab.Location = new System.Drawing.Point(4, 22);
- this.video_audio_Tab.Name = "video_audio_Tab";
- this.video_audio_Tab.Padding = new System.Windows.Forms.Padding(3);
- this.video_audio_Tab.Size = new System.Drawing.Size(403, 467);
- this.video_audio_Tab.TabIndex = 1;
- this.video_audio_Tab.Text = "Video/Audio";
- this.video_audio_Tab.UseVisualStyleBackColor = true;
+ this.label1.Location = new System.Drawing.Point(3, 15);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(117, 23);
+ this.label1.TabIndex = 37;
+ this.label1.Text = "Sound output driver:";
//
+ // soundOutputDriver
+ //
+ this.soundOutputDriver.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.soundOutputDriver.FormattingEnabled = true;
+ this.soundOutputDriver.Items.AddRange(new object[] {
+ "(don\'t decode sound)",
+ "(don\'t play sound)",
+ "Win32",
+ "DirectSound"});
+ this.soundOutputDriver.Location = new System.Drawing.Point(125, 15);
+ this.soundOutputDriver.Name = "soundOutputDriver";
+ this.soundOutputDriver.Size = new System.Drawing.Size(260, 21);
+ this.soundOutputDriver.TabIndex = 38;
+ //
+ // extension_Tab
+ //
+ this.extension_Tab.Controls.Add(this.groupBox2);
+ this.extension_Tab.Controls.Add(this.groupBox1);
+ this.extension_Tab.Location = new System.Drawing.Point(4, 22);
+ this.extension_Tab.Name = "extension_Tab";
+ this.extension_Tab.Padding = new System.Windows.Forms.Padding(3);
+ this.extension_Tab.Size = new System.Drawing.Size(403, 405);
+ this.extension_Tab.TabIndex = 1;
+ this.extension_Tab.Text = "Extensions";
+ this.extension_Tab.UseVisualStyleBackColor = true;
+ //
// groupBox2
//
this.groupBox2.Controls.Add(this.label26);
@@ -569,9 +642,9 @@
this.groupBox2.Controls.Add(this.audioDelete);
this.groupBox2.Controls.Add(this.audioAdd);
this.groupBox2.Controls.Add(this.audioExtList);
- this.groupBox2.Location = new System.Drawing.Point(3, 242);
+ this.groupBox2.Location = new System.Drawing.Point(3, 201);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(394, 219);
+ this.groupBox2.Size = new System.Drawing.Size(394, 189);
this.groupBox2.TabIndex = 30;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Audio";
@@ -632,7 +705,7 @@
//
// audioDelete
//
- this.audioDelete.Location = new System.Drawing.Point(174, 182);
+ this.audioDelete.Location = new System.Drawing.Point(174, 156);
this.audioDelete.Name = "audioDelete";
this.audioDelete.Size = new System.Drawing.Size(75, 23);
this.audioDelete.TabIndex = 38;
@@ -642,7 +715,7 @@
//
// audioAdd
//
- this.audioAdd.Location = new System.Drawing.Point(93, 182);
+ this.audioAdd.Location = new System.Drawing.Point(93, 156);
this.audioAdd.Name = "audioAdd";
this.audioAdd.Size = new System.Drawing.Size(75, 23);
this.audioAdd.TabIndex = 37;
@@ -655,7 +728,7 @@
this.audioExtList.FormattingEnabled = true;
this.audioExtList.Location = new System.Drawing.Point(6, 19);
this.audioExtList.Name = "audioExtList";
- this.audioExtList.Size = new System.Drawing.Size(78, 186);
+ this.audioExtList.Size = new System.Drawing.Size(78, 160);
this.audioExtList.TabIndex = 36;
this.audioExtList.SelectedIndexChanged += new System.EventHandler(this.audioExtList_SelectedIndexChanged);
//
@@ -672,7 +745,7 @@
this.groupBox1.Controls.Add(this.videoArgument);
this.groupBox1.Location = new System.Drawing.Point(3, 6);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(394, 222);
+ this.groupBox1.Size = new System.Drawing.Size(394, 189);
this.groupBox1.TabIndex = 29;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Video";
@@ -682,13 +755,13 @@
this.videoExtList.FormattingEnabled = true;
this.videoExtList.Location = new System.Drawing.Point(6, 19);
this.videoExtList.Name = "videoExtList";
- this.videoExtList.Size = new System.Drawing.Size(78, 186);
+ this.videoExtList.Size = new System.Drawing.Size(78, 160);
this.videoExtList.TabIndex = 18;
this.videoExtList.SelectedIndexChanged += new System.EventHandler(this.videoExtList_SelectedIndexChanged);
//
// videoDelete
//
- this.videoDelete.Location = new System.Drawing.Point(174, 182);
+ this.videoDelete.Location = new System.Drawing.Point(174, 156);
this.videoDelete.Name = "videoDelete";
this.videoDelete.Size = new System.Drawing.Size(75, 23);
this.videoDelete.TabIndex = 20;
@@ -744,7 +817,7 @@
//
// videoAdd
//
- this.videoAdd.Location = new System.Drawing.Point(93, 182);
+ this.videoAdd.Location = new System.Drawing.Point(93, 156);
this.videoAdd.Name = "videoAdd";
this.videoAdd.Size = new System.Drawing.Size(75, 23);
this.videoAdd.TabIndex = 19;
@@ -788,14 +861,14 @@
this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.dvdArguments);
this.dvd_vcd_svcd_streams_Tab.Location = new System.Drawing.Point(4, 22);
this.dvd_vcd_svcd_streams_Tab.Name = "dvd_vcd_svcd_streams_Tab";
- this.dvd_vcd_svcd_streams_Tab.Size = new System.Drawing.Size(403, 467);
+ this.dvd_vcd_svcd_streams_Tab.Size = new System.Drawing.Size(403, 405);
this.dvd_vcd_svcd_streams_Tab.TabIndex = 3;
this.dvd_vcd_svcd_streams_Tab.Text = "DVD/VCD/SVCD/Streams";
this.dvd_vcd_svcd_streams_Tab.UseVisualStyleBackColor = true;
//
// label20
//
- this.label20.Location = new System.Drawing.Point(3, 300);
+ this.label20.Location = new System.Drawing.Point(3, 304);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(117, 23);
this.label20.TabIndex = 50;
@@ -803,14 +876,14 @@
//
// unsvArguments
//
- this.unsvArguments.Location = new System.Drawing.Point(122, 297);
+ this.unsvArguments.Location = new System.Drawing.Point(126, 301);
this.unsvArguments.Name = "unsvArguments";
this.unsvArguments.Size = new System.Drawing.Size(256, 20);
this.unsvArguments.TabIndex = 51;
//
// label19
//
- this.label19.Location = new System.Drawing.Point(3, 274);
+ this.label19.Location = new System.Drawing.Point(3, 278);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(117, 23);
this.label19.TabIndex = 48;
@@ -818,14 +891,14 @@
//
// udpArguments
//
- this.udpArguments.Location = new System.Drawing.Point(122, 271);
+ this.udpArguments.Location = new System.Drawing.Point(126, 275);
this.udpArguments.Name = "udpArguments";
this.udpArguments.Size = new System.Drawing.Size(256, 20);
this.udpArguments.TabIndex = 49;
//
// label18
//
- this.label18.Location = new System.Drawing.Point(3, 248);
+ this.label18.Location = new System.Drawing.Point(3, 252);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(117, 23);
this.label18.TabIndex = 46;
@@ -833,14 +906,14 @@
//
// sdpArguments
//
- this.sdpArguments.Location = new System.Drawing.Point(122, 245);
+ this.sdpArguments.Location = new System.Drawing.Point(126, 249);
this.sdpArguments.Name = "sdpArguments";
this.sdpArguments.Size = new System.Drawing.Size(256, 20);
this.sdpArguments.TabIndex = 47;
//
// label17
//
- this.label17.Location = new System.Drawing.Point(3, 222);
+ this.label17.Location = new System.Drawing.Point(3, 226);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(117, 23);
this.label17.TabIndex = 44;
@@ -848,14 +921,14 @@
//
// rtspArguments
//
- this.rtspArguments.Location = new System.Drawing.Point(122, 219);
+ this.rtspArguments.Location = new System.Drawing.Point(126, 223);
this.rtspArguments.Name = "rtspArguments";
this.rtspArguments.Size = new System.Drawing.Size(256, 20);
this.rtspArguments.TabIndex = 45;
//
// label16
//
- this.label16.Location = new System.Drawing.Point(3, 196);
+ this.label16.Location = new System.Drawing.Point(3, 200);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(117, 23);
this.label16.TabIndex = 42;
@@ -863,14 +936,14 @@
//
// mpstArguments
//
- this.mpstArguments.Location = new System.Drawing.Point(122, 193);
+ this.mpstArguments.Location = new System.Drawing.Point(125, 197);
this.mpstArguments.Name = "mpstArguments";
this.mpstArguments.Size = new System.Drawing.Size(256, 20);
this.mpstArguments.TabIndex = 43;
//
// label15
//
- this.label15.Location = new System.Drawing.Point(3, 170);
+ this.label15.Location = new System.Drawing.Point(3, 174);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(117, 23);
this.label15.TabIndex = 40;
@@ -878,14 +951,14 @@
//
// mmsArguments
//
- this.mmsArguments.Location = new System.Drawing.Point(122, 167);
+ this.mmsArguments.Location = new System.Drawing.Point(125, 171);
this.mmsArguments.Name = "mmsArguments";
this.mmsArguments.Size = new System.Drawing.Size(256, 20);
this.mmsArguments.TabIndex = 41;
//
// label14
//
- this.label14.Location = new System.Drawing.Point(3, 144);
+ this.label14.Location = new System.Drawing.Point(3, 148);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(117, 23);
this.label14.TabIndex = 38;
@@ -893,14 +966,14 @@
//
// httpArguments
//
- this.httpArguments.Location = new System.Drawing.Point(122, 141);
+ this.httpArguments.Location = new System.Drawing.Point(126, 145);
this.httpArguments.Name = "httpArguments";
this.httpArguments.Size = new System.Drawing.Size(256, 20);
this.httpArguments.TabIndex = 39;
//
// label13
//
- this.label13.Location = new System.Drawing.Point(3, 118);
+ this.label13.Location = new System.Drawing.Point(3, 122);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(117, 23);
this.label13.TabIndex = 36;
@@ -908,14 +981,14 @@
//
// ftpArguments
//
- this.ftpArguments.Location = new System.Drawing.Point(122, 115);
+ this.ftpArguments.Location = new System.Drawing.Point(126, 119);
this.ftpArguments.Name = "ftpArguments";
this.ftpArguments.Size = new System.Drawing.Size(256, 20);
this.ftpArguments.TabIndex = 37;
//
// label12
//
- this.label12.Location = new System.Drawing.Point(3, 92);
+ this.label12.Location = new System.Drawing.Point(3, 96);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(117, 23);
this.label12.TabIndex = 34;
@@ -923,14 +996,14 @@
//
// cueArguments
//
- this.cueArguments.Location = new System.Drawing.Point(122, 89);
+ this.cueArguments.Location = new System.Drawing.Point(126, 93);
this.cueArguments.Name = "cueArguments";
this.cueArguments.Size = new System.Drawing.Size(256, 20);
this.cueArguments.TabIndex = 35;
//
// label11
//
- this.label11.Location = new System.Drawing.Point(3, 66);
+ this.label11.Location = new System.Drawing.Point(3, 70);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(117, 23);
this.label11.TabIndex = 20;
@@ -938,14 +1011,14 @@
//
// svcdArguments
//
- this.svcdArguments.Location = new System.Drawing.Point(122, 63);
+ this.svcdArguments.Location = new System.Drawing.Point(126, 67);
this.svcdArguments.Name = "svcdArguments";
this.svcdArguments.Size = new System.Drawing.Size(256, 20);
this.svcdArguments.TabIndex = 21;
//
// label10
//
- this.label10.Location = new System.Drawing.Point(3, 40);
+ this.label10.Location = new System.Drawing.Point(3, 44);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(117, 23);
this.label10.TabIndex = 18;
@@ -953,14 +1026,14 @@
//
// vcdArguments
//
- this.vcdArguments.Location = new System.Drawing.Point(122, 37);
+ this.vcdArguments.Location = new System.Drawing.Point(126, 41);
this.vcdArguments.Name = "vcdArguments";
this.vcdArguments.Size = new System.Drawing.Size(256, 20);
this.vcdArguments.TabIndex = 19;
//
// label9
//
- this.label9.Location = new System.Drawing.Point(3, 14);
+ this.label9.Location = new System.Drawing.Point(3, 18);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(117, 23);
this.label9.TabIndex = 16;
@@ -968,7 +1041,7 @@
//
// dvdArguments
//
- this.dvdArguments.Location = new System.Drawing.Point(122, 11);
+ this.dvdArguments.Location = new System.Drawing.Point(125, 15);
this.dvdArguments.Name = "dvdArguments";
this.dvdArguments.Size = new System.Drawing.Size(256, 20);
this.dvdArguments.TabIndex = 17;
@@ -981,7 +1054,7 @@
// ConfigurationForm
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.ClientSize = new System.Drawing.Size(435, 545);
+ this.ClientSize = new System.Drawing.Size(435, 492);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.okButton);
@@ -994,7 +1067,11 @@
this.tabControl1.ResumeLayout(false);
this.general_Tab.ResumeLayout(false);
this.general_Tab.PerformLayout();
- this.video_audio_Tab.ResumeLayout(false);
+ this.video_Tab.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.subtitleDelayStep)).EndInit();
+ this.audio_Tab.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.audioDelayStep)).EndInit();
+ this.extension_Tab.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox1.ResumeLayout(false);
@@ -1013,18 +1090,10 @@
/// </summary>
private System.ComponentModel.IContainer components = null;
private System.Windows.Forms.Button okButton;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.Label label4;
private System.Windows.Forms.CheckBox rebuildIndex;
private System.Windows.Forms.CheckBox priorityBoost;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox optionalArguments;
- private System.Windows.Forms.ComboBox soundOutputDriver;
- private System.Windows.Forms.ComboBox postProcessing;
- private System.Windows.Forms.ComboBox aspectRatio;
- private System.Windows.Forms.ComboBox deinterlace;
private System.Windows.Forms.Button cancelButton;
#endregion
private System.Windows.Forms.TextBox mplayerPath;
@@ -1033,7 +1102,7 @@
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage general_Tab;
- private System.Windows.Forms.TabPage video_audio_Tab;
+ private System.Windows.Forms.TabPage extension_Tab;
private System.Windows.Forms.TabPage dvd_vcd_svcd_streams_Tab;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.TextBox svcdArguments;
@@ -1051,22 +1120,11 @@
private System.Windows.Forms.Button videoAdd;
private System.Windows.Forms.ListBox videoExtList;
private System.Windows.Forms.OpenFileDialog openFileDialog1;
- private System.Windows.Forms.Label label7;
- private System.Windows.Forms.ComboBox noiseDenoise;
- private System.Windows.Forms.ComboBox audioChannels;
- private System.Windows.Forms.CheckBox audioNormalize;
- private System.Windows.Forms.CheckBox framedrop;
- private System.Windows.Forms.CheckBox directRendering;
- private System.Windows.Forms.CheckBox doubleBuffering;
- private System.Windows.Forms.Label label21;
private System.Windows.Forms.FontDialog fontDialog1;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.ComboBox osdFont;
- private System.Windows.Forms.CheckBox passthroughAC3_DTS;
private System.Windows.Forms.Label label30;
private System.Windows.Forms.ComboBox cacheSize;
- private System.Windows.Forms.Label label29;
- private System.Windows.Forms.ComboBox soundOutputDevice;
private System.Windows.Forms.Label label20;
private System.Windows.Forms.TextBox unsvArguments;
private System.Windows.Forms.Label label19;
@@ -1096,9 +1154,34 @@
private System.Windows.Forms.Button audioDelete;
private System.Windows.Forms.Button audioAdd;
private System.Windows.Forms.ListBox audioExtList;
- private System.Windows.Forms.CheckBox subtitles;
+ private System.Windows.Forms.TabPage video_Tab;
+ private System.Windows.Forms.NumericUpDown subtitleDelayStep;
+ private System.Windows.Forms.Label label31;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.ComboBox videoOutputDriver;
+ private System.Windows.Forms.CheckBox subtitles;
+ private System.Windows.Forms.CheckBox framedrop;
+ private System.Windows.Forms.CheckBox directRendering;
+ private System.Windows.Forms.CheckBox doubleBuffering;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.ComboBox noiseDenoise;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.ComboBox deinterlace;
+ private System.Windows.Forms.ComboBox aspectRatio;
+ private System.Windows.Forms.ComboBox postProcessing;
+ private System.Windows.Forms.TabPage audio_Tab;
+ private System.Windows.Forms.NumericUpDown audioDelayStep;
+ private System.Windows.Forms.Label label32;
+ private System.Windows.Forms.Label label29;
+ private System.Windows.Forms.ComboBox soundOutputDevice;
+ private System.Windows.Forms.CheckBox passthroughAC3_DTS;
+ private System.Windows.Forms.CheckBox audioNormalize;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.ComboBox audioChannels;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.ComboBox soundOutputDriver;
}
}
\ No newline at end of file
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2007-08-13 08:55:30 UTC (rev 828)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2007-08-13 11:14:54 UTC (rev 829)
@@ -339,6 +339,8 @@
noiseDenoise.SelectedIndex = xmlreader.GetValueAsInt("mplayer", "noise", (int)NoiseDenoise.Nothing);
subtitles.Checked = xmlreader.GetValueAsBool("mplayer", "enableSubtitles", false);
videoOutputDriver.SelectedIndex = xmlreader.GetValueAsInt("mplayer", "videoOutputDriver", (int)VideoOutputDriver.DirectX);
+ audioDelayStep.Value = xmlreader.GetValueAsInt("mplayer", "audioDelayStep", 100);
+ subtitleDelayStep.Value = xmlreader.GetValueAsInt("mplayer", "subtitleDelayStep", 100);
int tempCacheSize = xmlreader.GetValueAsInt("mplayer", "cacheSize", 0);
if (tempCacheSize > 0) {
cacheSize.Text = tempCacheSize.ToString();
@@ -424,6 +426,8 @@
xmlWriter.SetValue("mplayer", "audioChannels", audioChannels.SelectedIndex);
xmlWriter.SetValueAsBool("mplayer", "enableSubtitles", subtitles.Checked);
xmlWriter.SetValue("mplayer", "videoOutputDriver", videoOutputDriver.SelectedIndex);
+ xmlWriter.SetValue("mplayer", "audioDelayStep", audioDelayStep.Value);
+ xmlWriter.SetValue("mplayer", "subtitleDelayStep", subtitleDelayStep.Value);
if (cacheSize.Text.Equals(String.Empty)) {
xmlWriter.SetValue("mplayer", "cacheSize", 0);
} else {
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-08-13 08:55:30 UTC (rev 828)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-08-13 11:14:54 UTC (rev 829)
@@ -29,6 +29,7 @@
using System.Drawing.Text;
using System.Globalization;
using System.Text;
+using System.Windows.Forms;
using System.Xml;
using MediaPortal.GUI.Library;
using MediaPortal.Util;
@@ -171,7 +172,7 @@
/// </summary>
public enum NoiseDenoise {
/// <summary>
- /// No noiseDenoise
+ /// No _noiseDenoise
/// </summary>
Nothing,
/// <summary>
@@ -220,107 +221,107 @@
/// <summary>
/// Singleton instance
/// </summary>
- private static ConfigurationManager singletonInstance;
+ private static ConfigurationManager _singletonInstance;
/// <summary>
/// List of installed fonts
/// </summary>
- private List<String> fontsCollection;
+ private List<String> _fontsCollection;
/// <summary>
/// Supported Extension of the external Player
/// </summary>
- private static string[] m_supportedExtensions = new string[0];
+ private static string[] _supportedExtensions = new string[0];
/// <summary>
/// Dicitionary with all extension Settings
/// </summary>
- private static Dictionary<String, ExtensionSettings> extensionSettings = new Dictionary<String, ExtensionSettings>();
+ private static Dictionary<String, ExtensionSettings> _extensionSettings = new Dictionary<String, ExtensionSettings>();
/// <summary>
/// Dictionary with all extension Setting for external Player
/// </summary>
- private static Dictionary<String, ExtensionSettings> extensionSettingsExtPlayer = new Dictionary<String, ExtensionSettings>();
+ private static Dictionary<String, ExtensionSettings> _extensionSettingsExtPlayer = new Dictionary<String, ExtensionSettings>();
/// <summary>
/// Rebuild Index of the file
/// </summary>
- private bool rebuildIndex;
+ private bool _rebuildIndex;
/// <summary>
/// Prioritey Boost of the process
/// </summary>
- private bool priorityBoost;
+ private bool _priorityBoost;
/// <summary>
/// Framedrop
/// </summary>
- private bool framedrop;
+ private bool _framedrop;
/// <summary>
/// Double buffering
/// </summary>
- private bool doubleBuffering;
+ private bool _doubleBuffering;
/// <summary>
/// Direct rendering
/// </summary>
- private bool directRendering;
+ private bool _directRendering;
/// <summary>
/// Normalize audio
/// </summary>
- private bool audioNormalize;
+ private bool _audioNormalize;
/// <summary>
/// Passthrough AC3 and DTS
/// </summary>
- private bool passthroughAC3_DTS;
+ private bool _passthroughAC3_DTS;
/// <summary>
/// Deinterlace mode
/// </summary>
- private Deinterlace deinterlace;
+ private Deinterlace _deinterlace;
/// <summary>
/// Selected SoundOutput Driver
/// </summary>
- private SoundOutputDriver soundOutputDriver;
+ private SoundOutputDriver _soundOutputDriver;
/// <summary>
/// Sound output device
/// </summary>
- private int soundOutputDevice;
+ private int _soundOutputDevice;
/// <summary>
/// Selected AsprectRatio
/// </summary>
- private AspectRatio aspectRatio;
+ private AspectRatio _aspectRatio;
/// <summary>
/// Selected Postprocessing mode
/// </summary>
- private PostProcessing postProcessing;
+ private PostProcessing _postProcessing;
/// <summary>
/// Audio channel mode
/// </summary>
- private AudioChannels audioChannels;
+ private AudioChannels _audioChannels;
/// <summary>
/// NoiseDenoise mode
/// </summary>
- private NoiseDenoise noiseDenoise;
+ private NoiseDenoise _noiseDenoise;
/// <summary>
/// Cache size
/// </summary>
- private int cacheSize;
+ private int _cacheSize;
/// <summary>
/// Indicate if the font of the osd is set
/// </summary>
- private bool osdFontSet;
+ private bool _osdFontSet;
/// <summary>
/// Filename of the osd font
@@ -330,22 +331,32 @@
/// <summary>
/// Path to mplayer.exe
/// </summary>
- private String mplayerPath;
+ private String _mplayerPath;
/// <summary>
/// Timeout before a seek step is performed
/// </summary>
- private int seekStepTimeout;
+ private int _seekStepTimeout;
/// <summary>
/// Enable subtitles by default
/// </summary>
- private bool enableSubtitles;
+ private bool _enableSubtitles;
/// <summary>
/// Video output driver
/// </summary>
- private VideoOutputDriver videoOutputDriver;
+ private VideoOutputDriver _videoOutputDriver;
+
+ /// <summary>
+ /// Step to change the audio delay in milliseconds
+ /// </summary>
+ private int _audioDelayStep;
+
+ /// <summary>
+ /// Step to change the subtitle delay in millisceonds
+ /// </summary>
+ private int _subtitleDelayStep;
#endregion
#region ctor
@@ -362,24 +373,47 @@
/// </summary>
/// <returns>Singleton instance</returns>
public static ConfigurationManager getInstance() {
- if (singletonInstance == null) {
- singletonInstance = new ConfigurationManager();
+ if (_singletonInstance == null) {
+ _singletonInstance = new ConfigurationManager();
}
- return si...
[truncated message content] |
|
From: <nor...@us...> - 2007-08-13 08:55:33
|
Revision: 828
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=828&view=rev
Author: northern_sky
Date: 2007-08-13 01:55:30 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
some minor designstuff, dynamic checkboxes in fileview, removed prepostbutton/form and inc it in regular appitemsettings
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.resx
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.resx
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
trunk/plugins/myGUIProgramsAlt/README.txt
Removed Paths:
-------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsPrePost.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsPrePost.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsPrePost.resx
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -106,7 +106,7 @@
this.Controls.Add(this.progressBar);
this.Name = "AppSettingsFilesImportProgress";
this.Load += new System.EventHandler(this.AppFilesImportProgress_Load);
- this.Controls.SetChildIndex(this.prePostButton, 0);
+
this.Controls.SetChildIndex(this.enabledCheckbox, 0);
this.Controls.SetChildIndex(this.titleLabel, 0);
this.Controls.SetChildIndex(this.applicationExeLabel, 0);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -75,7 +75,10 @@
waitExitCheckBox.Visible = false;
shellexecuteCheckBox.Visible = false;
informationLabel.Visible = false;
- prePostButton.Visible = false;
+ preCommandsLabel.Visible = false;
+ preCommandTextBox.Visible = false;
+ postCommandsLabel.Visible = false;
+ postCommandTextBox.Visible = false;
}
public void RunImport()
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.Designer.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.Designer.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -53,10 +53,7 @@
this.imageDirsLabel = new System.Windows.Forms.Label();
this.fileDirLabel = new System.Windows.Forms.Label();
this.filesGroupBox = new System.Windows.Forms.GroupBox();
- this.importPlaychoiceCheckBox = new System.Windows.Forms.CheckBox();
- this.importMahjongCheckBox = new System.Windows.Forms.CheckBox();
- this.validImagesCheckBox = new System.Windows.Forms.CheckBox();
- this.importOriginalsCheckBox = new System.Windows.Forms.CheckBox();
+ this.importOptionsCheckedListBox = new System.Windows.Forms.CheckedListBox();
this.FileSettingsGroupBox = new System.Windows.Forms.GroupBox();
this.gamebaseDBTextBox = new System.Windows.Forms.TextBox();
this.gamebaseLabel = new System.Windows.Forms.Label();
@@ -77,13 +74,13 @@
this.fileListView.HideSelection = false;
this.fileListView.Location = new System.Drawing.Point(8, 19);
this.fileListView.Name = "fileListView";
- this.fileListView.Size = new System.Drawing.Size(276, 343);
+ this.fileListView.Size = new System.Drawing.Size(276, 352);
this.fileListView.SmallImageList = this.smallImageList;
this.fileListView.TabIndex = 1;
this.fileListView.UseCompatibleStateImageBehavior = false;
this.fileListView.View = System.Windows.Forms.View.Details;
- this.fileListView.SelectedIndexChanged += new System.EventHandler(this.fileListView_SelectedIndexChanged);
this.fileListView.DoubleClick += new System.EventHandler(this.fileListView_DoubleClick);
+ this.fileListView.SelectedIndexChanged += new System.EventHandler(this.fileListView_SelectedIndexChanged);
//
// fileTitle
//
@@ -183,13 +180,13 @@
this.contextFavouritesMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.grouperToolStripMenuItem});
this.contextFavouritesMenuStrip.Name = "contextFavouritesMenuStrip";
- this.contextFavouritesMenuStrip.Size = new System.Drawing.Size(125, 26);
+ this.contextFavouritesMenuStrip.Size = new System.Drawing.Size(118, 26);
this.contextFavouritesMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextFavouritesMenuStrip_Opening);
//
// grouperToolStripMenuItem
//
this.grouperToolStripMenuItem.Name = "grouperToolStripMenuItem";
- this.grouperToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
+ this.grouperToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
this.grouperToolStripMenuItem.Text = "Grouper";
//
// fileExtensionsTextBox
@@ -197,7 +194,7 @@
this.fileExtensionsTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.fileExtensionsTextBox.Location = new System.Drawing.Point(85, 71);
this.fileExtensionsTextBox.Name = "fileExtensionsTextBox";
- this.fileExtensionsTextBox.Size = new System.Drawing.Size(330, 21);
+ this.fileExtensionsTextBox.Size = new System.Drawing.Size(330, 20);
this.fileExtensionsTextBox.TabIndex = 28;
//
// imageDirsTextBox
@@ -205,7 +202,7 @@
this.imageDirsTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.imageDirsTextBox.Location = new System.Drawing.Point(85, 45);
this.imageDirsTextBox.Name = "imageDirsTextBox";
- this.imageDirsTextBox.Size = new System.Drawing.Size(330, 21);
+ this.imageDirsTextBox.Size = new System.Drawing.Size(330, 20);
this.imageDirsTextBox.TabIndex = 27;
//
// fileDirTextBox
@@ -213,7 +210,7 @@
this.fileDirTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.fileDirTextBox.Location = new System.Drawing.Point(85, 19);
this.fileDirTextBox.Name = "fileDirTextBox";
- this.fileDirTextBox.Size = new System.Drawing.Size(330, 21);
+ this.fileDirTextBox.Size = new System.Drawing.Size(330, 20);
this.fileDirTextBox.TabIndex = 26;
//
// fileDirButton
@@ -276,10 +273,7 @@
// filesGroupBox
//
this.filesGroupBox.BackColor = System.Drawing.SystemColors.Control;
- this.filesGroupBox.Controls.Add(this.importPlaychoiceCheckBox);
- this.filesGroupBox.Controls.Add(this.importMahjongCheckBox);
- this.filesGroupBox.Controls.Add(this.validImagesCheckBox);
- this.filesGroupBox.Controls.Add(this.importOriginalsCheckBox);
+ this.filesGroupBox.Controls.Add(this.importOptionsCheckedListBox);
this.filesGroupBox.Controls.Add(this.fileListView);
this.filesGroupBox.Controls.Add(this.newButton);
this.filesGroupBox.Controls.Add(this.editButton);
@@ -297,46 +291,20 @@
this.filesGroupBox.TabStop = false;
this.filesGroupBox.Text = "Files";
//
- // importPlaychoiceCheckBox
+ // importOptionsCheckedListBox
//
- this.importPlaychoiceCheckBox.AutoSize = true;
- this.importPlaychoiceCheckBox.Location = new System.Drawing.Point(299, 345);
- this.importPlaychoiceCheckBox.Name = "importPlaychoiceCheckBox";
- this.importPlaychoiceCheckBox.Size = new System.Drawing.Size(160, 17);
- this.importPlaychoiceCheckBox.TabIndex = 87;
- this.importPlaychoiceCheckBox.Text = "Import Playchoice/Vs games";
- this.importPlaychoiceCheckBox.UseVisualStyleBackColor = true;
+ this.importOptionsCheckedListBox.BackColor = System.Drawing.SystemColors.Control;
+ this.importOptionsCheckedListBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.importOptionsCheckedListBox.CheckOnClick = true;
+ this.importOptionsCheckedListBox.FormattingEnabled = true;
+ this.importOptionsCheckedListBox.HorizontalScrollbar = true;
+ this.importOptionsCheckedListBox.Location = new System.Drawing.Point(290, 234);
+ this.importOptionsCheckedListBox.Name = "importOptionsCheckedListBox";
+ this.importOptionsCheckedListBox.ScrollAlwaysVisible = true;
+ this.importOptionsCheckedListBox.Size = new System.Drawing.Size(176, 137);
+ this.importOptionsCheckedListBox.Sorted = true;
+ this.importOptionsCheckedListBox.TabIndex = 88;
//
- // importMahjongCheckBox
- //
- this.importMahjongCheckBox.AutoSize = true;
- this.importMahjongCheckBox.Location = new System.Drawing.Point(299, 321);
- this.importMahjongCheckBox.Name = "importMahjongCheckBox";
- this.importMahjongCheckBox.Size = new System.Drawing.Size(136, 17);
- this.importMahjongCheckBox.TabIndex = 86;
- this.importMahjongCheckBox.Text = "Import Mahjong games";
- this.importMahjongCheckBox.UseVisualStyleBackColor = true;
- //
- // validImagesCheckBox
- //
- this.validImagesCheckBox.AutoSize = true;
- this.validImagesCheckBox.Location = new System.Drawing.Point(299, 275);
- this.validImagesCheckBox.Name = "validImagesCheckBox";
- this.validImagesCheckBox.Size = new System.Drawing.Size(154, 17);
- this.validImagesCheckBox.TabIndex = 84;
- this.validImagesCheckBox.Text = "Only files with valid images";
- this.validImagesCheckBox.UseVisualStyleBackColor = true;
- //
- // importOriginalsCheckBox
- //
- this.importOriginalsCheckBox.AutoSize = true;
- this.importOriginalsCheckBox.Location = new System.Drawing.Point(299, 298);
- this.importOriginalsCheckBox.Name = "importOriginalsCheckBox";
- this.importOriginalsCheckBox.Size = new System.Drawing.Size(123, 17);
- this.importOriginalsCheckBox.TabIndex = 85;
- this.importOriginalsCheckBox.Text = "Only import originals";
- this.importOriginalsCheckBox.UseVisualStyleBackColor = true;
- //
// FileSettingsGroupBox
//
this.FileSettingsGroupBox.BackColor = System.Drawing.SystemColors.Control;
@@ -365,7 +333,7 @@
this.gamebaseDBTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.gamebaseDBTextBox.Location = new System.Drawing.Point(85, 96);
this.gamebaseDBTextBox.Name = "gamebaseDBTextBox";
- this.gamebaseDBTextBox.Size = new System.Drawing.Size(330, 21);
+ this.gamebaseDBTextBox.Size = new System.Drawing.Size(330, 20);
this.gamebaseDBTextBox.TabIndex = 89;
this.toolTip.SetToolTip(this.gamebaseDBTextBox, "Select a gamebase (*.mdb) file to import\r\n");
//
@@ -402,7 +370,6 @@
this.Load += new System.EventHandler(this.AppFilesView_Load);
this.contextFavouritesMenuStrip.ResumeLayout(false);
this.filesGroupBox.ResumeLayout(false);
- this.filesGroupBox.PerformLayout();
this.FileSettingsGroupBox.ResumeLayout(false);
this.FileSettingsGroupBox.PerformLayout();
this.ResumeLayout(false);
@@ -437,13 +404,10 @@
private System.Windows.Forms.GroupBox FileSettingsGroupBox;
private System.Windows.Forms.ToolTip toolTip;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog;
- private System.Windows.Forms.CheckBox importPlaychoiceCheckBox;
- private System.Windows.Forms.CheckBox importMahjongCheckBox;
- private System.Windows.Forms.CheckBox validImagesCheckBox;
- private System.Windows.Forms.CheckBox importOriginalsCheckBox;
private System.Windows.Forms.TextBox gamebaseDBTextBox;
private System.Windows.Forms.Label gamebaseLabel;
private System.Windows.Forms.Button gamebaseDBButton;
private System.Windows.Forms.OpenFileDialog openFileDialog;
+ private System.Windows.Forms.CheckedListBox importOptionsCheckedListBox;
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -45,6 +45,25 @@
private ApplicationItem currentApplication = null;
public event EventHandler OnImageFolderSearch;
+
+
+ public string ImportOptionToString(ImportOption importOption)
+ {
+ switch (importOption)
+ {
+ case ImportOption.OnlyImportValidImages:
+ return "Only import files with valid images";
+ case ImportOption.OnlyImportOriginals:
+ return "Only import originals";
+ case ImportOption.ImportMahjongGames:
+ return "Import Mahjong games";
+ case ImportOption.ImportPlaychoiceGames:
+ return "Import Playchoice/Vs games";
+ default:
+ return "";
+ }
+ }
+
public AppSettingsFilesView()
{
InitializeComponent();
@@ -574,6 +593,45 @@
}
}
+ private bool IsItemChecked(string itemString)
+ {
+ foreach (object item in importOptionsCheckedListBox.CheckedItems)
+ {
+ if (itemString == item.ToString())
+ {
+
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void CheckImportOption(ApplicationItem applicationItem)
+ {
+ if (applicationItem.ImportValidImagesOnly)
+ {
+ importOptionsCheckedListBox.SetItemChecked(importOptionsCheckedListBox.Items.IndexOf(ImportOptionToString(ImportOption.OnlyImportValidImages)),true);
+ }
+ if (applicationItem.ImportMameMahjong)
+ {
+ importOptionsCheckedListBox.SetItemChecked(importOptionsCheckedListBox.Items.IndexOf(ImportOptionToString(ImportOption.ImportMahjongGames)), true);
+
+ }
+ if (applicationItem.ImportMamePlaychoice10)
+ {
+ importOptionsCheckedListBox.SetItemChecked(importOptionsCheckedListBox.Items.IndexOf(ImportOptionToString(ImportOption.ImportPlaychoiceGames)), true);
+ }
+ if (applicationItem is ApplicationItemMame)
+ {
+ if (((ApplicationItemMame)applicationItem).ImportOriginalsOnly)
+ {
+ importOptionsCheckedListBox.SetItemChecked(importOptionsCheckedListBox.Items.IndexOf(ImportOptionToString(ImportOption.OnlyImportOriginals)), true);
+
+ }
+ }
+
+ }
+
public void FillApplicationItem(ApplicationItem applicationItem)
{
if (applicationItem == null) return;
@@ -585,36 +643,34 @@
applicationItem.FileDirectory = fileDirTextBox.Text;
applicationItem.ValidExtensions = fileExtensionsTextBox.Text;
+
if ((currentApplication is ApplicationItemMame) || ((currentApplication is ApplicationItemGameBase)))
{
- applicationItem.ImportValidImagesOnly = this.validImagesCheckBox.Checked;
+ applicationItem.ImportValidImagesOnly = IsItemChecked(ImportOptionToString(ImportOption.OnlyImportValidImages));
}
if ((currentApplication is ApplicationItemMame))
{
- ((ApplicationItemMame)applicationItem).ImportOriginalsOnly = this.importOriginalsCheckBox.Checked;
- applicationItem.ImportMameMahjong = this.importMahjongCheckBox.Checked;
- applicationItem.ImportMamePlaychoice10 = this.importPlaychoiceCheckBox.Checked;
+ ((ApplicationItemMame)applicationItem).ImportOriginalsOnly = IsItemChecked(ImportOptionToString(ImportOption.OnlyImportOriginals));
+ applicationItem.ImportMameMahjong = IsItemChecked(ImportOptionToString(ImportOption.ImportMahjongGames));
+ applicationItem.ImportMamePlaychoice10 = IsItemChecked(ImportOptionToString(ImportOption.ImportPlaychoiceGames));
}
if ((currentApplication is ApplicationItemGameBase))
{
applicationItem.Source = this.gamebaseDBTextBox.Text;
}
+
}
private void AppFilesView_Load(object sender, EventArgs e)
{
-
-
toolTip.SetToolTip(fileDirTextBox, "Directorys to display in MediaPortal,seperate with ; \r\n(mandatory)");
toolTip.SetToolTip(fileExtensionsTextBox, "Only files with matching extensions will be displayed. \r\nSeparate several extension" +
"s by a ; (.zip;.txt)\r\n(mandatory)");
toolTip.SetToolTip(imageDirsTextBox, "Optional directory where MediaPortal searches for matching images. \r\n MediaPort" +
"al will cycle through all the directories and display a mini-slideshow of all matching images.Separate with a ;");
-
-
}
protected void imageDirButton_Click(object sender, EventArgs e)
@@ -645,10 +701,7 @@
{
//by default "dont show these...
- this.validImagesCheckBox.Visible = false;
- this.importOriginalsCheckBox.Visible = false;
- this.importMahjongCheckBox.Visible = false;
- this.importPlaychoiceCheckBox.Visible = false;
+
this.gamebaseDBTextBox.Visible = false;
this.gamebaseDBButton.Visible = false;
this.gamebaseLabel.Visible = false;
@@ -671,21 +724,19 @@
fileExtensionsTextBox.Text = currentApplication.ValidExtensions;
- if ((currentApplication is ApplicationItemMame) || ((currentApplication is ApplicationItemGameBase)))
+ if ((currentApplication.ImportOptionList != null) && (currentApplication.ImportOptionList.Count > 0))
{
- this.validImagesCheckBox.Visible = true;
- this.validImagesCheckBox.Checked = currentApplication.ImportValidImagesOnly;
+ importOptionsCheckedListBox.Items.Clear();
+ importOptionsCheckedListBox.Visible = true;
+ foreach (ImportOption importOption in currentApplication.ImportOptionList)
+ {
+ importOptionsCheckedListBox.Items.Add(ImportOptionToString(importOption));
+ }
+ CheckImportOption(currentApplication);
}
-
- if ((currentApplication is ApplicationItemMame))
+ else
{
- this.importOriginalsCheckBox.Visible = true;
- this.importMahjongCheckBox.Visible = true;
- this.importPlaychoiceCheckBox.Visible = true;
-
- this.importOriginalsCheckBox.Checked = ((ApplicationItemMame)currentApplication).ImportOriginalsOnly;
- this.importMahjongCheckBox.Checked = currentApplication.ImportMameMahjong;
- this.importPlaychoiceCheckBox.Checked = currentApplication.ImportMamePlaychoice10;
+ importOptionsCheckedListBox.Visible = false;
}
if ((currentApplication is ApplicationItemGameBase))
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.resx
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.resx 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.resx 2007-08-13 08:55:30 UTC (rev 828)
@@ -175,6 +175,9 @@
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>353, 17</value>
</metadata>
+ <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>353, 17</value>
+ </metadata>
<metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>443, 17</value>
</metadata>
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -52,9 +52,12 @@
this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
this.applicationExeTextBox = new System.Windows.Forms.TextBox();
- this.prePostButton = new System.Windows.Forms.Button();
this.startupDirComboBox = new System.Windows.Forms.ComboBox();
this.pictureBox = new System.Windows.Forms.PictureBox();
+ this.postCommandsLabel = new System.Windows.Forms.Label();
+ this.preCommandTextBox = new System.Windows.Forms.TextBox();
+ this.preCommandsLabel = new System.Windows.Forms.Label();
+ this.postCommandTextBox = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
this.SuspendLayout();
//
@@ -108,7 +111,7 @@
// shellexecuteCheckBox
//
this.shellexecuteCheckBox.AutoSize = true;
- this.shellexecuteCheckBox.Location = new System.Drawing.Point(7, 322);
+ this.shellexecuteCheckBox.Location = new System.Drawing.Point(5, 345);
this.shellexecuteCheckBox.Name = "shellexecuteCheckBox";
this.shellexecuteCheckBox.Size = new System.Drawing.Size(88, 17);
this.shellexecuteCheckBox.TabIndex = 7;
@@ -119,7 +122,7 @@
// waitExitCheckBox
//
this.waitExitCheckBox.AutoSize = true;
- this.waitExitCheckBox.Location = new System.Drawing.Point(7, 368);
+ this.waitExitCheckBox.Location = new System.Drawing.Point(5, 391);
this.waitExitCheckBox.Name = "waitExitCheckBox";
this.waitExitCheckBox.Size = new System.Drawing.Size(82, 17);
this.waitExitCheckBox.TabIndex = 8;
@@ -197,7 +200,7 @@
// quoteCheckBox
//
this.quoteCheckBox.AutoSize = true;
- this.quoteCheckBox.Location = new System.Drawing.Point(7, 299);
+ this.quoteCheckBox.Location = new System.Drawing.Point(5, 322);
this.quoteCheckBox.Name = "quoteCheckBox";
this.quoteCheckBox.Size = new System.Drawing.Size(102, 17);
this.quoteCheckBox.TabIndex = 19;
@@ -227,7 +230,7 @@
// allowRefreshCheckBox
//
this.allowRefreshCheckBox.AutoSize = true;
- this.allowRefreshCheckBox.Location = new System.Drawing.Point(7, 345);
+ this.allowRefreshCheckBox.Location = new System.Drawing.Point(5, 368);
this.allowRefreshCheckBox.Name = "allowRefreshCheckBox";
this.allowRefreshCheckBox.Size = new System.Drawing.Size(154, 17);
this.allowRefreshCheckBox.TabIndex = 30;
@@ -255,16 +258,6 @@
this.applicationExeTextBox.TabIndex = 32;
this.applicationExeTextBox.TextChanged += new System.EventHandler(this.applicationExeTextBox_TextChanged);
//
- // prePostButton
- //
- this.prePostButton.Location = new System.Drawing.Point(7, 448);
- this.prePostButton.Name = "prePostButton";
- this.prePostButton.Size = new System.Drawing.Size(85, 56);
- this.prePostButton.TabIndex = 34;
- this.prePostButton.Text = "Configure pre/post commands";
- this.prePostButton.UseVisualStyleBackColor = true;
- this.prePostButton.Click += new System.EventHandler(this.prePostButton_Click);
- //
// startupDirComboBox
//
this.startupDirComboBox.FormattingEnabled = true;
@@ -277,20 +270,57 @@
//
this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.pictureBox.InitialImage = null;
- this.pictureBox.Location = new System.Drawing.Point(248, 299);
+ this.pictureBox.Location = new System.Drawing.Point(248, 322);
this.pictureBox.Name = "pictureBox";
this.pictureBox.Size = new System.Drawing.Size(170, 170);
this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox.TabIndex = 37;
this.pictureBox.TabStop = false;
//
+ // postCommandsLabel
+ //
+ this.postCommandsLabel.Location = new System.Drawing.Point(2, 257);
+ this.postCommandsLabel.Name = "postCommandsLabel";
+ this.postCommandsLabel.Size = new System.Drawing.Size(85, 20);
+ this.postCommandsLabel.TabIndex = 40;
+ this.postCommandsLabel.Text = "PostCommands";
+ this.postCommandsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // preCommandTextBox
+ //
+ this.preCommandTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.preCommandTextBox.Location = new System.Drawing.Point(93, 231);
+ this.preCommandTextBox.Name = "preCommandTextBox";
+ this.preCommandTextBox.Size = new System.Drawing.Size(325, 20);
+ this.preCommandTextBox.TabIndex = 39;
+ //
+ // preCommandsLabel
+ //
+ this.preCommandsLabel.Location = new System.Drawing.Point(2, 231);
+ this.preCommandsLabel.Name = "preCommandsLabel";
+ this.preCommandsLabel.Size = new System.Drawing.Size(93, 20);
+ this.preCommandsLabel.TabIndex = 38;
+ this.preCommandsLabel.Text = "PreCommands:";
+ this.preCommandsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // postCommandTextBox
+ //
+ this.postCommandTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.postCommandTextBox.Location = new System.Drawing.Point(93, 257);
+ this.postCommandTextBox.Name = "postCommandTextBox";
+ this.postCommandTextBox.Size = new System.Drawing.Size(325, 20);
+ this.postCommandTextBox.TabIndex = 41;
+ //
// AppSettingsBase
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.postCommandTextBox);
+ this.Controls.Add(this.postCommandsLabel);
+ this.Controls.Add(this.preCommandTextBox);
+ this.Controls.Add(this.preCommandsLabel);
this.Controls.Add(this.pictureBox);
this.Controls.Add(this.startupDirComboBox);
- this.Controls.Add(this.prePostButton);
this.Controls.Add(this.applicationExeTextBox);
this.Controls.Add(this.informationLabel);
this.Controls.Add(this.allowRefreshCheckBox);
@@ -343,8 +373,11 @@
protected System.Windows.Forms.FolderBrowserDialog folderBrowserDialog;
protected System.Windows.Forms.OpenFileDialog openFileDialog;
protected System.Windows.Forms.TextBox applicationExeTextBox;
- protected System.Windows.Forms.Button prePostButton;
protected System.Windows.Forms.ComboBox startupDirComboBox;
private System.Windows.Forms.PictureBox pictureBox;
+ protected System.Windows.Forms.Label postCommandsLabel;
+ protected System.Windows.Forms.TextBox preCommandTextBox;
+ protected System.Windows.Forms.Label preCommandsLabel;
+ protected System.Windows.Forms.TextBox postCommandTextBox;
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -43,9 +43,6 @@
{
public partial class AppSettingsBase : SettingsBase
{
- string preLaunch = string.Empty;
- string postLaunch = string.Empty;
-
public AppSettingsBase()
{
InitializeComponent();
@@ -62,8 +59,8 @@
applicationExeTextBox.Text = curApp.Filename;
applicationArgumentsTextBox.Text = curApp.Arguments;
// Pre-Post-Launch
- preLaunch = curApp.PreLaunch;
- postLaunch = curApp.PostLaunch;
+ preCommandTextBox.Text = curApp.PreLaunch;
+ postCommandTextBox.Text = curApp.PostLaunch;
// ProcessWindowStyle
// The enumerator ProcessWindowStyle has these items:
//Normal = 0,
@@ -92,8 +89,8 @@
curApp.Filename = applicationExeTextBox.Text;
curApp.Arguments = applicationArgumentsTextBox.Text;
// Pre-Post-Launch
- curApp.PreLaunch = preLaunch;
- curApp.PostLaunch = postLaunch;
+ curApp.PreLaunch = preCommandTextBox.Text;
+ curApp.PostLaunch = postCommandTextBox.Text;
// ProcessWindowStyle
curApp.WindowStyle = (ProcessWindowStyle)winStyleComboBox.SelectedIndex;
@@ -127,7 +124,9 @@
toolTip.SetToolTip(enabledCheckbox, "Only enabled items will appear in MediaPortal");
toolTip.SetToolTip(applicationExeTextBox, "Program you wish to execute, include the full path (mandatory if ShellExecute is " + "OFF)");
toolTip.SetToolTip(allowRefreshCheckBox, "Check this if users can run the import through the REFRESH button in MediaPortal.");
- toolTip.SetToolTip(prePostButton, "Configure an command to run as pre or post of the main filelaunching ie explorer; joy2key; etc .Separate with ;.");
+ toolTip.SetToolTip(this.preCommandTextBox, "Configure an command to run as pre of the main filelaunching ie explorer; joy2key; etc .Separate with ;.");
+ toolTip.SetToolTip(postCommandTextBox, "Configure an command to run as post of the main filelaunching ie explorer; joy2key; etc .Separate with ;.");
+
}
@@ -161,22 +160,6 @@
}
}
- private void prePostButton_Click(object sender, EventArgs e)
- {
- using (AppSettingsPrePost prePostForm = new AppSettingsPrePost())
- {
- prePostForm.Title = titleTextBox.Text;
- prePostForm.PreLaunch = this.preLaunch;
- prePostForm.PostLaunch = this.postLaunch;
- DialogResult dialogResult = prePostForm.ShowDialog(this);
- if (dialogResult == DialogResult.OK)
- {
- this.preLaunch = prePostForm.PreLaunch;
- this.postLaunch = prePostForm.PostLaunch;
- }
- }
- }
-
private void shellexecuteCheckBox_CheckedChanged(object sender, EventArgs e)
{
if (this.shellexecuteCheckBox.Checked)
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -80,7 +80,7 @@
//
this.platformComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.platformComboBox.FormattingEnabled = true;
- this.platformComboBox.Location = new System.Drawing.Point(93, 231);
+ this.platformComboBox.Location = new System.Drawing.Point(93, 286);
this.platformComboBox.Name = "platformComboBox";
this.platformComboBox.Size = new System.Drawing.Size(325, 21);
this.platformComboBox.TabIndex = 42;
@@ -89,7 +89,7 @@
//
this.platformLabel.AutoSize = true;
this.platformLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.platformLabel.Location = new System.Drawing.Point(2, 234);
+ this.platformLabel.Location = new System.Drawing.Point(2, 289);
this.platformLabel.Name = "platformLabel";
this.platformLabel.Size = new System.Drawing.Size(84, 13);
this.platformLabel.TabIndex = 41;
@@ -103,6 +103,10 @@
this.Controls.Add(this.platformLabel);
this.Name = "AppSettingsDirCache";
this.Load += new System.EventHandler(this.AppSettingsDirCache_Load);
+ this.Controls.SetChildIndex(this.preCommandsLabel, 0);
+ this.Controls.SetChildIndex(this.preCommandTextBox, 0);
+ this.Controls.SetChildIndex(this.postCommandsLabel, 0);
+ this.Controls.SetChildIndex(this.postCommandTextBox, 0);
this.Controls.SetChildIndex(this.enabledCheckbox, 0);
this.Controls.SetChildIndex(this.titleLabel, 0);
this.Controls.SetChildIndex(this.applicationExeLabel, 0);
@@ -123,7 +127,6 @@
this.Controls.SetChildIndex(this.allowRefreshCheckBox, 0);
this.Controls.SetChildIndex(this.informationLabel, 0);
this.Controls.SetChildIndex(this.applicationExeTextBox, 0);
- this.Controls.SetChildIndex(this.prePostButton, 0);
this.Controls.SetChildIndex(this.startupDirComboBox, 0);
this.Controls.SetChildIndex(this.platformLabel, 0);
this.Controls.SetChildIndex(this.platformComboBox, 0);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -45,20 +45,26 @@
InitializeComponent();
}
- public override void LoadSettings(ApplicationItem curApp)
+ public override void LoadSettings(ApplicationItem applicationItem)
{
ProgramUtils.FillComboBox("tblPlatform", "platform", platformComboBox);
- base.LoadSettings(curApp);
+ base.LoadSettings(applicationItem);
- startupDirComboBox.Text = curApp.StartupDir;
- shellexecuteCheckBox.Checked = curApp.UseShellExecute;
- quoteCheckBox.Checked = curApp.UseQuotes;
- waitExitCheckBox.Checked = (curApp.WaitForExit);
- allowRefreshCheckBox.Checked = curApp.RefreshGUIAllowed;
- if (curApp.PlatformId != 0)
+ startupDirComboBox.Text = applicationItem.StartupDir;
+ shellexecuteCheckBox.Checked = applicationItem.UseShellExecute;
+ quoteCheckBox.Checked = applicationItem.UseQuotes;
+ waitExitCheckBox.Checked = (applicationItem.WaitForExit);
+ allowRefreshCheckBox.Checked = applicationItem.RefreshGUIAllowed;
+ if (applicationItem.PlatformId != 0)
{
- platformComboBox.SelectedValue = curApp.PlatformId;
+ platformComboBox.SelectedValue = applicationItem.PlatformId;
}
+
+ if((applicationItem.Title != "") && (applicationItem.Title != "New item"))
+ {
+ informationLabel.Text = applicationItem.Title;
+
+ }
}
public override void SaveSettings(ApplicationItem curApp)
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -92,10 +92,7 @@
this.informationLabel.Click += new System.EventHandler(this.informationLabel_Click);
this.informationLabel.MouseEnter += new System.EventHandler(this.informationLabel_MouseEnter);
//
- // prePostButton
//
- this.prePostButton.Location = new System.Drawing.Point(4, 419);
- //
// AppSettingsGamebase
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -51,7 +51,7 @@
base.LoadSettings(curApp);
this.startupDirComboBox.Text = curApp.StartupDir;
- this.quoteCheckBox.Checked = true; //(curApp.UseQuotes);
+ this.quoteCheckBox.Checked = true; //(applicationItem.UseQuotes);
this.waitExitCheckBox.Checked = (curApp.WaitForExit);
this.allowRefreshCheckBox.Checked = curApp.RefreshGUIAllowed;
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -80,8 +80,10 @@
waitExitCheckBox.Visible = false;
shellexecuteCheckBox.Visible = false;
informationLabel.Visible = false;
-
- prePostButton.Visible = false;
+ preCommandsLabel.Visible = false;
+ preCommandTextBox.Visible = false;
+ postCommandsLabel.Visible = false;
+ postCommandTextBox.Visible = false;
}
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -35,7 +35,6 @@
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
-
// enabledCheckbox
//
this.toolTip.SetToolTip(this.enabledCheckbox, "Only enabled items will appear in MediaPortal");
@@ -114,14 +113,13 @@
this.catverLink.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.catverLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.catverLink_LinkClicked);
//
-
// groupBox1
//
this.groupBox1.Controls.Add(this.historyDatLink);
this.groupBox1.Controls.Add(this.catverLink);
- this.groupBox1.Location = new System.Drawing.Point(232, 405);
+ this.groupBox1.Location = new System.Drawing.Point(5, 448);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(226, 117);
+ this.groupBox1.Size = new System.Drawing.Size(226, 87);
this.groupBox1.TabIndex = 82;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Add CATVER.INI and HISTORY.DAT in your mame.exe folder for full dataimport";
@@ -133,7 +131,10 @@
this.Controls.Add(this.groupBox1);
this.Name = "AppSettingsMame";
this.Load += new System.EventHandler(this.AppSettingsMameDirect_Load);
- this.Controls.SetChildIndex(this.prePostButton, 0);
+ this.Controls.SetChildIndex(this.preCommandsLabel, 0);
+ this.Controls.SetChildIndex(this.preCommandTextBox, 0);
+ this.Controls.SetChildIndex(this.postCommandsLabel, 0);
+ this.Controls.SetChildIndex(this.postCommandTextBox, 0);
this.Controls.SetChildIndex(this.informationLabel, 0);
this.Controls.SetChildIndex(this.enabledCheckbox, 0);
this.Controls.SetChildIndex(this.titleLabel, 0);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs 2007-08-13 08:55:30 UTC (rev 828)
@@ -92,7 +92,11 @@
shellexecuteCheckBox.Visible = false;
this.enabledCheckbox.Checked = true;
- this.prePostButton.Visible = false;
+
+ preCommandsLabel.Visible = false;
+ preCommandTextBox.Visible = false;
+ postCommandsLabel.Visible = false;
+ postCommandTextBox.Visible = false;
}
private void informationLabel_Click(object sender, EventArgs e)
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.resx
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.resx 2007-08-11 06:03:06 UTC (rev 827)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.resx 2007-08-13 08:55:30 UTC (rev 828)
@@ -123,97 +123,384 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="informationLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- /9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD/2wBDAAUDBAQEAwUEBAQF
- BQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUF
- BQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e
- Hh7/wAARCABLAOEDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAA
- AgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRol
- JicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZ
- mqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QA
- HwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx
- BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RV
- VldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPE
- xcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD4yooooAKKKKACiiig
- AorpJPCN/beCz4nvT5EMkqJbRFfmlDZ+f2Xjj1+grm6ucJQtzLciFSM78rvbQKK6PwH4S1DxZq32S0/c
- 20eDc3TD5IVJ/Vj0C9z7AkYV7GsV3NEmSqOygnqQDQ6clFTa0YKpFzcE9UQ0UUVBYUV1HhvwdfaroGpa
- 9KxttPs4JHR2XJndR91R6A4yeg6dTXL1cqcopNrciNSM21F7bhRRRUFhRWz4Q8Oaj4n1hNO05BnG6WZ+
- EhTPLMfT9ScAcmqniCyXTdbvtPSQyrbXDwhyuCwViM47dKv2cuXntoR7SLnyX13KNFORWdgqgsxOAB1J
- ro/F3hK+8M6XpdxqbbLu+8xmt8cwqu3AY/3jk5HbjvkAjCUk5JaLcJVIxkot6vY5qiiioLCitbwp4f1D
- xJqq2Fgqggb5pnOI4Yx1dz2A/XgDJIFdhL8PdEjdl/4Si8cA43LpYwfcfvq6KOErVleEbo5q2Mo0Jcs5
- Wfz/AEPOaK9CPgLQh18TX3/gqX/49TD4H8Pjr4ovv/BUP/j1a/2dif5fxX+Zj/aeF/m/B/5HAUV6NB8P
- NDk0+61BvFV1DaWq5lml0xVUHso/fcsfQVxN3baWll5trqM8tx5pXyXttg2c4bduPPC8Y7nnjnGrhqlH
- 41b5o3o4qlXv7N3+T/yM+iiisDoCiiigAooooAK9a+C3wwuNfu4NU1S23WpAkt7eQYWQf89JPSP0HVzx
- 0yaPgr8MLnxBeQanqdtutjh7eCQfLIP+ekn/AEz9B1c+2TX1ZpWm22k2Qt7cZJ5kkI+ZzjGT6egHQDgV
- 7mW5bz2q1Vp0R85m+b+yvRovXq+39f15eL/tPabb6Z8NbOCAZJvFLyEDLnHU46egA4A4FeBeB/Ct94p1
- M29ufJtYsNdXTLlYVPTjux6BRyT7ZI+of2gNBl8S+HtO0yKdLdWvA8srjOxAOSB1ZuwA6kj61d8A+D7H
- w9pdvFFa+SkXzQwtywYjmSQ/xSH8lHArsxOXvE4q7+FJHDhM0WEwXKtZNsh8GeEbHw9oQhhtvIjiidoo
- W5bcVOZJD3kP5KOBXx/qn/ISuf8Ars/8zX3TdnNvP/1yf/0E18Lap/yErn/rs/8AM1z51CMIU4xVlr+h
- 1cP1JVJ1ZSd27fqVq7r4Y+BZ/Edyl9fJKmlI+0BeHuXHVEPYD+JugHvR8MPAs/iS6S9vo5U0tX2gLw9y
- 46oh7AfxN0A96+jtK02DTbWOKOOJCiBFWNcJGg6Io7AfmTya5suy51n7Sp8P5nZmmaKgnSpfF+X/AATn
- /GGnw6f8M9fijjjTZpjRoka7UjQEYRR2A/Mnk18r19afEQ5+H3iP/sHv/MV8l1edJKcEuxnkDbpzb7/o
- FbHhPw9f+JNVFjYqqhRvnnk4jgjHV2PYfqTwOaTwn4ev/EmqixsVVQo3zzycRwRjq7HsP1J4HNe/+GtD
- sNC0pLCwjZYAQ7u64kuJB/y0f0/2V6KPfJrlwOBliJXfwnbmGYRwseWOsmTeC9F0/Q47HTtOjZbcXEby
- SOuJLmQH/WP6f7K9FHuSa+ffGis/jPV1UFmN/MAB1J3mvpOyYDUbYkgATIST2+YVxejeFrfSvEeoa7de
- XPqc91JLbAYZLRGYlX9DKQcj+7169PYxuDdWEKdNWSf3I8PL8aqM6lWo7tr72Znw+8HDw4qanqUYbW2A
- aKJhkWIPRiO8voP4Op56Uvj3/wAgnwsck5iuck9T+9613D4UEA+5J6k1w3x6/wCQR4W/65XP/o2oxVCF
- DCShDy/NF4OvOvjoTm+/5M8nrW8K+H9Q8R6qthYIoIG+WV+I4UHV3PYD9eAMkgUeFdAv/EeqrYWCqCBv
- llc4jhQdXc9gP14AySK9dtbaw0XSho2jBhbZDXE7DEl24/ib0Uc7V7e5JJ8nBYKWId38KPbx+OWGjyx1
- k/6uxsEOn6LpP9iaKG+zZDXFwwxJduP4m9FH8K9vckktSxZ9Pl1K5urWwsY3EZuLpyqM5/hXAJJ78Dio
- 9yCVTKGMe4bgpwSO+Ks+K9O0TxTE1/qF/qWm6TpsWEiURrBB7L1LOx+pNfQyTp07U1t02PmoNVKl6j33
- e7Mxzox6eLNA/wC/0n/xFMjXQBIHuvFuj+QvzSCB3eQgc4UFACT9a8q1H7ILyUWPnfZgx8ozY3le2ccZ
- qtXjPNprTlR7iyeFvif4HUeOfFcmuyx2dnEbPSLUkW1sD/4+/wDec9zXL0UV5lWrKrJyk9T1aVKFKKhB
- WSCiiiszQKKKKACvWvgp8L7rxDewalqVtutjiSCCQfK6/wDPST/pn6Dq59smj4J/C668R30Go6jbbrY4
- kggkHyuv/PST/pn6Dq59smvrXRtKtNHsRbWwyTzJIR80jep/oOgHAr3Mty32lqtVadEfOZvm/sr0aL97
- q+xFo+mWukWQtrcZJ5kkIG6RvU/yA6AcCsHUvGWkw+KovDUUonv2QPIiH/VqZETn3y449q5D47fFi28I
- 2j6Po8iT61KuMg5FuD3Pv7V4t+z7d3N/8S57y8meaeWJHkdzksftMFerWx0YVo0IatvXyPFw+WTqUJYi
- poktPP8A4B9YTYJyQDg5HHSqd1PFEF82RU3MFGT1JIA/UgfjVLxf4j0vwxo02q6rcCKGMfKufmkbsoHc
- 14R4H8c6n42+Kct1dMYrSOBRbWwPyxr9ph/M+9b1sVClOMHuzlw2CqV4SqL4Y9f0Pe7k5gm94n/9BNfK
- XgTwLP4l1ua9vY5V0xbl1AXh7lwTlEPYD+JugHvX1TOco6g43KVz9RisfS9Lt9MhCxhC23YCqbVVR0VR
- 2H8zyayxOEjiJRc9kdGCxssLCahvK3yIdH0uDS7WOOOOJGVBGqxrhI0HREHYD8yeTU85K7d3y787Qepx
- WJ8QPF+m+D9IN7elZrqQEWtqD80h9T6LXCfCDX9S8R3Go6rqk5lnkvRgfwoPKbCqOwFW8RThVjRW7/AU
- MLVnSlXey/E7P4gn/i3/AIj/AOwe/wDNa+ZfCnh+/wDEmqCxsVVQo3zTPxHAg6ux7D9SeBzX1B4ntTqP
- hfV9NWaOF7u1MKu+dqksvJx2HX8Kw/Cnh6w0PSksrOJlgBDs0gxJcOP+Wknp/sr0Ue+TXHjME8TWi38K
- Wp34HHrCUJpfE3p9wzwvoNhoekx2NjEywAh3dxiS4cf8tH9P9leij3JNakzwQ2017e3CW1nbrummfoo9
- PcnsKluJLe3tZr29uFtrO3XdNM/RR6D1J7CvBfib46uPFF0LOzD22jwMfJhzzIf77+pP6VpicTTwdOy+
- SMsLhauOqtt6dX/XU9qkmgl/eWzO0LqrxlxglWUMM/garqkk0ywwoXdzhVUck0zS0kls7OKJC7vbW4VR
- 1P7lK4/4l+OItFim0HQJ1kv3BS8vEOREO8cZ9fU1pVxEKVPnmZ0cNOtV9nTR1moQyWtzJby7fMjOG2nI
- 6Z6j61zPxP0G/wDEcXhOwsFUEQXLyyvxHCgl5dz2A/XgDJIrZhYmxsyTybK25/7YR0tzfXL2S2bTN5C9
- EHA6k8+vJJ/GlVpxr0+R7P8A4cqjUlQqqcd1f8rGfY2thoukjSNIDC2yGnncYkunH8Teijnavb6kmlmt
- hDpv9o3t3a2Foz+Wkty5USN3CgAk49aWOSJLmN54zJErAugOCw7jPaqfjHS9H8Tagt1qGs6tHHGoSG3i
- tYxHCvoo30pp06dqUb9lsVBqrUvVla+73ZEt14e37rnxRpawjl/KdnfA7KNvJPauC8eeLZdfmS0tI2tN
- Itifs1sD19Xc93Pr+FdGfA/hEddZ1n/wEj/+LpB4J8IM4RdY1tmY4CrZxkk+n3683ERxlePLypL1/wCC
- ephZ4GhLn5m35p6fgeZ0V2/xE8MeH/DAS0ttTvbnU2wz28kaAQr/ALZUn5vb864ivFq0pUpcstz3aNaN
- aCnDZhRRRWZqFFFFABXcfDLR/Dct2upeJtYsLeCNwIrWV87z/ecDnaP7vVunA5rh67zXfBGjad8PNM8T
- w+LLW6u72SCOTT0VfMgLrI0hbDk4UCLBxyXYcbedKU1TmpNXMq1N1IOKla/VH0xoXxP+F2jWAtbXxHbk
- nmSVlO6RvU8fgB0A4Fcx8WPjpolloRg8I3qX2oXAKiVQdsI9T7+leGat4CitfEMmi2mswXtwtjcXUYQp
- 87JPIkaAhyPnjRJBz0ccHqcEaZpn/CJDUzfzDUjffZja+Wu0Jt3b927Pt93HvXqTzqs48sUkeLT4ew8Z
- qUpN+TMq/u7m/vJbu8meaeVi0kjnJYmu2+CGr2OheJr3VdQmWKC3shJyeXKzwttX1JxVXU/C3h+w0jxB
- cyeKo2u9P1KWysLdLff9uVHUeZuUkICpLZPHGATmpNK8EW1x4003RLzWEtbG/wBPF4l9sDDP2XzigUE5
- O/8Ad+ue2eK8ylVdOoqm7R7NajGrSdN6JlX4meOdU8ba013ds0dpGSLa3B+WNf6n3rqv2edE1Ftek1cQ
- N9kZVhRzxvYTRu231CqpyegyB1IFZfw/+Hdxr+vzLKJTpdvcPEGA2NclWxtX0HTc3bPc4FfTGh6Ta6PY
- x21vFGm1AnyLhVUdFUdlH68k5JJr2MvwtSvV+sVX/wAH/gHhZnjKWGo/VaK/4H/BLshrk/iH4x0zwdpB
- u7wiW7kB+y2oPMh9T6LUnxG8aab4N0c3V0VmvJQRbWwPLn1PotfO8EF58QZPEXiHWtetrW5srUy28U0i
- L57/ADMIUDMD9xJMbQx3bRj5sjvzDHrDrlj8X5HmZXlksU+eekF+JzninX9S8SaxNqmqTmWeQ8D+FB2U
- DsBXpHwI1XSdPsLtdR1WysT9qDgXEoTI8sjj15NctdeENFj8LeH9Vi8VWpu9SuEivLZkwLFWZwHc56YT
- PT16Y5sWHgSxvfHNx4f/ALfhsLWK1M32q+eBPnICxodszJ80jIPvZCkttJGD85QxMqVX2r1Z9ZiMJCtR
- 9itF5HuL+J/CpH/I06N/4Ef/AFqrS+JvCiqXfxRpWxQS2ybc2B6DHJrwaPwvZN8PZfEj6sI7uOZ4xaMq
- bWw8a7Qd+7eRIzY242xtzUfxG8N2fhjWLeysdVGpxS2qTGcR7F3EnKj1xjqCR716X9tT/lR5X9gU/wCd
- mh8TvHdx4puxaWge20eBj5MGeXP99/Un9K4iu+8Q+BNL0/wHpPiGx8UWt/f6hJbRNpqBQ8DSxu7bjvPC
- 7YxnAzvOcbeXz+AdMh8c3egDxRbXlnFaLcQXdo0LfaiWRGVN0qplSzk5cfLEx4ryKtWdabnN6ntUaMKE
- FCCskbXjPx7Hp2hwaNoEoN7NZwrd3anPlDylBjQ+vHJ/CvMNLs21LUYbQXNvbmV8Ga5lCRp6szHoP88m
- t2y8M6fP4FvfEL+ILSK8tpJVTTWUmWYJJaqGUjjBFw565/d8AjcV1dH8DaRfvriS+LbK1bToIpbcSBf9
- LLW0kzIp3YBXy9vuTj7xVTpXxMq8k57LoZ4fCww8XGG76neJq3hryY4h4p0pRDFHAC7sC3loqbuFIGdu
- eveo31Hw6enizRf+/kn/AMRXmGt+G7LT/A2heIINVFzc6n5nn2ojx9m2ySIAW6EkIGxwcN06ErH4as3+
- GzeKv7UH2xdRe0+wiPJCBY2EhbsCZCADj7pxnnHes3mlblX4nnPJKbd+d/gekPeeH26eLdD/AO/kn/xF
- QPPoLdPFuhf9/JP/AIisLxZ8OdD0fWdAsLLxpZakurTyxSSxqgFtsEe3d85GWZ2HJA+UHPPHP6j4REEe
- si11CO6m0pbZpI125IkiLS/xf8s2G04zz6Uf2vU/lX4h/YtP+d/gdu76G3TxdoP/AH9l/wDjdVtT8UaP
- 4X04y6PfW2q63MCI54cmK0XpuG4Alz9OK4/U/DFlp3h7w7rE2tQT/wBpM3261t2jeayXI2ZXfyXQ7hnb
- 0wa0rHwXot5r3iKwj8ShbbSrkwQTtHGPOUeZmdgZABEDGASpY/vEwDUTzWrKLSSRcMnpRknKTa7HEXM8
- 1zO89xI0ksjFndjksT3NRV1l74Z0mD4d2fiOLxDFNqc0qiXSwg3xIzzoHLZ/6YjtxvXOMqW5OvLbueul
- YKKKKACiiigAooooAKKKKACtDQDpQ1OJta+1GyU5kS3ALv8A7IJIAz61n0U4uzuKSurHv+gfGjwfo1kl
- taeH9SUKgQbfLUKo6KozwB/iSSSTVq7+PuhfZpDa6HqBn2ny/NdNu7tnHavnaivSWbYhKyt9x5LyTCN3
- af3mp4o17UvEesTapqk7SzyH14UdlA7CsuiivOlJyfNJ6nqwhGEVGKskFFFFSUFFFFABRRRQAUUUUAFF
- FFABRRRQAUUUUAFFFFABRRRQAUUUUAf/2Q==
+ Qk1+WAAAAAAAADYAAAAoAAAAlgAAADIAAAABABgAAAAAAAAAAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
+ AAABAAABAAAAAAAAAAAAAAAAAgAAAwAAAwAABAEAAwEAAwEAAwEAAwEAAwEAAwEAAQEAAQEAAQAAAAEB
+ AAEAAAIAAAIAAQEABAEABgAACQAACAAABQAABAACAgAEAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAEAAAEAAAACAAADAQAEAQAE
+ AQABAAABAAEBAAECAAACAAABAAAAAAEAAAIAAAIAAAQAAAIAAQEAAAIBAAIEAAEGAAAIAAAHAAAFAAAD
+ AAEBAAQAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAQAAAQEBAgICAgIAAAcEAgcBAAoFAQMBAwMCBAQDAwYDAQsHBwYDAgUCBAQCAwIC
+ BQEABQICBQABBQAABwEBCwEACAMABQMAAAMBAAEBAAAAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAQAAAAAAAAABAAACAQECAQEBBQMBBQEA
+ Ew0IEAkEFAkAGg0AFwYAHgwAHgsBHgsBGwgAHwwAGwsAGgsADAQBAgIBAQAFAQALAAALAAAHAAABAAIA
+ AAIAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAABAAABAAAAAAAAAAEAAAIBAQMCAgIFAgELBgJEPDOBc2GRdEWlg02vilKqg0ayiUqyh0iyh0eu
+ hUapgEOddjpELAkTCQALAwAHAQQDAQsBAQoAAQIAAwAABAAAAgABAAABAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAEAAAAAAAAAAQAAAgEBAwICAgQB
+ AAsFARcOB1lKM6SCQ7qSRteqXN6uXN+uV96rU9yoUOCsVN2rVdqqVZd1Mz4uCBQHABAEAQMABAABBwAA
+ AgACAAACAAEAAAQAAQMAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAEAAAAAAAAAAQAAAQAAAAAAAAAAAAAAAAAAAQAAAQAAAAABAAABAAAAAAAAAAAAAAEAAAEA
+ AAAAAAAAAAAAAQAAAQAAAAAAAAACAAADAAEDAQECBQMBBwIBDgYAEwcAblUgmnw1s49A06xY2KxU2axS
+ 2KpP16pP1KdN06dPzapaoIhEQCsKFwcACAIBAQAEAAEBAAIAAQIABAAABwACAwABAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAABAACAQADAAECAAIAAAIYGBkh
+ ISEcHBoEAwERDQ86Nz4ODBMAAAMhJSM8QTsDCwIBBgAUGhQHCQcCBAUYGhkCAwITFRcIChEBBAkCAgQq
+ KSk8OTMRDQkcGBBEPzY2LR1kUCqhgEC2j0LSqFbVq1bYrFXWqE7WqE3XqVLQo03Vp1OadjtDLAoQBgAG
+ AQEDAAQEAQQRDw8TEg8XGBIICgUSFRELDQshJCEBAwEQERAvLy8DAQMHBQkhHiMbGR0HCAoICQo7PT4V
+ FxgAAQIWFxg6PD0eICEAAAEBAgMBAAIfGh4aGR0rLC0BAgMVFxkMDA8hISQBAAEEBQIwNC4NDQoHAwIg
+ Hx8NDg8LDhAGCQkTFhUBAgEZGRgUFBQTExQCAwEnJyQ5OjcODw0AAQAAAQADBQQoKSc7PDoNDgwODwwe
+ HhsmJSIQDw4EAwElJCIwMC0FBQQODQw4ODUlJSIDAgEfHh8KCwwSFBcAAQERExEODwsCAwEGCQg1OTsN
+ DhIAAQMYGhoICQoYGRoAAAEAAAEAAAEAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAFAAEDAQQBAQUAAgMABAUFB3t/frK5tHp8eAoKBk1KSWNgY3d0dwMDBGRnZkRKRAUL
+ BAQIAlxgWSAfHwgGCXx8ewYFBFRVV1haXxscIAgJC4B/fSgmIAsKBkdJQoKEfjEuKw8FAGRMKp99Q7SL
+ QdapV9WmTtqqUdinTtOiS+CpT9+lStaoWaWERjwoCRYJAAkAAQYABTY0N5KUknqBeQMGA1haWI+RjkdH
+ RQcHBXBwb11dXSYmJwMDBJeVmaalqAcHBywsLXZ3dn9/fwICA1dXWHp7eyAhIQYHBwMCAwYEBmliZ6Ge
+ oq+xsgUHByQmJ7Sztm1qbQYDBHV1ck9SSjU1MAQDAoOEhWdpaj5AQhcYF2ptaAICAHt8eoSGiV1eZAME
+ BYuMjFBTUxIVFgQGBwECBQMFBo6Rk1BSUxESEzk7O5iamqyurjg6ORgZGnV2dmRlZSssLTU3N2JjYxsb
+ GwgFBXNwcK6usSIkKAQFB0hHRTo5NQYEAHJzbkpNTWZrbAECAnl7fG9xckFDRAQFBgICAwAAAQAAAQAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAgAGBAAGBAAFAgADBAYG
+ iJGMfIeBm6KeCQoJTE1HPD4zf395BAQCXFpcHx0fAgEBHBkYlZCRR0FECgQIgHp5CAUCXFtapKSlUVFT
+ CQkKd3V1CQgHAAABREZGmJmZQDkyDwgBGQ8FXUoorIZFuYk43qxS2ahQ1aZP2qhO3apN1qRJ06ZPz6ha
+ lHc8PSgKDwIABwADExEalJOXPD06BgQGY19mp6SpV1NWCAUGaWhnc3RzICMfAgYCYGVidnl2BgQELCgo
+ lZGQfXp5BQICWldWl5OSLisqBgICBgICBQECZWJip6ims7i0AAMABgcGnpqbRT5BCAMEZWFgaWlnLjAy
+ AgQIgIOIZWdoPT8/GRkUaGdgBQMAeXl4h4mOR0pSAgMHkJGWbG1yFxgcAQIHAQIIAwMIj5CWaGluFhYb
+ Nzg8paermZufPj9CGhsfYmRnTU9TKywwMDI2R0lNAgIFAwMCS0lGnJqbAQEFDAoPiIKEaWFeCgIAaWNd
+ cW9pZmZhAQECdnh5m52eS01OAgIDAAABAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAACAA0DAAsFAAYEAAQBAAEAAgAIEgwECwcRFRcCAQcJCQgGCwQOEQoAAQEOChQI
+ Aw4FAQoLBg0eGR4UDxQGAgUVEg8HBQAOCwcbGBULCQgEAgMQDQ8BAQMDBQkICxAbHSAWDgsIBAMEBAMQ
+ CgBmTiamfzy8izfcqlPbqFDcqU7TpEvTqE3WqUnUp0bTq1SnhkY9KQwRBgIFAQUSDhUHAgUGAggQCxMg
+ GiAKBQkEAAEOCwsXFxYFBQQAAwAGCQYHCwkDAQEKBQYeGRoOCQoGAQILBwgiHR4TDg8GAQIFAAEFBAMK
+ DAkIDQgNFA4FCgQDAwESDAsPBQUKAQMHAgQXFRkDAwsAAAgREhgHBwgKCAYNCgYQDAcJBQMSDw8ICQ0I
+ Cg4LBgYUDg4eGRkMBwcLBgUIAgEMBQUZEhEfGhkLBQYLBgYTDg0VEA8QCwoNCAYQCwsPCgoMBwYOCQgL
+ BgYHAwEDAwADBQQKCw8EBAwCAgodGCAdFBgMAgILAwEdGRYIBwUFBgUQEBAWFhYHBwcDAwMCAgMAAAEA
+ AAEAAAEAAAEAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEABgMABAQAAgQBAAEB
+ AAADAAEFAwIGBQMCBQoCCAcCAgMEAQcHCAcDCgQCCwUBCwMBBwICBQIBAgMFBgABAgECAQUEAQgGAwoG
+ BAgEAwUBAgYDBQEBBAEBBAMDBQUEBgUEBgUFCAUGBgcEAhwPBWlQKaqDQLyMO+CrUtimTNirVdCmTtan
+ RtyqRNipR8+nVZJ3QTspDhAFAQcAAgsGCQQDBAICAwEBAgQCAwUCAgUCAgcDAwoGBgUCAgcEAgcEAwcD
+ AwkFBAQAAAgEBAUBAQcDAggEAwgEAwYCAgYBAgQDAgIFAwMGAwEDAQEFAwMDAQcDAAoDAgoCAwUAAQMC
+ BgEBBgEBBAMDBAUEBAUDAgYDAgcGBQUCAgoGBwYDAwUCAQQCBAMCBQMCBAUDBAYCAwkFBQYCAg4JCgQB
+ AwMBBAMBAwgHCAIAAgcGCAQCAwUFBgMBAwMBAgYGBgMBAwcGBwEBAAIFBAECBQEDCQIDCQYDCAYBAwkE
+ BQQBBAEBBQEDCAAAAgMDAwMDAwICAgcHBwAAAAAAAAAAAQAAAQAAAQAAAQAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAIAAAMAAQMAAgMAAgIAAwQDAwEBBwEAEwYCFgIAFwUAEAUAEgUBDwIA
+ EAQBDgUACgYABQcAAgUAAgUAAAQDAAMDAAEBAQAABQIBBAEBAwACAwECBgIDCAMBGBAJCQMAAAAHAQEH
+ CAUFBgMDBgUDDAUAZ1AspH9Au4o42qhT0qRN1adQ2ahN2KVD26hG06RGzaZXp4lOOSUKFAkABwIAAgMB
+ AAMAAAEAAQMCAAICAwEBBgEADQIBEwUAGQcBFQMAEwcAFAkAFgwAEggAGA0CEwgAEQcAEwgAEgcAFAkA
+ CwYAAgIBAgQEAgMGAAIFAAECBAIBBAEACAQDAwECAgIFCgYCEAkDCQMABwMAAQEBAQIHAQMJAAEGBQEB
+ EAUBDwMABwMABQIBCAQACQQACwUBCgIADQUCCgUCCQMACAIACQUCBgQCBwMBBQIACQYDBgMBBgIACAQC
+ BQMBBgMBBgIACAMACgMADgkFBgQACwkCCQYACQYACQUCAwIDAQILAAALAgIEAgEBBQQEAwICAQEBAQEB
+ AAAAAAABAAABAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAABAAC
+ AgACAAADAQEbFBJANCpMOiBWPhxSOBNMNBVRNxdSORdOOBFNPBFJPRRFPhglIgsJCAAEAgAAAQMAAQQA
+ AAEEAgICAAECAQMDAgMHAgETCAFlUzwoGAgEAwQBAQQEAwEEAQEAAQMDAwQZEAZkTSmthUK/jz7ap07a
+ pk/YpU/XpU3VpUnWpUXTpEbQqFWRdTg7KQkMBgADBAEAAwEAAgIAAQQAAQQFAgUJAwEeDwdTPidrUDVw
+ UjJrUi1qUyxqUyxpUitpUStpUitlTiloUSlnTypkTSUsHAgJBAACAAEBAwcAAAcAAQYAAAEBAgABAgAA
+ AQABAAEqHxFPPSQZCgAPBgAIBQUAAAgAAAsCAwwGAwUsHRNoVUNIOSBAMBdFNBZFMhNNORtMNxlKNRdJ
+ NRZINBdHNBhGNBhGNBlGNBlHNRpHNRpHNRpGNBlGNBlGNBlGNBlINRpHMRlHMBhFMhdDNRRCNhJBNg5C
+ NxQ1KxEUDQEJBggAAAcCAQEFAwIEAgEDAQEBAQEBAQEAAAAAAAAAAAEAAAEAAAEAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQABAAABAAAAAAAAAgUCBA0FAT8yIZiFVZqCP9S0ZeK8beK6
+ aOG3YuW+ZOG9YNq6YdO3a5+GTU41FR8IAAkBAQAAAwEAAQEAAAECBAAABQAAAgcDABcIAaOHXYBjNCQW
+ AwsGAAQBAAEAAAABAgABBQQEBA4HAW9VK55xJ9+nS92nTtikUtSiVNKjUNSlSdelQdGiP9CqWKSHST8u
+ DhAGAAcDBAEABAAACQAACgIBBQkEAC4fDopxQ6qJScKaUsidU8idU8idU8ecUsabUcWZUMKXTcSZUL6T
+ ScSZUJp5QzolDxQHAgkDAgECBwECBwAAAgACAAADAAABAAIBATQkCaSIWV5EISAOAA8GAAICBgABCwAB
+ DAMBBBcMA1xGLZ97Qpx2NbGJRbiMRrOGPrSIPraJQLSIP7GGQK+GQK+FQK+GQa+GQa+FQK2FQK2EP6yD
+ PqyCPauCPaqBPKqAPKp+Q6h+RaZ/QqOAPqKCPKKFPJ2BPaaKU...
[truncated message content] |
|
From: <fr...@us...> - 2007-08-11 06:03:07
|
Revision: 827
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=827&view=rev
Author: framug
Date: 2007-08-10 23:03:06 -0700 (Fri, 10 Aug 2007)
Log Message:
-----------
FileExplorer plugin entire renamed.
Before : explorer After : FileExplorer
This is for not to not be confused with the other plugin myexplorer.
Modified Paths:
--------------
trunk/plugins/file explorer/Source/AssemblyInfo.cs
trunk/plugins/file explorer/Source/Constants.cs
trunk/plugins/file explorer/Source/Dialogs/GUIDialogOperation.cs
trunk/plugins/file explorer/Source/DrivesView.cs
trunk/plugins/file explorer/Source/ExceptionViewer.cs
trunk/plugins/file explorer/Source/Preview/TextPreview.cs
trunk/plugins/file explorer/Source/Setup.Designer.cs
trunk/plugins/file explorer/Source/Setup.cs
Added Paths:
-----------
trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_dialog.xml
trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_main.xml
trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_modulepreview.xml
trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_musicpreview.xml
trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_textpreview.xml
trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_dialog.xml
trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_main.xml
trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_modulepreview.xml
trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_musicpreview.xml
trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_textpreview.xml
trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_dialog.xml
trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_main.xml
trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_modulepreview.xml
trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_musicpreview.xml
trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_textpreview.xml
trunk/plugins/file explorer/Source/FileExplorer.cs
trunk/plugins/file explorer/Source/FileExplorer.csproj
Removed Paths:
-------------
trunk/plugins/file explorer/Release/Plugins/Windows/Explorer.dll
trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_dialog.xml
trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_main.xml
trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_modulepreview.xml
trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_musicpreview.xml
trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_textpreview.xml
trunk/plugins/file explorer/Release/Skin/MCE/explorer_dialog.xml
trunk/plugins/file explorer/Release/Skin/MCE/explorer_main.xml
trunk/plugins/file explorer/Release/Skin/MCE/explorer_modulepreview.xml
trunk/plugins/file explorer/Release/Skin/MCE/explorer_musicpreview.xml
trunk/plugins/file explorer/Release/Skin/MCE/explorer_textpreview.xml
trunk/plugins/file explorer/Release/Skin/Project X/explorer_dialog.xml
trunk/plugins/file explorer/Release/Skin/Project X/explorer_main.xml
trunk/plugins/file explorer/Release/Skin/Project X/explorer_modulepreview.xml
trunk/plugins/file explorer/Release/Skin/Project X/explorer_musicpreview.xml
trunk/plugins/file explorer/Release/Skin/Project X/explorer_textpreview.xml
trunk/plugins/file explorer/Source/Explorer.sln
Deleted: trunk/plugins/file explorer/Release/Plugins/Windows/Explorer.dll
===================================================================
(Binary files differ)
Copied: trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_dialog.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_dialog.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_dialog.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_dialog.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,46 @@
+<window>
+ <id>557316</id>
+ <defaultcontrol>10</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posX>177</posX>
+ <posY>225</posY>
+ <width>409</width>
+ <height>202</height>
+ <texture>dialog_background.png</texture>
+ </control>
+ <control>
+ <description>dialog Heading</description>
+ <type>label</type>
+ <id>2</id>
+ <posX>190</posX>
+ <posY>230</posY>
+ <label>0</label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 1</description>
+ <type>label</type>
+ <id>3</id>
+ <posX>190</posX>
+ <posY>260</posY>
+ <label>0</label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 2</description>
+ <type>label</type>
+ <id>4</id>
+ <posX>190</posX>
+ <posY>280</posY>
+ <label>0</label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_main.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_main.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_main.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_main.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,112 @@
+<window>
+ <id>557311</id>
+ <defaultcontrol>1</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>5</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <description>Menu left</description>
+ <type>button</type>
+ <id>1</id>
+ <posX>1</posX>
+ <posY>1</posY>
+ <label>Menu left</label>
+ <onleft>1</onleft>
+ <onright>2</onright>
+ <onup>1</onup>
+ <ondown>3</ondown>
+ </control>
+ <control>
+ <description>Menu right</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>352</posX>
+ <posY>1</posY>
+ <label>Menu right</label>
+ <onleft>1</onleft>
+ <onright>2</onright>
+ <onup>2</onup>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <description>file listcontrol</description>
+ <type>listcontrol</type>
+ <id>3</id>
+ <posX>1</posX>
+ <posY>55</posY>
+ <height>500</height>
+ <width>350</width>
+ <onright>4</onright>
+ <onleft>1</onleft>
+ <onup>3</onup>
+ <ondown>3</ondown>
+ <spinPosX>240</spinPosX>
+ </control>
+ <control>
+ <description>file listcontrol</description>
+ <type>listcontrol</type>
+ <id>4</id>
+ <posX>352</posX>
+ <posY>55</posY>
+ <height>500</height>
+ <width>350</width>
+ <onright>2</onright>
+ <onleft>3</onleft>
+ <onup>4</onup>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <description>label left</description>
+ <type>label</type>
+ <id>6</id>
+ <posX>1</posX>
+ <posY>500</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ <control>
+ <description>label right</description>
+ <type>label</type>
+ <id>7</id>
+ <posX>352</posX>
+ <posY>500</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ <control>
+ <description>labeldir left</description>
+ <type>label</type>
+ <id>9</id>
+ <posX>1</posX>
+ <posY>35</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ <control>
+ <description>labeldir right</description>
+ <type>label</type>
+ <id>10</id>
+ <posX>352</posX>
+ <posY>36</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_modulepreview.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_modulepreview.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_modulepreview.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_modulepreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,64 @@
+<window>
+ <id>557313</id>
+ <defaultcontrol>10</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posX>177</posX>
+ <posY>225</posY>
+ <width>409</width>
+ <height>202</height>
+ <texture>dialog_background.png</texture>
+ </control>
+ <control>
+ <description>dialog Heading</description>
+ <type>label</type>
+ <id>2</id>
+ <posX>190</posX>
+ <posY>230</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 1</description>
+ <type>label</type>
+ <id>3</id>
+ <posX>190</posX>
+ <posY>260</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 2</description>
+ <type>label</type>
+ <id>4</id>
+ <posX>190</posX>
+ <posY>280</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>OK button</description>
+ <type>button</type>
+ <id>10</id>
+ <posX>435</posX>
+ <posY>355</posY>
+ <textXOff>10</textXOff>
+ <textYOff>7</textYOff>
+ <width>105</width>
+ <height>38</height>
+ <textureFocus>small_button_focus.png</textureFocus>
+ <textureNoFocus>small_button_nofocus.png</textureNoFocus>
+ <label>186</label>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_musicpreview.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_musicpreview.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_musicpreview.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_musicpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,64 @@
+<window>
+ <id>557314</id>
+ <defaultcontrol>10</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posX>177</posX>
+ <posY>225</posY>
+ <width>409</width>
+ <height>202</height>
+ <texture>dialog_background.png</texture>
+ </control>
+ <control>
+ <description>dialog Heading</description>
+ <type>label</type>
+ <id>2</id>
+ <posX>190</posX>
+ <posY>230</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 1</description>
+ <type>label</type>
+ <id>3</id>
+ <posX>190</posX>
+ <posY>260</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 2</description>
+ <type>label</type>
+ <id>4</id>
+ <posX>190</posX>
+ <posY>280</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>OK button</description>
+ <type>button</type>
+ <id>10</id>
+ <posX>435</posX>
+ <posY>355</posY>
+ <textXOff>10</textXOff>
+ <textYOff>7</textYOff>
+ <width>105</width>
+ <height>38</height>
+ <textureFocus>small_button_focus.png</textureFocus>
+ <textureNoFocus>small_button_nofocus.png</textureNoFocus>
+ <label>186</label>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_textpreview.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_textpreview.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_textpreview.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/BlueTwo/FileExplorer_textpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,29 @@
+<window>
+ <id>557312</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <type>textbox</type>
+ <id>2</id>
+ <posX>1</posX>
+ <posY>1</posY>
+ <width>700</width>
+ <height>576</height>
+ <font>font12</font>
+ <textcolor>White</textcolor>
+ <spinPosX>640</spinPosX>
+ <spinPosY>560</spinPosY>
+ </control>
+ </controls>
+</window>
Deleted: trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_dialog.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_dialog.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_dialog.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,46 +0,0 @@
-<window>
- <id>557316</id>
- <defaultcontrol>10</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <type>image</type>
- <id>0</id>
- <posX>177</posX>
- <posY>225</posY>
- <width>409</width>
- <height>202</height>
- <texture>dialog_background.png</texture>
- </control>
- <control>
- <description>dialog Heading</description>
- <type>label</type>
- <id>2</id>
- <posX>190</posX>
- <posY>230</posY>
- <label>0</label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 1</description>
- <type>label</type>
- <id>3</id>
- <posX>190</posX>
- <posY>260</posY>
- <label>0</label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 2</description>
- <type>label</type>
- <id>4</id>
- <posX>190</posX>
- <posY>280</posY>
- <label>0</label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_main.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_main.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_main.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,112 +0,0 @@
-<window>
- <id>557311</id>
- <defaultcontrol>1</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>5</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <description>Menu left</description>
- <type>button</type>
- <id>1</id>
- <posX>1</posX>
- <posY>1</posY>
- <label>Menu left</label>
- <onleft>1</onleft>
- <onright>2</onright>
- <onup>1</onup>
- <ondown>3</ondown>
- </control>
- <control>
- <description>Menu right</description>
- <type>button</type>
- <id>2</id>
- <posX>352</posX>
- <posY>1</posY>
- <label>Menu right</label>
- <onleft>1</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>4</ondown>
- </control>
- <control>
- <description>file listcontrol</description>
- <type>listcontrol</type>
- <id>3</id>
- <posX>1</posX>
- <posY>55</posY>
- <height>500</height>
- <width>350</width>
- <onright>4</onright>
- <onleft>1</onleft>
- <onup>3</onup>
- <ondown>3</ondown>
- <spinPosX>240</spinPosX>
- </control>
- <control>
- <description>file listcontrol</description>
- <type>listcontrol</type>
- <id>4</id>
- <posX>352</posX>
- <posY>55</posY>
- <height>500</height>
- <width>350</width>
- <onright>2</onright>
- <onleft>3</onleft>
- <onup>4</onup>
- <ondown>4</ondown>
- </control>
- <control>
- <description>label left</description>
- <type>label</type>
- <id>6</id>
- <posX>1</posX>
- <posY>500</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- <control>
- <description>label right</description>
- <type>label</type>
- <id>7</id>
- <posX>352</posX>
- <posY>500</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- <control>
- <description>labeldir left</description>
- <type>label</type>
- <id>9</id>
- <posX>1</posX>
- <posY>35</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- <control>
- <description>labeldir right</description>
- <type>label</type>
- <id>10</id>
- <posX>352</posX>
- <posY>36</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_modulepreview.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_modulepreview.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_modulepreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,64 +0,0 @@
-<window>
- <id>557313</id>
- <defaultcontrol>10</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <type>image</type>
- <id>0</id>
- <posX>177</posX>
- <posY>225</posY>
- <width>409</width>
- <height>202</height>
- <texture>dialog_background.png</texture>
- </control>
- <control>
- <description>dialog Heading</description>
- <type>label</type>
- <id>2</id>
- <posX>190</posX>
- <posY>230</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 1</description>
- <type>label</type>
- <id>3</id>
- <posX>190</posX>
- <posY>260</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 2</description>
- <type>label</type>
- <id>4</id>
- <posX>190</posX>
- <posY>280</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>OK button</description>
- <type>button</type>
- <id>10</id>
- <posX>435</posX>
- <posY>355</posY>
- <textXOff>10</textXOff>
- <textYOff>7</textYOff>
- <width>105</width>
- <height>38</height>
- <textureFocus>small_button_focus.png</textureFocus>
- <textureNoFocus>small_button_nofocus.png</textureNoFocus>
- <label>186</label>
- <onleft>10</onleft>
- <onright>10</onright>
- <onup>10</onup>
- <ondown>10</ondown>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_musicpreview.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_musicpreview.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_musicpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,64 +0,0 @@
-<window>
- <id>557314</id>
- <defaultcontrol>10</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <type>image</type>
- <id>0</id>
- <posX>177</posX>
- <posY>225</posY>
- <width>409</width>
- <height>202</height>
- <texture>dialog_background.png</texture>
- </control>
- <control>
- <description>dialog Heading</description>
- <type>label</type>
- <id>2</id>
- <posX>190</posX>
- <posY>230</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 1</description>
- <type>label</type>
- <id>3</id>
- <posX>190</posX>
- <posY>260</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 2</description>
- <type>label</type>
- <id>4</id>
- <posX>190</posX>
- <posY>280</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>OK button</description>
- <type>button</type>
- <id>10</id>
- <posX>435</posX>
- <posY>355</posY>
- <textXOff>10</textXOff>
- <textYOff>7</textYOff>
- <width>105</width>
- <height>38</height>
- <textureFocus>small_button_focus.png</textureFocus>
- <textureNoFocus>small_button_nofocus.png</textureNoFocus>
- <label>186</label>
- <onleft>10</onleft>
- <onright>10</onright>
- <onup>10</onup>
- <ondown>10</ondown>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_textpreview.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_textpreview.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/BlueTwo/explorer_textpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,29 +0,0 @@
-<window>
- <id>557312</id>
- <defaultcontrol>2</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <type>textbox</type>
- <id>2</id>
- <posX>1</posX>
- <posY>1</posY>
- <width>700</width>
- <height>576</height>
- <font>font12</font>
- <textcolor>White</textcolor>
- <spinPosX>640</spinPosX>
- <spinPosY>560</spinPosY>
- </control>
- </controls>
-</window>
Copied: trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_dialog.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/MCE/explorer_dialog.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_dialog.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_dialog.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,46 @@
+<window>
+ <id>557316</id>
+ <defaultcontrol>10</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posX>177</posX>
+ <posY>225</posY>
+ <width>409</width>
+ <height>202</height>
+ <texture>dialog_background.png</texture>
+ </control>
+ <control>
+ <description>dialog Heading</description>
+ <type>label</type>
+ <id>2</id>
+ <posX>190</posX>
+ <posY>230</posY>
+ <label>0</label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 1</description>
+ <type>label</type>
+ <id>3</id>
+ <posX>190</posX>
+ <posY>260</posY>
+ <label>0</label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 2</description>
+ <type>label</type>
+ <id>4</id>
+ <posX>190</posX>
+ <posY>280</posY>
+ <label>0</label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_main.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/MCE/explorer_main.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_main.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_main.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,112 @@
+<window>
+ <id>557311</id>
+ <defaultcontrol>1</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>5</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <description>Menu left</description>
+ <type>button</type>
+ <id>1</id>
+ <posX>1</posX>
+ <posY>1</posY>
+ <label>Menu left</label>
+ <onleft>1</onleft>
+ <onright>2</onright>
+ <onup>1</onup>
+ <ondown>3</ondown>
+ </control>
+ <control>
+ <description>Menu right</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>352</posX>
+ <posY>1</posY>
+ <label>Menu right</label>
+ <onleft>1</onleft>
+ <onright>2</onright>
+ <onup>2</onup>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <description>file listcontrol</description>
+ <type>listcontrol</type>
+ <id>3</id>
+ <posX>1</posX>
+ <posY>55</posY>
+ <height>500</height>
+ <width>350</width>
+ <onright>4</onright>
+ <onleft>1</onleft>
+ <onup>3</onup>
+ <ondown>3</ondown>
+ <spinPosX>240</spinPosX>
+ </control>
+ <control>
+ <description>file listcontrol</description>
+ <type>listcontrol</type>
+ <id>4</id>
+ <posX>352</posX>
+ <posY>55</posY>
+ <height>500</height>
+ <width>350</width>
+ <onright>2</onright>
+ <onleft>3</onleft>
+ <onup>4</onup>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <description>label left</description>
+ <type>label</type>
+ <id>6</id>
+ <posX>1</posX>
+ <posY>500</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ <control>
+ <description>label right</description>
+ <type>label</type>
+ <id>7</id>
+ <posX>352</posX>
+ <posY>500</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ <control>
+ <description>labeldir left</description>
+ <type>label</type>
+ <id>9</id>
+ <posX>1</posX>
+ <posY>35</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ <control>
+ <description>labeldir right</description>
+ <type>label</type>
+ <id>10</id>
+ <posX>352</posX>
+ <posY>36</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_modulepreview.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/MCE/explorer_modulepreview.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_modulepreview.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_modulepreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,64 @@
+<window>
+ <id>557313</id>
+ <defaultcontrol>10</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posX>177</posX>
+ <posY>225</posY>
+ <width>409</width>
+ <height>202</height>
+ <texture>dialog_background.png</texture>
+ </control>
+ <control>
+ <description>dialog Heading</description>
+ <type>label</type>
+ <id>2</id>
+ <posX>190</posX>
+ <posY>230</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 1</description>
+ <type>label</type>
+ <id>3</id>
+ <posX>190</posX>
+ <posY>260</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 2</description>
+ <type>label</type>
+ <id>4</id>
+ <posX>190</posX>
+ <posY>280</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>OK button</description>
+ <type>button</type>
+ <id>10</id>
+ <posX>435</posX>
+ <posY>355</posY>
+ <textXOff>10</textXOff>
+ <textYOff>7</textYOff>
+ <width>105</width>
+ <height>38</height>
+ <textureFocus>small_button_focus.png</textureFocus>
+ <textureNoFocus>small_button_nofocus.png</textureNoFocus>
+ <label>186</label>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_musicpreview.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/MCE/explorer_musicpreview.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_musicpreview.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_musicpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,64 @@
+<window>
+ <id>557314</id>
+ <defaultcontrol>10</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posX>177</posX>
+ <posY>225</posY>
+ <width>409</width>
+ <height>202</height>
+ <texture>dialog_background.png</texture>
+ </control>
+ <control>
+ <description>dialog Heading</description>
+ <type>label</type>
+ <id>2</id>
+ <posX>190</posX>
+ <posY>230</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 1</description>
+ <type>label</type>
+ <id>3</id>
+ <posX>190</posX>
+ <posY>260</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 2</description>
+ <type>label</type>
+ <id>4</id>
+ <posX>190</posX>
+ <posY>280</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>OK button</description>
+ <type>button</type>
+ <id>10</id>
+ <posX>435</posX>
+ <posY>355</posY>
+ <textXOff>10</textXOff>
+ <textYOff>7</textYOff>
+ <width>105</width>
+ <height>38</height>
+ <textureFocus>small_button_focus.png</textureFocus>
+ <textureNoFocus>small_button_nofocus.png</textureNoFocus>
+ <label>186</label>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_textpreview.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/MCE/explorer_textpreview.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_textpreview.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/MCE/FileExplorer_textpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,29 @@
+<window>
+ <id>557312</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <type>textbox</type>
+ <id>2</id>
+ <posX>1</posX>
+ <posY>1</posY>
+ <width>700</width>
+ <height>576</height>
+ <font>font12</font>
+ <textcolor>White</textcolor>
+ <spinPosX>640</spinPosX>
+ <spinPosY>560</spinPosY>
+ </control>
+ </controls>
+</window>
Deleted: trunk/plugins/file explorer/Release/Skin/MCE/explorer_dialog.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/MCE/explorer_dialog.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/MCE/explorer_dialog.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,46 +0,0 @@
-<window>
- <id>557316</id>
- <defaultcontrol>10</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <type>image</type>
- <id>0</id>
- <posX>177</posX>
- <posY>225</posY>
- <width>409</width>
- <height>202</height>
- <texture>dialog_background.png</texture>
- </control>
- <control>
- <description>dialog Heading</description>
- <type>label</type>
- <id>2</id>
- <posX>190</posX>
- <posY>230</posY>
- <label>0</label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 1</description>
- <type>label</type>
- <id>3</id>
- <posX>190</posX>
- <posY>260</posY>
- <label>0</label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 2</description>
- <type>label</type>
- <id>4</id>
- <posX>190</posX>
- <posY>280</posY>
- <label>0</label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/MCE/explorer_main.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/MCE/explorer_main.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/MCE/explorer_main.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,112 +0,0 @@
-<window>
- <id>557311</id>
- <defaultcontrol>1</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>5</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <description>Menu left</description>
- <type>button</type>
- <id>1</id>
- <posX>1</posX>
- <posY>1</posY>
- <label>Menu left</label>
- <onleft>1</onleft>
- <onright>2</onright>
- <onup>1</onup>
- <ondown>3</ondown>
- </control>
- <control>
- <description>Menu right</description>
- <type>button</type>
- <id>2</id>
- <posX>352</posX>
- <posY>1</posY>
- <label>Menu right</label>
- <onleft>1</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>4</ondown>
- </control>
- <control>
- <description>file listcontrol</description>
- <type>listcontrol</type>
- <id>3</id>
- <posX>1</posX>
- <posY>55</posY>
- <height>500</height>
- <width>350</width>
- <onright>4</onright>
- <onleft>1</onleft>
- <onup>3</onup>
- <ondown>3</ondown>
- <spinPosX>240</spinPosX>
- </control>
- <control>
- <description>file listcontrol</description>
- <type>listcontrol</type>
- <id>4</id>
- <posX>352</posX>
- <posY>55</posY>
- <height>500</height>
- <width>350</width>
- <onright>2</onright>
- <onleft>3</onleft>
- <onup>4</onup>
- <ondown>4</ondown>
- </control>
- <control>
- <description>label left</description>
- <type>label</type>
- <id>6</id>
- <posX>1</posX>
- <posY>500</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- <control>
- <description>label right</description>
- <type>label</type>
- <id>7</id>
- <posX>352</posX>
- <posY>500</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- <control>
- <description>labeldir left</description>
- <type>label</type>
- <id>9</id>
- <posX>1</posX>
- <posY>35</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- <control>
- <description>labeldir right</description>
- <type>label</type>
- <id>10</id>
- <posX>352</posX>
- <posY>36</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/MCE/explorer_modulepreview.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/MCE/explorer_modulepreview.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/MCE/explorer_modulepreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,64 +0,0 @@
-<window>
- <id>557313</id>
- <defaultcontrol>10</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <type>image</type>
- <id>0</id>
- <posX>177</posX>
- <posY>225</posY>
- <width>409</width>
- <height>202</height>
- <texture>dialog_background.png</texture>
- </control>
- <control>
- <description>dialog Heading</description>
- <type>label</type>
- <id>2</id>
- <posX>190</posX>
- <posY>230</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 1</description>
- <type>label</type>
- <id>3</id>
- <posX>190</posX>
- <posY>260</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 2</description>
- <type>label</type>
- <id>4</id>
- <posX>190</posX>
- <posY>280</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>OK button</description>
- <type>button</type>
- <id>10</id>
- <posX>435</posX>
- <posY>355</posY>
- <textXOff>10</textXOff>
- <textYOff>7</textYOff>
- <width>105</width>
- <height>38</height>
- <textureFocus>small_button_focus.png</textureFocus>
- <textureNoFocus>small_button_nofocus.png</textureNoFocus>
- <label>186</label>
- <onleft>10</onleft>
- <onright>10</onright>
- <onup>10</onup>
- <ondown>10</ondown>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/MCE/explorer_musicpreview.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/MCE/explorer_musicpreview.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/MCE/explorer_musicpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,64 +0,0 @@
-<window>
- <id>557314</id>
- <defaultcontrol>10</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <type>image</type>
- <id>0</id>
- <posX>177</posX>
- <posY>225</posY>
- <width>409</width>
- <height>202</height>
- <texture>dialog_background.png</texture>
- </control>
- <control>
- <description>dialog Heading</description>
- <type>label</type>
- <id>2</id>
- <posX>190</posX>
- <posY>230</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 1</description>
- <type>label</type>
- <id>3</id>
- <posX>190</posX>
- <posY>260</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 2</description>
- <type>label</type>
- <id>4</id>
- <posX>190</posX>
- <posY>280</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>OK button</description>
- <type>button</type>
- <id>10</id>
- <posX>435</posX>
- <posY>355</posY>
- <textXOff>10</textXOff>
- <textYOff>7</textYOff>
- <width>105</width>
- <height>38</height>
- <textureFocus>small_button_focus.png</textureFocus>
- <textureNoFocus>small_button_nofocus.png</textureNoFocus>
- <label>186</label>
- <onleft>10</onleft>
- <onright>10</onright>
- <onup>10</onup>
- <ondown>10</ondown>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/MCE/explorer_textpreview.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/MCE/explorer_textpreview.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/MCE/explorer_textpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,29 +0,0 @@
-<window>
- <id>557312</id>
- <defaultcontrol>2</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <type>textbox</type>
- <id>2</id>
- <posX>1</posX>
- <posY>1</posY>
- <width>700</width>
- <height>576</height>
- <font>font12</font>
- <textcolor>White</textcolor>
- <spinPosX>640</spinPosX>
- <spinPosY>560</spinPosY>
- </control>
- </controls>
-</window>
Copied: trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_dialog.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/Project X/explorer_dialog.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_dialog.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_dialog.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,46 @@
+<window>
+ <id>557316</id>
+ <defaultcontrol>10</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posX>177</posX>
+ <posY>225</posY>
+ <width>409</width>
+ <height>202</height>
+ <texture>dialog_background.png</texture>
+ </control>
+ <control>
+ <description>dialog Heading</description>
+ <type>label</type>
+ <id>2</id>
+ <posX>190</posX>
+ <posY>230</posY>
+ <label>0</label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 1</description>
+ <type>label</type>
+ <id>3</id>
+ <posX>190</posX>
+ <posY>260</posY>
+ <label>0</label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 2</description>
+ <type>label</type>
+ <id>4</id>
+ <posX>190</posX>
+ <posY>280</posY>
+ <label>0</label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_main.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/Project X/explorer_main.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_main.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_main.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,112 @@
+<window>
+ <id>557311</id>
+ <defaultcontrol>1</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>5</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <description>Menu left</description>
+ <type>button</type>
+ <id>1</id>
+ <posX>1</posX>
+ <posY>1</posY>
+ <label>Menu left</label>
+ <onleft>1</onleft>
+ <onright>2</onright>
+ <onup>1</onup>
+ <ondown>3</ondown>
+ </control>
+ <control>
+ <description>Menu right</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>352</posX>
+ <posY>1</posY>
+ <label>Menu right</label>
+ <onleft>1</onleft>
+ <onright>2</onright>
+ <onup>2</onup>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <description>file listcontrol</description>
+ <type>listcontrol</type>
+ <id>3</id>
+ <posX>1</posX>
+ <posY>55</posY>
+ <height>500</height>
+ <width>350</width>
+ <onright>4</onright>
+ <onleft>1</onleft>
+ <onup>3</onup>
+ <ondown>3</ondown>
+ <spinPosX>240</spinPosX>
+ </control>
+ <control>
+ <description>file listcontrol</description>
+ <type>listcontrol</type>
+ <id>4</id>
+ <posX>352</posX>
+ <posY>55</posY>
+ <height>500</height>
+ <width>350</width>
+ <onright>2</onright>
+ <onleft>3</onleft>
+ <onup>4</onup>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <description>label left</description>
+ <type>label</type>
+ <id>6</id>
+ <posX>1</posX>
+ <posY>500</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ <control>
+ <description>label right</description>
+ <type>label</type>
+ <id>7</id>
+ <posX>352</posX>
+ <posY>500</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ <control>
+ <description>labeldir left</description>
+ <type>label</type>
+ <id>9</id>
+ <posX>1</posX>
+ <posY>35</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ <control>
+ <description>labeldir right</description>
+ <type>label</type>
+ <id>10</id>
+ <posX>352</posX>
+ <posY>36</posY>
+ <label>Test</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_modulepreview.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/Project X/explorer_modulepreview.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_modulepreview.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_modulepreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,64 @@
+<window>
+ <id>557313</id>
+ <defaultcontrol>10</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posX>177</posX>
+ <posY>225</posY>
+ <width>409</width>
+ <height>202</height>
+ <texture>dialog_background.png</texture>
+ </control>
+ <control>
+ <description>dialog Heading</description>
+ <type>label</type>
+ <id>2</id>
+ <posX>190</posX>
+ <posY>230</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 1</description>
+ <type>label</type>
+ <id>3</id>
+ <posX>190</posX>
+ <posY>260</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 2</description>
+ <type>label</type>
+ <id>4</id>
+ <posX>190</posX>
+ <posY>280</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>OK button</description>
+ <type>button</type>
+ <id>10</id>
+ <posX>435</posX>
+ <posY>355</posY>
+ <textXOff>10</textXOff>
+ <textYOff>7</textYOff>
+ <width>105</width>
+ <height>38</height>
+ <textureFocus>small_button_focus.png</textureFocus>
+ <textureNoFocus>small_button_nofocus.png</textureNoFocus>
+ <label>186</label>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_musicpreview.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/Project X/explorer_musicpreview.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_musicpreview.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_musicpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,64 @@
+<window>
+ <id>557314</id>
+ <defaultcontrol>10</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posX>177</posX>
+ <posY>225</posY>
+ <width>409</width>
+ <height>202</height>
+ <texture>dialog_background.png</texture>
+ </control>
+ <control>
+ <description>dialog Heading</description>
+ <type>label</type>
+ <id>2</id>
+ <posX>190</posX>
+ <posY>230</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 1</description>
+ <type>label</type>
+ <id>3</id>
+ <posX>190</posX>
+ <posY>260</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>dialog line 2</description>
+ <type>label</type>
+ <id>4</id>
+ <posX>190</posX>
+ <posY>280</posY>
+ <label></label>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>OK button</description>
+ <type>button</type>
+ <id>10</id>
+ <posX>435</posX>
+ <posY>355</posY>
+ <textXOff>10</textXOff>
+ <textYOff>7</textYOff>
+ <width>105</width>
+ <height>38</height>
+ <textureFocus>small_button_focus.png</textureFocus>
+ <textureNoFocus>small_button_nofocus.png</textureNoFocus>
+ <label>186</label>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ </control>
+ </controls>
+</window>
Copied: trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_textpreview.xml (from rev 826, trunk/plugins/file explorer/Release/Skin/Project X/explorer_textpreview.xml)
===================================================================
--- trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_textpreview.xml (rev 0)
+++ trunk/plugins/file explorer/Release/Skin/Project X/FileExplorer_textpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -0,0 +1,29 @@
+<window>
+ <id>557312</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <type>textbox</type>
+ <id>2</id>
+ <posX>1</posX>
+ <posY>1</posY>
+ <width>700</width>
+ <height>576</height>
+ <font>font12</font>
+ <textcolor>White</textcolor>
+ <spinPosX>640</spinPosX>
+ <spinPosY>560</spinPosY>
+ </control>
+ </controls>
+</window>
Deleted: trunk/plugins/file explorer/Release/Skin/Project X/explorer_dialog.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/Project X/explorer_dialog.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/Project X/explorer_dialog.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,46 +0,0 @@
-<window>
- <id>557316</id>
- <defaultcontrol>10</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <type>image</type>
- <id>0</id>
- <posX>177</posX>
- <posY>225</posY>
- <width>409</width>
- <height>202</height>
- <texture>dialog_background.png</texture>
- </control>
- <control>
- <description>dialog Heading</description>
- <type>label</type>
- <id>2</id>
- <posX>190</posX>
- <posY>230</posY>
- <label>0</label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 1</description>
- <type>label</type>
- <id>3</id>
- <posX>190</posX>
- <posY>260</posY>
- <label>0</label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 2</description>
- <type>label</type>
- <id>4</id>
- <posX>190</posX>
- <posY>280</posY>
- <label>0</label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/Project X/explorer_main.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/Project X/explorer_main.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/Project X/explorer_main.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,112 +0,0 @@
-<window>
- <id>557311</id>
- <defaultcontrol>1</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>5</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <description>Menu left</description>
- <type>button</type>
- <id>1</id>
- <posX>1</posX>
- <posY>1</posY>
- <label>Menu left</label>
- <onleft>1</onleft>
- <onright>2</onright>
- <onup>1</onup>
- <ondown>3</ondown>
- </control>
- <control>
- <description>Menu right</description>
- <type>button</type>
- <id>2</id>
- <posX>352</posX>
- <posY>1</posY>
- <label>Menu right</label>
- <onleft>1</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>4</ondown>
- </control>
- <control>
- <description>file listcontrol</description>
- <type>listcontrol</type>
- <id>3</id>
- <posX>1</posX>
- <posY>55</posY>
- <height>500</height>
- <width>350</width>
- <onright>4</onright>
- <onleft>1</onleft>
- <onup>3</onup>
- <ondown>3</ondown>
- <spinPosX>240</spinPosX>
- </control>
- <control>
- <description>file listcontrol</description>
- <type>listcontrol</type>
- <id>4</id>
- <posX>352</posX>
- <posY>55</posY>
- <height>500</height>
- <width>350</width>
- <onright>2</onright>
- <onleft>3</onleft>
- <onup>4</onup>
- <ondown>4</ondown>
- </control>
- <control>
- <description>label left</description>
- <type>label</type>
- <id>6</id>
- <posX>1</posX>
- <posY>500</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- <control>
- <description>label right</description>
- <type>label</type>
- <id>7</id>
- <posX>352</posX>
- <posY>500</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- <control>
- <description>labeldir left</description>
- <type>label</type>
- <id>9</id>
- <posX>1</posX>
- <posY>35</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- <control>
- <description>labeldir right</description>
- <type>label</type>
- <id>10</id>
- <posX>352</posX>
- <posY>36</posY>
- <label>Test</label>
- <font>font10</font>
- <align>left</align>
- <textcolor>White</textcolor>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/Project X/explorer_modulepreview.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/Project X/explorer_modulepreview.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/Project X/explorer_modulepreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,64 +0,0 @@
-<window>
- <id>557313</id>
- <defaultcontrol>10</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <type>image</type>
- <id>0</id>
- <posX>177</posX>
- <posY>225</posY>
- <width>409</width>
- <height>202</height>
- <texture>dialog_background.png</texture>
- </control>
- <control>
- <description>dialog Heading</description>
- <type>label</type>
- <id>2</id>
- <posX>190</posX>
- <posY>230</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 1</description>
- <type>label</type>
- <id>3</id>
- <posX>190</posX>
- <posY>260</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 2</description>
- <type>label</type>
- <id>4</id>
- <posX>190</posX>
- <posY>280</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>OK button</description>
- <type>button</type>
- <id>10</id>
- <posX>435</posX>
- <posY>355</posY>
- <textXOff>10</textXOff>
- <textYOff>7</textYOff>
- <width>105</width>
- <height>38</height>
- <textureFocus>small_button_focus.png</textureFocus>
- <textureNoFocus>small_button_nofocus.png</textureNoFocus>
- <label>186</label>
- <onleft>10</onleft>
- <onright>10</onright>
- <onup>10</onup>
- <ondown>10</ondown>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/Project X/explorer_musicpreview.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/Project X/explorer_musicpreview.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/Project X/explorer_musicpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,64 +0,0 @@
-<window>
- <id>557314</id>
- <defaultcontrol>10</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <type>image</type>
- <id>0</id>
- <posX>177</posX>
- <posY>225</posY>
- <width>409</width>
- <height>202</height>
- <texture>dialog_background.png</texture>
- </control>
- <control>
- <description>dialog Heading</description>
- <type>label</type>
- <id>2</id>
- <posX>190</posX>
- <posY>230</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 1</description>
- <type>label</type>
- <id>3</id>
- <posX>190</posX>
- <posY>260</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>dialog line 2</description>
- <type>label</type>
- <id>4</id>
- <posX>190</posX>
- <posY>280</posY>
- <label></label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>OK button</description>
- <type>button</type>
- <id>10</id>
- <posX>435</posX>
- <posY>355</posY>
- <textXOff>10</textXOff>
- <textYOff>7</textYOff>
- <width>105</width>
- <height>38</height>
- <textureFocus>small_button_focus.png</textureFocus>
- <textureNoFocus>small_button_nofocus.png</textureNoFocus>
- <label>186</label>
- <onleft>10</onleft>
- <onright>10</onright>
- <onup>10</onup>
- <ondown>10</ondown>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/file explorer/Release/Skin/Project X/explorer_textpreview.xml
===================================================================
--- trunk/plugins/file explorer/Release/Skin/Project X/explorer_textpreview.xml 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Release/Skin/Project X/explorer_textpreview.xml 2007-08-11 06:03:06 UTC (rev 827)
@@ -1,29 +0,0 @@
-<window>
- <id>557312</id>
- <defaultcontrol>2</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <type>textbox</type>
- <id>2</id>
- <posX>1</posX>
- <posY>1</posY>
- <width>700</width>
- <height>576</height>
- <font>font12</font>
- <textcolor>White</textcolor>
- <spinPosX>640</spinPosX>
- <spinPosY>560</spinPosY>
- </control>
- </controls>
-</window>
Modified: trunk/plugins/file explorer/Source/AssemblyInfo.cs
===================================================================
--- trunk/plugins/file explorer/Source/AssemblyInfo.cs 2007-08-10 13:20:20 UTC (rev 826)
+++ trunk/plugins/file explorer/Source/AssemblyInfo.cs 2007-08-11 06:03:06 UTC (rev 827)
@@ -8,11 +8,11 @@
// change them to the information which is associated with the assembly
// you compile.
-[assembly: AssemblyTitle("Explorer")]
+[assembly: AssemblyTitle("FileE...
[truncated message content] |
|
From: <rs...@us...> - 2007-08-10 13:20:29
|
Revision: 826
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=826&view=rev
Author: rsparey
Date: 2007-08-10 06:20:20 -0700 (Fri, 10 Aug 2007)
Log Message:
-----------
working on tv search page.. now menu drops down, as well as tabbing across, as this makes more sense when using a remote to control the search buttons (which require right to left navigation)
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml 2007-08-10 10:46:08 UTC (rev 825)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml 2007-08-10 13:20:20 UTC (rev 826)
@@ -108,6 +108,8 @@
<textcolor>FFFFFFFF</textcolor>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
+ <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
</control>
<control>
<description>Selected item Label</description>
@@ -122,6 +124,8 @@
<textcolor>ffffffff</textcolor>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
+ <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
</control>
<control>
@@ -210,76 +214,16 @@
<width>209</width>
<height>36</height>
<onleft>5</onleft>
- <onright>7</onright>
+ <onright>2</onright>
<onup>22</onup>
- <ondown>10</ondown>
+ <ondown>7</ondown>
<textureFocus>tab_toggleon_focus.png</textureFocus>
<textureNoFocus>tab_toggleon_nofocus.png</textureNoFocus>
<AltTextureFocus>tab_toggleoff_focus.png</AltTextureFocus>
<AltTextureNoFocus>tab_toggleoff_noficus.png</AltTextureNoFocus>
</control>
- <control>
- <description>Letter Button</description>
- <type>selectbutton</type>
- <id>7</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">WindowOpen</animation>
- <animation effect="fade" time="400" delay="100">WindowOpen</animation>
-
- <posY>155</posY>
- <posX>848</posX>
- <label>872</label>
- <font>font10</font>
- <width>209</width>
- <height>36</height>
- <onleft>6</onleft>
- <onright>8</onright>
- <onup>6</onup>
- <ondown>8</ondown>
- <textureFocus>tab_down.png</textureFocus>
- <textureNoFocus>tab_up.png</textureNoFocus>
-
- <texturebg>tab_down.png</texturebg>
- <textureLeft>arrow_round_left_nofocus.png</textureLeft>
- <textureLeftFocus>arrow_round_left_focus.png</textureLeftFocus>
- <textureRight>arrow_round_right_nofocus.png</textureRight>
- <textureRightFocus>arrow_round_right_focus.png</textureRightFocus>
-
-
- </control>
-
- <control>
- <description>TITLE Button</description>
- <type>selectbutton</type>
- <id>8</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">WindowOpen</animation>
- <animation effect="fade" time="400" delay="100">WindowOpen</animation>
-
- <posY>155</posY>
- <posX>1057</posX>
- <label>873</label>
- <font>font10</font>
- <width>209</width>
- <height>36</height>
- <onleft>7</onleft>
- <onright>2</onright>
- <onup>7</onup>
- <ondown>2</ondown>
- <textureFocus>tab_down.png</textureFocus>
- <textureNoFocus>tab_up.png</textureNoFocus>
-
- <texturebg>tab_down.png</texturebg>
- <textureLeft>arrow_round_left_nofocus.png</textureLeft>
- <textureLeftFocus>arrow_round_left_focus.png</textureLeftFocus>
- <textureRight>arrow_round_right_nofocus.png</textureRight>
- <textureRightFocus>arrow_round_right_focus.png</textureRightFocus>
-
-
- </control>
-
-
+
<control>
<description>Grey Background</description>
<type>image</type>
@@ -304,9 +248,9 @@
<type>listcontrol</type>
<id>10</id>
<onleft>2</onleft>
- <onright>11</onright>
+ <onright>2</onright>
<onup>2</onup>
- <ondown>2</ondown>
+ <ondown>22</ondown>
<textcolor>FFFFFFFF</textcolor>
</control>
<control>
@@ -321,7 +265,7 @@
<height>493</height>
<textXOff>18</textXOff>
<textYOff>2</textYOff>
- <textXOff2>796</textXOff2>
+ <textXOff2>400</textXOff2>
<textYOff2>38</textYOff2>
<textXOff3>189</textXOff3>
<textYOff3>38</textYOff3>
@@ -358,6 +302,8 @@
<textcolor>FFFFFFFF</textcolor>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
+ <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
</control>
<control>
<description>Current program time</description>
@@ -371,6 +317,9 @@
<textcolor>FFB2D4F5</textcolor>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
+ <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+
</control>
<control>
<description>Description1</description>
@@ -385,6 +334,8 @@
<textcolor>FFFFFFFF</textcolor>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
+ <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
</control>
<control>
<description>genre</description>
@@ -398,8 +349,95 @@
<textcolor>FFB2D4F5</textcolor>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
+ <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
</control>
+ <control>
+ <description>Letter Button</description>
+ <type>selectbutton</type>
+ <id>7</id>
+ <posY>155</posY>
+ <posX>639</posX>
+ <label>872</label>
+ <font>font10</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>6</onleft>
+ <onright>2</onright>
+ <onup>6</onup>
+ <ondown>8</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+
+ <texturebg>tab_down.png</texturebg>
+ <textureLeft>arrow_round_left_nofocus.png</textureLeft>
+ <textureLeftFocus>arrow_round_left_focus.png</textureLeftFocus>
+ <textureRight>arrow_round_right_nofocus.png</textureRight>
+ <textureRightFocus>arrow_round_right_focus.png</textureRightFocus>
+ <visible>Control.HasFocus(6)|Control.HasFocus(7)|Control.HasFocus(8)|Control.HasFocus(9)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+
+
+ </control>
+
+ <control>
+ <description>TITLE Button</description>
+ <type>selectbutton</type>
+ <id>8</id>
+
+
+ <posY>191</posY>
+ <posX>639</posX>
+ <label>873</label>
+ <font>font10</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>7</onleft>
+ <onright>2</onright>
+ <onup>7</onup>
+ <ondown>9</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+
+ <texturebg>tab_down.png</texturebg>
+ <textureLeft>arrow_round_left_nofocus.png</textureLeft>
+ <textureLeftFocus>arrow_round_left_focus.png</textureLeftFocus>
+ <textureRight>arrow_round_right_nofocus.png</textureRight>
+ <textureRightFocus>arrow_round_right_focus.png</textureRightFocus>
+ <visible>Control.HasFocus(7)|Control.HasFocus(8)|Control.HasFocus(9)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+
+
+ </control>
+
+ <control>
+ <description>Episode button</description>
+ <type>selectbutton</type>
+ <id>9</id>
+ <posY>227</posY>
+ <posX>639</posX>
+ <label>874</label>
+ <font>font10</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>8</onleft>
+ <onright>2</onright>
+ <onup>8</onup>
+ <ondown>11</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <visible>Control.HasFocus(8)|Control.HasFocus(9)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <texturebg>tab_down.png</texturebg>
+ <textureLeft>arrow_round_left_nofocus.png</textureLeft>
+ <textureLeftFocus>arrow_round_left_focus.png</textureLeftFocus>
+ <textureRight>arrow_round_right_nofocus.png</textureRight>
+ <textureRightFocus>arrow_round_right_focus.png</textureRightFocus>
+ </control>
</controls>
</window>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nor...@us...> - 2007-08-10 10:46:10
|
Revision: 825
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=825&view=rev
Author: northern_sky
Date: 2007-08-10 03:46:08 -0700 (Fri, 10 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/README.txt
Modified: trunk/plugins/myGUIProgramsAlt/README.txt
===================================================================
--- trunk/plugins/myGUIProgramsAlt/README.txt 2007-08-10 10:44:20 UTC (rev 824)
+++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-08-10 10:46:08 UTC (rev 825)
@@ -41,7 +41,7 @@
ConfigurationTool redesign:
- InfoScraperForm redesign -> first redesign done, still needs some work
- - Appsettingsrootform: do not use inheritance, make this individual, so we easily can add global-options etc.
+ - Appsettingsrootform: do not use inheritance, make this individual, so we easily can add global-options etc. CHEFKOCH working on this
- Dynamic checkbox list in the different filesview, allow us to "plugin" as many options we want for a special appitem
@@ -49,9 +49,6 @@
- [low] genre: thumbs for genre, for example it could be created on AllGame lookup, for first file with this genre
-Genre:
- - Change to genre/categoryinstead.
-
---------------------
.: Things to clear :.
---------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nor...@us...> - 2007-08-10 10:44:22
|
Revision: 824
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=824&view=rev
Author: northern_sky
Date: 2007-08-10 03:44:20 -0700 (Fri, 10 Aug 2007)
Log Message:
-----------
added dbstuff,renamed genre, some minor change.please reinit views xmlfiles and db,recopy skin
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.resx
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/AllGameScraper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItemInfo.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAltFileInfo.xml
trunk/plugins/myGUIProgramsAlt/README.txt
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -159,9 +159,9 @@
ExecuteStmtNonQuery(sqlStmt);
- sqlStmt = @"CREATE TABLE tblFileItem (fileid INTEGER PRIMARY KEY, applicationId INTEGER, title TEXT, filename TEXT, imagefile TEXT, mainGenreId INTEGER, subGenreId INTEGER, country TEXT, manufacturerId INTEGER, year INTEGER, rating INTEGER, overview TEXT, platformId INTEGER, lastTimeLaunched TEXT, launchcount INTEGER, categorydata TEXT, gameInfoUrl TEXT)";
+ sqlStmt = @"CREATE TABLE tblFileItem (fileid INTEGER PRIMARY KEY, applicationId INTEGER, title TEXT, filename TEXT, imagefile TEXT, genreId INTEGER, genreStyleId INTEGER, country TEXT, manufacturerId INTEGER, year INTEGER, rating INTEGER, overview TEXT, platformId INTEGER, lastTimeLaunched TEXT, launchcount INTEGER, categorydata TEXT, gameInfoUrl TEXT)";
ExecuteStmtNonQuery(sqlStmt);
- sqlStmt = @"CREATE TABLE tblFilterItem (applicationId INTEGER, grouperAppID INTEGER, fileID INTEGER, filename TEXT, tag INTEGER)";
+ sqlStmt = @"CREATE TABLE tblFileLinkItem (applicationId INTEGER, grouperAppID INTEGER, fileID INTEGER, filename TEXT, updateFlag INTEGER)";
ExecuteStmtNonQuery(sqlStmt);
sqlStmt = @"CREATE TABLE tblSetting (settingid INTEGER PRIMARY KEY, key TEXT, value TEXT)";
ExecuteStmtNonQuery(sqlStmt);
@@ -192,7 +192,7 @@
ExecuteStmtNonQuery(sqlStmt);
sqlStmt = @"CREATE INDEX idxApp1 ON tblApplicationItem(fatherNodeId)";
ExecuteStmtNonQuery(sqlStmt);
- sqlStmt = @"CREATE UNIQUE INDEX idxFilterItem1 ON tblFilterItem(applicationId, fileID, grouperAppID)";
+ sqlStmt = @"CREATE UNIQUE INDEX idxFilterItem1 ON tblFileLinkItem(applicationId, fileID, grouperAppID)";
ExecuteStmtNonQuery(sqlStmt);
return true;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -107,7 +107,6 @@
this.Name = "AppSettingsFilesImportProgress";
this.Load += new System.EventHandler(this.AppFilesImportProgress_Load);
this.Controls.SetChildIndex(this.prePostButton, 0);
- this.Controls.SetChildIndex(this.winTypeLabel, 0);
this.Controls.SetChildIndex(this.enabledCheckbox, 0);
this.Controls.SetChildIndex(this.titleLabel, 0);
this.Controls.SetChildIndex(this.applicationExeLabel, 0);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -51,7 +51,7 @@
private void AppFilesImportProgress_Load(object sender, EventArgs e)
{
enabledCheckbox.Visible = false;
- winTypeLabel.Text = "Import running.....";
+ informationLabel.Text = "Import running.....";
titleLabel.Visible = false;
titleTextBox.Visible = false;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -227,7 +227,7 @@
private void AddItem()
{
FileItem file = new FileItem();
- file.AppID = currentApplication.AppID; // CRUCIAL!! :-)
+ file.AppID = currentApplication.ApplicationItemId; // CRUCIAL!! :-)
FileDetailsForm frmFileDetails = new FileDetailsForm();
frmFileDetails.CurApp = currentApplication;
frmFileDetails.CurFile = file;
@@ -235,14 +235,14 @@
if (dialogResult == DialogResult.OK)
{
file.Write();
- currentApplication.ItemLoad(currentApplication.AppID, "");
+ currentApplication.ItemLoad(currentApplication.ApplicationItemId, "");
SyncListView();
}
}
private void ChangeFilePath(string NewPath)
{
- currentApplication.ItemLoad(currentApplication.AppID, NewPath);
+ currentApplication.ItemLoad(currentApplication.ApplicationItemId, NewPath);
SyncListView();
}
@@ -260,7 +260,7 @@
if (dialogResult == DialogResult.OK)
{
file.Write();
- currentApplication.ItemLoad(currentApplication.AppID, "");
+ currentApplication.ItemLoad(currentApplication.ApplicationItemId, "");
SyncListView();
}
}
@@ -311,7 +311,7 @@
}
}
}
- currentApplication.ItemLoad(currentApplication.AppID, "");
+ currentApplication.ItemLoad(currentApplication.ApplicationItemId, "");
SyncListView();
}
@@ -550,7 +550,7 @@
if (app is ApplicationItemGrouper)
{
ApplicationItemGrouper appi = (ApplicationItemGrouper) app;
- if (appi.AppID == GrouperAppID)
+ if (appi.ApplicationItemId == GrouperAppID)
{
appi.LoadFiles();
}
@@ -567,7 +567,7 @@
if (app.SourceType == ItemType.GROUPER)
{
ToolStripMenuItem newMenu = new ToolStripMenuItem(app.Title);
- newMenu.Tag = app.AppID;
+ newMenu.Tag = app.ApplicationItemId;
newMenu.Click += new EventHandler(this.FavouriteGrouperItem_Click);
this.contextFavouritesMenuStrip.Items.Add(newMenu);
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -29,7 +29,6 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- this.winTypeLabel = new System.Windows.Forms.Label();
this.enabledCheckbox = new System.Windows.Forms.CheckBox();
this.titleLabel = new System.Windows.Forms.Label();
this.applicationExeLabel = new System.Windows.Forms.Label();
@@ -59,29 +58,19 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
this.SuspendLayout();
//
- // winTypeLabel
- //
- this.winTypeLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.winTypeLabel.Location = new System.Drawing.Point(3, 6);
- this.winTypeLabel.Name = "winTypeLabel";
- this.winTypeLabel.Size = new System.Drawing.Size(331, 35);
- this.winTypeLabel.TabIndex = 0;
- this.winTypeLabel.Text = "WindowType";
- this.winTypeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
// enabledCheckbox
//
this.enabledCheckbox.AutoSize = true;
this.enabledCheckbox.Location = new System.Drawing.Point(427, 17);
this.enabledCheckbox.Name = "enabledCheckbox";
- this.enabledCheckbox.Size = new System.Drawing.Size(64, 17);
+ this.enabledCheckbox.Size = new System.Drawing.Size(65, 17);
this.enabledCheckbox.TabIndex = 1;
this.enabledCheckbox.Text = "Enabled";
this.enabledCheckbox.UseVisualStyleBackColor = true;
//
// titleLabel
//
- this.titleLabel.Location = new System.Drawing.Point(3, 44);
+ this.titleLabel.Location = new System.Drawing.Point(2, 71);
this.titleLabel.Name = "titleLabel";
this.titleLabel.Size = new System.Drawing.Size(93, 20);
this.titleLabel.TabIndex = 2;
@@ -90,7 +79,7 @@
//
// applicationExeLabel
//
- this.applicationExeLabel.Location = new System.Drawing.Point(3, 70);
+ this.applicationExeLabel.Location = new System.Drawing.Point(2, 97);
this.applicationExeLabel.Name = "applicationExeLabel";
this.applicationExeLabel.Size = new System.Drawing.Size(93, 20);
this.applicationExeLabel.TabIndex = 3;
@@ -100,16 +89,16 @@
// titleTextBox
//
this.titleTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.titleTextBox.Location = new System.Drawing.Point(94, 44);
+ this.titleTextBox.Location = new System.Drawing.Point(93, 71);
this.titleTextBox.Name = "titleTextBox";
- this.titleTextBox.Size = new System.Drawing.Size(325, 21);
+ this.titleTextBox.Size = new System.Drawing.Size(325, 20);
this.titleTextBox.TabIndex = 4;
this.titleTextBox.TextChanged += new System.EventHandler(this.titleTextBox_TextChanged);
//
// applicationExeButton
//
this.applicationExeButton.Image = global::GUIPrograms.Properties.Resources.browseButton_Image;
- this.applicationExeButton.Location = new System.Drawing.Point(427, 69);
+ this.applicationExeButton.Location = new System.Drawing.Point(426, 96);
this.applicationExeButton.Name = "applicationExeButton";
this.applicationExeButton.Size = new System.Drawing.Size(31, 23);
this.applicationExeButton.TabIndex = 6;
@@ -121,7 +110,7 @@
this.shellexecuteCheckBox.AutoSize = true;
this.shellexecuteCheckBox.Location = new System.Drawing.Point(7, 322);
this.shellexecuteCheckBox.Name = "shellexecuteCheckBox";
- this.shellexecuteCheckBox.Size = new System.Drawing.Size(87, 17);
+ this.shellexecuteCheckBox.Size = new System.Drawing.Size(88, 17);
this.shellexecuteCheckBox.TabIndex = 7;
this.shellexecuteCheckBox.Text = "ShellExecute";
this.shellexecuteCheckBox.UseVisualStyleBackColor = true;
@@ -132,14 +121,14 @@
this.waitExitCheckBox.AutoSize = true;
this.waitExitCheckBox.Location = new System.Drawing.Point(7, 368);
this.waitExitCheckBox.Name = "waitExitCheckBox";
- this.waitExitCheckBox.Size = new System.Drawing.Size(86, 17);
+ this.waitExitCheckBox.Size = new System.Drawing.Size(82, 17);
this.waitExitCheckBox.TabIndex = 8;
this.waitExitCheckBox.Text = "Wait for exit";
this.waitExitCheckBox.UseVisualStyleBackColor = true;
//
// applicationImageLabel
//
- this.applicationImageLabel.Location = new System.Drawing.Point(3, 97);
+ this.applicationImageLabel.Location = new System.Drawing.Point(2, 124);
this.applicationImageLabel.Name = "applicationImageLabel";
this.applicationImageLabel.Size = new System.Drawing.Size(93, 20);
this.applicationImageLabel.TabIndex = 11;
@@ -148,7 +137,7 @@
//
// applicationArgumentsLabel
//
- this.applicationArgumentsLabel.Location = new System.Drawing.Point(3, 123);
+ this.applicationArgumentsLabel.Location = new System.Drawing.Point(2, 150);
this.applicationArgumentsLabel.Name = "applicationArgumentsLabel";
this.applicationArgumentsLabel.Size = new System.Drawing.Size(93, 20);
this.applicationArgumentsLabel.TabIndex = 12;
@@ -158,24 +147,23 @@
// applicationImageTextBox
//
this.applicationImageTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.applicationImageTextBox.Location = new System.Drawing.Point(94, 97);
+ this.applicationImageTextBox.Location = new System.Drawing.Point(93, 124);
this.applicationImageTextBox.Name = "applicationImageTextBox";
- this.applicationImageTextBox.Size = new System.Drawing.Size(325, 21);
+ this.applicationImageTextBox.Size = new System.Drawing.Size(325, 20);
this.applicationImageTextBox.TabIndex = 13;
- this.applicationImageTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
this.applicationImageTextBox.TextChanged += new System.EventHandler(this.applicationImageTextBox_TextChanged);
//
// applicationArgumentsTextBox
//
this.applicationArgumentsTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.applicationArgumentsTextBox.Location = new System.Drawing.Point(94, 123);
+ this.applicationArgumentsTextBox.Location = new System.Drawing.Point(93, 150);
this.applicationArgumentsTextBox.Name = "applicationArgumentsTextBox";
- this.applicationArgumentsTextBox.Size = new System.Drawing.Size(325, 21);
+ this.applicationArgumentsTextBox.Size = new System.Drawing.Size(325, 20);
this.applicationArgumentsTextBox.TabIndex = 14;
//
// winStyleLabel
//
- this.winStyleLabel.Location = new System.Drawing.Point(3, 150);
+ this.winStyleLabel.Location = new System.Drawing.Point(2, 177);
this.winStyleLabel.Name = "winStyleLabel";
this.winStyleLabel.Size = new System.Drawing.Size(93, 20);
this.winStyleLabel.TabIndex = 15;
@@ -192,14 +180,14 @@
"Hidden",
"Minimized",
"Maximized"});
- this.winStyleComboBox.Location = new System.Drawing.Point(94, 150);
+ this.winStyleComboBox.Location = new System.Drawing.Point(93, 177);
this.winStyleComboBox.Name = "winStyleComboBox";
this.winStyleComboBox.Size = new System.Drawing.Size(325, 21);
this.winStyleComboBox.TabIndex = 16;
//
// startupDirLabel
//
- this.startupDirLabel.Location = new System.Drawing.Point(3, 177);
+ this.startupDirLabel.Location = new System.Drawing.Point(2, 204);
this.startupDirLabel.Name = "startupDirLabel";
this.startupDirLabel.Size = new System.Drawing.Size(85, 20);
this.startupDirLabel.TabIndex = 18;
@@ -211,7 +199,7 @@
this.quoteCheckBox.AutoSize = true;
this.quoteCheckBox.Location = new System.Drawing.Point(7, 299);
this.quoteCheckBox.Name = "quoteCheckBox";
- this.quoteCheckBox.Size = new System.Drawing.Size(104, 17);
+ this.quoteCheckBox.Size = new System.Drawing.Size(102, 17);
this.quoteCheckBox.TabIndex = 19;
this.quoteCheckBox.Text = "Quote filenames";
this.quoteCheckBox.UseVisualStyleBackColor = true;
@@ -219,7 +207,7 @@
// applicationImageButton
//
this.applicationImageButton.Image = global::GUIPrograms.Properties.Resources.browseButton_Image;
- this.applicationImageButton.Location = new System.Drawing.Point(427, 94);
+ this.applicationImageButton.Location = new System.Drawing.Point(426, 121);
this.applicationImageButton.Name = "applicationImageButton";
this.applicationImageButton.Size = new System.Drawing.Size(31, 23);
this.applicationImageButton.TabIndex = 26;
@@ -229,7 +217,7 @@
// startupDirButton
//
this.startupDirButton.Image = global::GUIPrograms.Properties.Resources.browseButton_Image;
- this.startupDirButton.Location = new System.Drawing.Point(427, 174);
+ this.startupDirButton.Location = new System.Drawing.Point(426, 201);
this.startupDirButton.Name = "startupDirButton";
this.startupDirButton.Size = new System.Drawing.Size(31, 23);
this.startupDirButton.TabIndex = 27;
@@ -241,16 +229,17 @@
this.allowRefreshCheckBox.AutoSize = true;
this.allowRefreshCheckBox.Location = new System.Drawing.Point(7, 345);
this.allowRefreshCheckBox.Name = "allowRefreshCheckBox";
- this.allowRefreshCheckBox.Size = new System.Drawing.Size(159, 17);
+ this.allowRefreshCheckBox.Size = new System.Drawing.Size(154, 17);
this.allowRefreshCheckBox.TabIndex = 30;
this.allowRefreshCheckBox.Text = "Allow refresh in mediaportal";
this.allowRefreshCheckBox.UseVisualStyleBackColor = true;
//
// informationLabel
//
- this.informationLabel.Location = new System.Drawing.Point(6, 388);
+ this.informationLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.informationLabel.Location = new System.Drawing.Point(4, 6);
this.informationLabel.Name = "informationLabel";
- this.informationLabel.Size = new System.Drawing.Size(384, 57);
+ this.informationLabel.Size = new System.Drawing.Size(396, 57);
this.informationLabel.TabIndex = 31;
//
// openFileDialog
@@ -260,9 +249,9 @@
// applicationExeTextBox
//
this.applicationExeTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.applicationExeTextBox.Location = new System.Drawing.Point(94, 71);
+ this.applicationExeTextBox.Location = new System.Drawing.Point(93, 98);
this.applicationExeTextBox.Name = "applicationExeTextBox";
- this.applicationExeTextBox.Size = new System.Drawing.Size(325, 21);
+ this.applicationExeTextBox.Size = new System.Drawing.Size(325, 20);
this.applicationExeTextBox.TabIndex = 32;
this.applicationExeTextBox.TextChanged += new System.EventHandler(this.applicationExeTextBox_TextChanged);
//
@@ -279,7 +268,7 @@
// startupDirComboBox
//
this.startupDirComboBox.FormattingEnabled = true;
- this.startupDirComboBox.Location = new System.Drawing.Point(94, 177);
+ this.startupDirComboBox.Location = new System.Drawing.Point(93, 204);
this.startupDirComboBox.Name = "startupDirComboBox";
this.startupDirComboBox.Size = new System.Drawing.Size(325, 21);
this.startupDirComboBox.TabIndex = 36;
@@ -287,7 +276,8 @@
// pictureBox
//
this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.pictureBox.Location = new System.Drawing.Point(324, 203);
+ this.pictureBox.InitialImage = null;
+ this.pictureBox.Location = new System.Drawing.Point(248, 299);
this.pictureBox.Name = "pictureBox";
this.pictureBox.Size = new System.Drawing.Size(170, 170);
this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -321,7 +311,6 @@
this.Controls.Add(this.applicationExeLabel);
this.Controls.Add(this.titleLabel);
this.Controls.Add(this.enabledCheckbox);
- this.Controls.Add(this.winTypeLabel);
this.Name = "AppSettingsBase";
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
this.ResumeLayout(false);
@@ -331,7 +320,6 @@
#endregion
- protected System.Windows.Forms.Label winTypeLabel;
protected System.Windows.Forms.CheckBox enabledCheckbox;
protected System.Windows.Forms.Label titleLabel;
protected System.Windows.Forms.Label applicationExeLabel;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -80,7 +80,7 @@
//
this.platformComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.platformComboBox.FormattingEnabled = true;
- this.platformComboBox.Location = new System.Drawing.Point(94, 204);
+ this.platformComboBox.Location = new System.Drawing.Point(93, 231);
this.platformComboBox.Name = "platformComboBox";
this.platformComboBox.Size = new System.Drawing.Size(325, 21);
this.platformComboBox.TabIndex = 42;
@@ -89,7 +89,7 @@
//
this.platformLabel.AutoSize = true;
this.platformLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.platformLabel.Location = new System.Drawing.Point(3, 207);
+ this.platformLabel.Location = new System.Drawing.Point(2, 234);
this.platformLabel.Name = "platformLabel";
this.platformLabel.Size = new System.Drawing.Size(84, 13);
this.platformLabel.TabIndex = 41;
@@ -103,7 +103,6 @@
this.Controls.Add(this.platformLabel);
this.Name = "AppSettingsDirCache";
this.Load += new System.EventHandler(this.AppSettingsDirCache_Load);
- this.Controls.SetChildIndex(this.winTypeLabel, 0);
this.Controls.SetChildIndex(this.enabledCheckbox, 0);
this.Controls.SetChildIndex(this.titleLabel, 0);
this.Controls.SetChildIndex(this.applicationExeLabel, 0);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -111,14 +111,11 @@
private void AppSettingsDirCache_Load(object sender, EventArgs e)
{
- winTypeLabel.Text = "Directory Cache";
+ informationLabel.Text = "Directory Cache";
//untiil we really do something with this option in appdircache..
allowRefreshCheckBox.Checked = false;
-
-
-
-
+
}
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -59,16 +59,17 @@
//
this.toolTip.SetToolTip(this.applicationImageTextBox, "Optional filename for an image to display in MediaPortal");
//
+ // applicationArgumentsTextBox
+ //
+ this.toolTip.SetToolTip(this.applicationArgumentsTextBox, "Optional arguments that are needed to launch the program \r\n\r\n(advanced hint: Use " +
+ "%FILE% if the filename needs to be placed in some specific place between several" +
+ " arguments)");
+ //
// winStyleComboBox
//
this.toolTip.SetToolTip(this.winStyleComboBox, "Appearance of the launched program. \r\nTry HIDDEN or MINIMIZED for a seamless inte" +
"gration in MediaPortal");
//
- // startupDirTextBox
- //
- this.toolTip.SetToolTip(this.startupDirComboBox, "Optional path that is passed as the launch-directory \r\n\r\n(advanced hint: Use %FIL" +
- "EDIR% if you want to use the directory where the launched file is stored)");
- //
// quoteCheckBox
//
this.quoteCheckBox.Location = new System.Drawing.Point(7, 315);
@@ -85,8 +86,8 @@
//
this.informationLabel.Image = ((System.Drawing.Image)(resources.GetObject("informationLabel.Image")));
this.informationLabel.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
- this.informationLabel.Location = new System.Drawing.Point(4, 220);
- this.informationLabel.Size = new System.Drawing.Size(314, 73);
+ this.informationLabel.Location = new System.Drawing.Point(2, 0);
+ this.informationLabel.Size = new System.Drawing.Size(314, 68);
this.informationLabel.MouseLeave += new System.EventHandler(this.informationLabel_MouseLeave);
this.informationLabel.Click += new System.EventHandler(this.informationLabel_Click);
this.informationLabel.MouseEnter += new System.EventHandler(this.informationLabel_MouseEnter);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -74,7 +74,6 @@
// this.validImagesCheckBox.Checked = true;
this.enabledCheckbox.Checked = true;
this.titleTextBox.Text = "GameBase ...";
- this.winTypeLabel.Text = "GameBase direct importer";
this.applicationExeTextBox.Text = "<yourpath>gamebase database";
this.quoteCheckBox.Visible = false;
this.shellexecuteCheckBox.Visible = false;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -59,7 +59,7 @@
private void AppSettingsGrouper_Load(object sender, EventArgs e)
{
- winTypeLabel.Text = "Grouper.";
+ this.informationLabel.Text = "Grouper.";
titleLabel.Text = "Title";
titleTextBox.Text = "Write your title";
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -31,11 +31,11 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AppSettingsMame));
this.historyDatLink = new System.Windows.Forms.LinkLabel();
this.catverLink = new System.Windows.Forms.LinkLabel();
- this.labelBestResults = new System.Windows.Forms.LinkLabel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
+
// enabledCheckbox
//
this.toolTip.SetToolTip(this.enabledCheckbox, "Only enabled items will appear in MediaPortal");
@@ -59,16 +59,17 @@
//
this.toolTip.SetToolTip(this.applicationImageTextBox, "Optional filename for an image to display in MediaPortal");
//
+ // applicationArgumentsTextBox
+ //
+ this.toolTip.SetToolTip(this.applicationArgumentsTextBox, "Optional arguments that are needed to launch the program \r\n\r\n(advanced hint: Use " +
+ "%FILE% if the filename needs to be placed in some specific place between several" +
+ " arguments)");
+ //
// winStyleComboBox
//
this.toolTip.SetToolTip(this.winStyleComboBox, "Appearance of the launched program. \r\nTry HIDDEN or MINIMIZED for a seamless inte" +
"gration in MediaPortal");
//
- // startupDirTextBox
- //
- this.toolTip.SetToolTip(this.startupDirComboBox, "Optional path that is passed as the launch-directory \r\n\r\n(advanced hint: Use %FIL" +
- "EDIR% if you want to use the directory where the launched file is stored)");
- //
// quoteCheckBox
//
this.toolTip.SetToolTip(this.quoteCheckBox, "Quotes are usually needed to handle filenames with spaces correctly. \r\nAvoid doub" +
@@ -83,8 +84,7 @@
//
this.informationLabel.Image = ((System.Drawing.Image)(resources.GetObject("informationLabel.Image")));
this.informationLabel.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.informationLabel.Location = new System.Drawing.Point(4, 222);
- this.informationLabel.Size = new System.Drawing.Size(239, 85);
+ this.informationLabel.Size = new System.Drawing.Size(248, 62);
this.informationLabel.TextAlign = System.Drawing.ContentAlignment.BottomRight;
this.informationLabel.MouseLeave += new System.EventHandler(this.informationLabel_MouseLeave);
this.informationLabel.Click += new System.EventHandler(this.informationLabel_Click);
@@ -114,21 +114,12 @@
this.catverLink.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.catverLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.catverLink_LinkClicked);
//
- // labelBestResults
- //
- this.labelBestResults.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.labelBestResults.Location = new System.Drawing.Point(0, 0);
- this.labelBestResults.Name = "labelBestResults";
- this.labelBestResults.Size = new System.Drawing.Size(189, 23);
- this.labelBestResults.TabIndex = 32;
- this.labelBestResults.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
+
// groupBox1
//
this.groupBox1.Controls.Add(this.historyDatLink);
this.groupBox1.Controls.Add(this.catverLink);
- this.groupBox1.Location = new System.Drawing.Point(249, 222);
+ this.groupBox1.Location = new System.Drawing.Point(232, 405);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(226, 117);
this.groupBox1.TabIndex = 82;
@@ -140,13 +131,10 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.labelBestResults);
this.Name = "AppSettingsMame";
this.Load += new System.EventHandler(this.AppSettingsMameDirect_Load);
this.Controls.SetChildIndex(this.prePostButton, 0);
this.Controls.SetChildIndex(this.informationLabel, 0);
- this.Controls.SetChildIndex(this.labelBestResults, 0);
- this.Controls.SetChildIndex(this.winTypeLabel, 0);
this.Controls.SetChildIndex(this.enabledCheckbox, 0);
this.Controls.SetChildIndex(this.titleLabel, 0);
this.Controls.SetChildIndex(this.applicationExeLabel, 0);
@@ -178,7 +166,6 @@
private System.Windows.Forms.LinkLabel historyDatLink;
private System.Windows.Forms.LinkLabel catverLink;
- private System.Windows.Forms.LinkLabel labelBestResults;
private System.Windows.Forms.GroupBox groupBox1;
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -43,9 +43,9 @@
this.gbFileDetails = new MediaPortal.UserInterface.Controls.MPGroupBox();
this.systemComboBox = new System.Windows.Forms.ComboBox();
this.manufacturerComboBox = new System.Windows.Forms.ComboBox();
- this.subGenreComboBox = new System.Windows.Forms.ComboBox();
+ this.genreStyleComboBox = new System.Windows.Forms.ComboBox();
this.genreComboBox = new System.Windows.Forms.ComboBox();
- this.subGenreLabel = new System.Windows.Forms.Label();
+ this.genreStyleLabel = new System.Windows.Forms.Label();
this.txtYear = new MediaPortal.UserInterface.Controls.MPTextBox();
this.lblYear = new MediaPortal.UserInterface.Controls.MPLabel();
this.lblManufacturer = new MediaPortal.UserInterface.Controls.MPLabel();
@@ -199,9 +199,9 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.gbFileDetails.Controls.Add(this.systemComboBox);
this.gbFileDetails.Controls.Add(this.manufacturerComboBox);
- this.gbFileDetails.Controls.Add(this.subGenreComboBox);
+ this.gbFileDetails.Controls.Add(this.genreStyleComboBox);
this.gbFileDetails.Controls.Add(this.genreComboBox);
- this.gbFileDetails.Controls.Add(this.subGenreLabel);
+ this.gbFileDetails.Controls.Add(this.genreStyleLabel);
this.gbFileDetails.Controls.Add(this.gameinfoURLTextBox);
this.gbFileDetails.Controls.Add(this.gameInfoURLLabel);
this.gbFileDetails.Controls.Add(this.buttonViewImg);
@@ -249,14 +249,14 @@
this.manufacturerComboBox.Size = new System.Drawing.Size(162, 21);
this.manufacturerComboBox.TabIndex = 70;
//
- // subGenreComboBox
+ // genreStyleComboBox
//
- this.subGenreComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.subGenreComboBox.FormattingEnabled = true;
- this.subGenreComboBox.Location = new System.Drawing.Point(97, 129);
- this.subGenreComboBox.Name = "subGenreComboBox";
- this.subGenreComboBox.Size = new System.Drawing.Size(162, 21);
- this.subGenreComboBox.TabIndex = 69;
+ this.genreStyleComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.genreStyleComboBox.FormattingEnabled = true;
+ this.genreStyleComboBox.Location = new System.Drawing.Point(97, 129);
+ this.genreStyleComboBox.Name = "genreStyleComboBox";
+ this.genreStyleComboBox.Size = new System.Drawing.Size(162, 21);
+ this.genreStyleComboBox.TabIndex = 69;
//
// genreComboBox
//
@@ -267,14 +267,14 @@
this.genreComboBox.Size = new System.Drawing.Size(162, 21);
this.genreComboBox.TabIndex = 68;
//
- // subGenreLabel
+ // genreStyleLabel
//
- this.subGenreLabel.AutoSize = true;
- this.subGenreLabel.Location = new System.Drawing.Point(8, 132);
- this.subGenreLabel.Name = "subGenreLabel";
- this.subGenreLabel.Size = new System.Drawing.Size(61, 13);
- this.subGenreLabel.TabIndex = 67;
- this.subGenreLabel.Text = "Sub Genre:";
+ this.genreStyleLabel.AutoSize = true;
+ this.genreStyleLabel.Location = new System.Drawing.Point(8, 132);
+ this.genreStyleLabel.Name = "genreStyleLabel";
+ this.genreStyleLabel.Size = new System.Drawing.Size(62, 13);
+ this.genreStyleLabel.TabIndex = 67;
+ this.genreStyleLabel.Text = "GenreStyle:";
//
// txtYear
//
@@ -479,8 +479,8 @@
private MediaPortal.UserInterface.Controls.MPTabPage tabPage1;
private System.Windows.Forms.OpenFileDialog openFileDialog1;
private MediaPortal.UserInterface.Controls.MPButton btnCancel;
- private System.Windows.Forms.Label subGenreLabel;
- private System.Windows.Forms.ComboBox subGenreComboBox;
+ private System.Windows.Forms.Label genreStyleLabel;
+ private System.Windows.Forms.ComboBox genreStyleComboBox;
private System.Windows.Forms.ComboBox genreComboBox;
private System.Windows.Forms.ComboBox systemComboBox;
private System.Windows.Forms.ComboBox manufacturerComboBox;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -153,7 +153,7 @@
FillComboBox("tblPlatform", "platform", systemComboBox);
FillComboBox("tblManufacturer", "manufacturer", manufacturerComboBox);
FillComboBox("tblGenre", "genre",genreComboBox);
- FillComboBox("tblGenre", "genre", subGenreComboBox);
+ FillComboBox("tblGenre", "genre", genreStyleComboBox);
updateDisplay();
}
@@ -228,8 +228,8 @@
void FileItemToGenre()
{
- genreComboBox.SelectedValue = CurFile.MainGenreId;
- subGenreComboBox.SelectedValue = CurFile.SubGenreId;
+ genreComboBox.SelectedValue = CurFile.GenreId;
+ genreStyleComboBox.SelectedValue = CurFile.GenreStyleId;
manufacturerComboBox.SelectedValue = CurFile.ManufacturerId;
systemComboBox.SelectedValue = CurFile.PlatformId;
}
@@ -240,10 +240,10 @@
CurFile.Filename = txtFilename.Text;
if (!ProgramUtils.UseThumbsDir())
CurFile.Imagefile = txtImageFile.Text;
- // CurFile.MainGenre = genreComboBox.SelectedText;
- CurFile.MainGenreId = (int)genreComboBox.SelectedValue;
- //CurFile.SubGenre = subGenreComboBox.SelectedText;
- CurFile.SubGenreId = (int)subGenreComboBox.SelectedValue;
+ // CurFile.Genre = genreComboBox.SelectedText;
+ CurFile.GenreId = (int)genreComboBox.SelectedValue;
+ //CurFile.GenreStyle = genreStyleComboBox.SelectedText;
+ CurFile.GenreStyleId = (int)genreStyleComboBox.SelectedValue;
CurFile.ManufacturerId = (int)manufacturerComboBox.SelectedValue;
CurFile.Year = ProgramUtils.StringToInteger(txtYear.Text, -1);
CurFile.Rating = cbRating.SelectedIndex;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.Designer.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.Designer.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -61,6 +61,10 @@
this.buttonClose = new System.Windows.Forms.Button();
this.buttonSaveSearch = new System.Windows.Forms.Button();
this.buttonStartSearch = new System.Windows.Forms.Button();
+ this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+ this.titleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.allOthersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip.SuspendLayout();
this.splitContainer.Panel1.SuspendLayout();
this.splitContainer.Panel2.SuspendLayout();
@@ -70,6 +74,7 @@
this.bottomPanel.SuspendLayout();
this.groupBoxFilter.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.MinRelevanceNum)).BeginInit();
+ this.menuStrip1.SuspendLayout();
this.SuspendLayout();
//
// statusStrip
@@ -88,7 +93,7 @@
//
this.toolStripStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolStripStatusLabel.Name = "toolStripStatusLabel";
- this.toolStripStatusLabel.Size = new System.Drawing.Size(338, 17);
+ this.toolStripStatusLabel.Size = new System.Drawing.Size(333, 17);
this.toolStripStatusLabel.Spring = true;
this.toolStripStatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
@@ -106,7 +111,7 @@
this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(57, 20);
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(62, 20);
this.toolStripDropDownButton1.Text = "Options";
//
// scraperSaveTypeToolStripMenuItem
@@ -116,27 +121,27 @@
this.dataToolStripMenuItem,
this.imagesToolStripMenuItem});
this.scraperSaveTypeToolStripMenuItem.Name = "scraperSaveTypeToolStripMenuItem";
- this.scraperSaveTypeToolStripMenuItem.Size = new System.Drawing.Size(170, 22);
+ this.scraperSaveTypeToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
this.scraperSaveTypeToolStripMenuItem.Text = "ScraperSaveType";
//
// dataAndImagesToolStripMenuItem
//
this.dataAndImagesToolStripMenuItem.Name = "dataAndImagesToolStripMenuItem";
- this.dataAndImagesToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+ this.dataAndImagesToolStripMenuItem.Size = new System.Drawing.Size(158, 22);
this.dataAndImagesToolStripMenuItem.Text = "DataAndImages";
this.dataAndImagesToolStripMenuItem.Click += new System.EventHandler(this.dataAndImagesToolStripMenuItem_Click);
//
// dataToolStripMenuItem
//
this.dataToolStripMenuItem.Name = "dataToolStripMenuItem";
- this.dataToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+ this.dataToolStripMenuItem.Size = new System.Drawing.Size(158, 22);
this.dataToolStripMenuItem.Text = "Data";
this.dataToolStripMenuItem.Click += new System.EventHandler(this.dataToolStripMenuItem_Click);
//
// imagesToolStripMenuItem
//
this.imagesToolStripMenuItem.Name = "imagesToolStripMenuItem";
- this.imagesToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+ this.imagesToolStripMenuItem.Size = new System.Drawing.Size(158, 22);
this.imagesToolStripMenuItem.Text = "Images";
this.imagesToolStripMenuItem.Click += new System.EventHandler(this.imagesToolStripMenuItem_Click);
//
@@ -144,14 +149,14 @@
//
this.cancelSearchToolStripMenuItem.Name = "cancelSearchToolStripMenuItem";
this.cancelSearchToolStripMenuItem.ShowShortcutKeys = false;
- this.cancelSearchToolStripMenuItem.Size = new System.Drawing.Size(170, 22);
+ this.cancelSearchToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
this.cancelSearchToolStripMenuItem.Text = "Cancel Search";
this.cancelSearchToolStripMenuItem.Click += new System.EventHandler(this.cancelSearchToolStripMenuItem_Click);
//
// splitContainer
//
this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer.Location = new System.Drawing.Point(0, 24);
this.splitContainer.Name = "splitContainer";
//
// splitContainer.Panel1
@@ -161,7 +166,7 @@
// splitContainer.Panel2
//
this.splitContainer.Panel2.Controls.Add(this.groupBoxMatchList);
- this.splitContainer.Size = new System.Drawing.Size(712, 443);
+ this.splitContainer.Size = new System.Drawing.Size(712, 419);
this.splitContainer.SplitterDistance = 354;
this.splitContainer.TabIndex = 20;
//
@@ -173,7 +178,7 @@
this.groupBoxFileList.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.groupBoxFileList.Location = new System.Drawing.Point(0, 0);
this.groupBoxFileList.Name = "groupBoxFileList";
- this.groupBoxFileList.Size = new System.Drawing.Size(354, 443);
+ this.groupBoxFileList.Size = new System.Drawing.Size(354, 419);
this.groupBoxFileList.TabIndex = 16;
this.groupBoxFileList.TabStop = false;
this.groupBoxFileList.Text = "FileList";
@@ -183,9 +188,9 @@
this.checkboxFileList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.checkboxFileList.AutoSize = true;
this.checkboxFileList.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkboxFileList.Location = new System.Drawing.Point(6, 420);
+ this.checkboxFileList.Location = new System.Drawing.Point(6, 396);
this.checkboxFileList.Name = "checkboxFileList";
- this.checkboxFileList.Size = new System.Drawing.Size(116, 17);
+ this.checkboxFileList.Size = new System.Drawing.Size(118, 17);
this.checkboxFileList.TabIndex = 14;
this.checkboxFileList.Text = "Select / deselect all";
this.checkboxFileList.UseVisualStyleBackColor = true;
@@ -206,7 +211,7 @@
this.listViewFileList.HideSelection = false;
this.listViewFileList.Location = new System.Drawing.Point(6, 20);
this.listViewFileList.Name = "listViewFileList";
- this.listViewFileList.Size = new System.Drawing.Size(342, 394);
+ this.listViewFileList.Size = new System.Drawing.Size(342, 370);
this.listViewFileList.TabIndex = 13;
this.listViewFileList.UseCompatibleStateImageBehavior = false;
this.listViewFileList.View = System.Windows.Forms.View.Details;
@@ -231,7 +236,7 @@
this.groupBoxMatchList.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.groupBoxMatchList.Location = new System.Drawing.Point(0, 0);
this.groupBoxMatchList.Name = "groupBoxMatchList";
- this.groupBoxMatchList.Size = new System.Drawing.Size(354, 443);
+ this.groupBoxMatchList.Size = new System.Drawing.Size(354, 419);
this.groupBoxMatchList.TabIndex = 16;
this.groupBoxMatchList.TabStop = false;
this.groupBoxMatchList.Text = "MatchList";
@@ -240,7 +245,7 @@
//
this.labelLaunchUrlInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.labelLaunchUrlInfo.AutoSize = true;
- this.labelLaunchUrlInfo.Location = new System.Drawing.Point(10, 422);
+ this.labelLaunchUrlInfo.Location = new System.Drawing.Point(10, 398);
this.labelLaunchUrlInfo.Name = "labelLaunchUrlInfo";
this.labelLaunchUrlInfo.Size = new System.Drawing.Size(153, 13);
this.labelLaunchUrlInfo.TabIndex = 15;
@@ -261,7 +266,7 @@
this.listViewMatchList.Location = new System.Drawing.Point(6, 20);
this.listViewMatchList.MultiSelect = false;
this.listViewMatchList.Name = "listViewMatchList";
- this.listViewMatchList.Size = new System.Drawing.Size(342, 394);
+ this.listViewMatchList.Size = new System.Drawing.Size(342, 370);
this.listViewMatchList.TabIndex = 14;
this.listViewMatchList.UseCompatibleStateImageBehavior = false;
this.listViewMatchList.View = System.Windows.Forms.View.Details;
@@ -299,7 +304,7 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(555, 4);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(154, 13);
+ this.label2.Size = new System.Drawing.Size(148, 13);
this.label2.TabIndex = 28;
this.label2.Text = "The data is brought to you by:";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -326,7 +331,7 @@
this.labelPlatform.AutoSize = true;
this.labelPlatform.Location = new System.Drawing.Point(6, 25);
this.labelPlatform.Name = "labelPlatform";
- this.labelPlatform.Size = new System.Drawing.Size(51, 13);
+ this.labelPlatform.Size = new System.Drawing.Size(48, 13);
this.labelPlatform.TabIndex = 30;
this.labelPlatform.Text = "Platform:";
//
@@ -335,7 +340,6 @@
this.filterComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.filterComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-
this.filterComboBox.Location = new System.Drawing.Point(63, 22);
this.filterComboBox.Name = "filterComboBox";
this.filterComboBox.Size = new System.Drawing.Size(132, 21);
@@ -365,7 +369,7 @@
0});
this.MinRelevanceNum.Location = new System.Drawing.Point(117, 49);
this.MinRelevanceNum.Name = "MinRelevanceNum";
- this.MinRelevanceNum.Size = new System.Drawing.Size(78, 21);
+ this.MinRelevanceNum.Size = new System.Drawing.Size(78, 20);
this.MinRelevanceNum.TabIndex = 24;
this.MinRelevanceNum.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.MinRelevanceNum.Value = new decimal(new int[] {
@@ -380,7 +384,7 @@
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 51);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(84, 13);
+ this.label1.Size = new System.Drawing.Size(85, 13);
this.label1.TabIndex = 25;
this.label1.Text = "Min. Relevance:";
//
@@ -390,7 +394,7 @@
this.linkLabelAllGame.AutoSize = true;
this.linkLabelAllGame.Location = new System.Drawing.Point(583, 24);
this.linkLabelAllGame.Name = "linkLabelAllGame";
- this.linkLabelAllGame.Size = new System.Drawing.Size(126, 13);
+ this.linkLabelAllGame.Size = new System.Drawing.Size(124, 13);
this.linkLabelAllGame.TabIndex = 3;
this.linkLabelAllGame.TabStop = true;
this.linkLabelAllGame.Text = "http://www.allgame.com";
@@ -430,6 +434,41 @@
this.buttonStartSearch.UseVisualStyleBackColor = true;
this.buttonStartSearch.Click += new System.EventHandler(this.buttonStartSearch_Click);
//
+ // menuStrip1
+ //
+ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripMenuItem1});
+ this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip1.Name = "menuStrip1";
+ this.menuStrip1.Size = new System.Drawing.Size(712, 24);
+ this.menuStrip1.TabIndex = 21;
+ this.menuStrip1.Text = "menuStrip1";
+ //
+ // toolStripMenuItem1
+ //
+ this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.titleToolStripMenuItem,
+ this.allOthersToolStripMenuItem});
+ this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(86, 20);
+ this.toolStripMenuItem1.Text = "Import fields";
+ //
+ // titleToolStripMenuItem
+ //
+ this.titleToolStripMenuItem.CheckOnClick = true;
+ this.titleToolStripMenuItem.Name = "titleToolStripMenuItem";
+ this.titleToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.titleToolStripMenuItem.Text = "Title";
+ this.titleToolStripMenuItem.Click += new System.EventHandler(this.titleToolStripMenuItem_Click);
+ //
+ // allOthersToolStripMenuItem
+ //
+ this.allOthersToolStripMenuItem.Checked = true;
+ this.allOthersToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.allOthersToolStripMenuItem.Name = "allOthersToolStripMenuItem";
+ this.allOthersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.allOthersToolStripMenuItem.Text = "All others";
+ //
// FileInfoScraperForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -438,11 +477,14 @@
this.Controls.Add(this.splitContainer);
this.Controls.Add(this.bottomPanel);
this.Controls.Add(this.statusStrip);
+ this.Controls.Add(this.menuStrip1);
+ this.MainMenuStrip = this.menuStrip1;
this.Name = "FileInfoScraperForm";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Import Info";
+ this.Load += new System.EventHandler(this.FileInfoScraperForm_Load);
this.statusStrip.ResumeLayout(false);
this.statusStrip.PerformLayout();
this.splitContainer.Panel1.ResumeLayout(false);
@@ -457,6 +499,8 @@
this.groupBoxFilter.ResumeLayout(false);
this.groupBoxFilter.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.MinRelevanceNum)).EndInit();
+ this.menuStrip1.ResumeLayout(false);
+ this.menuStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -496,6 +540,10 @@
private System.Windows.Forms.ToolStripMenuItem dataAndImagesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dataToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem imagesToolStripMenuItem;
+ private System.Windows.Forms.MenuStrip menuStrip1;
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+ private System.Windows.Forms.ToolStripMenuItem titleToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem allOthersToolStripMenuItem;
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -49,6 +49,7 @@
bool isSearching = false;
bool stopSearching = false;
+ bool importTitle;
ScraperSaveType saveType = ScraperSaveType.DataAndImages;
@@ -505,47 +506,6 @@
ChangeScraperSaveType(ScraperSaveType.Images);
}
- #region oldMenu
- /*
- private void mnu22CheckWithoutImages_Click(object sender, EventArgs e)
- {
- FileItem curFile;
- foreach (ListViewItem curItem in listViewFileList.Items)
- {
- curFile = (FileItem)curItem.Tag;
- if (curFile != null)
- {
- curItem.Checked = (curFile.Imagefile == "");
- }
- else
- {
- curItem.Checked = false;
- }
- }
- buttonStartSearch.Enabled = (listViewFileList.CheckedItems.Count > 0);
- UpdateButtonStates();
- }
- private void mnu22CheckWithoutOverview_Click(object sender, EventArgs e)
- {
- FileItem curFile;
- foreach (ListViewItem curItem in listViewFileList.Items)
- {
- curFile = (FileItem)curItem.Tag;
- if (curFile != null)
- {
- curItem.Checked = (curFile.Overview == "");
- }
- else
- {
- curItem.Checked = false;
- }
- }
- buttonStartSearch.Enabled = (listViewFileList.CheckedItems.Count > 0);
- UpdateButtonStates();
- }
- */
-#endregion oldMenu
-
#endregion
#endregion
@@ -629,6 +589,7 @@
isSearching = true;
UpdateButtonStates();
+
int numberOfSearches = 0;
InitProgressBar("Starting search");
ListViewItem nextItem = null;
@@ -659,7 +620,7 @@
curItem.SubItems[1].Text = String.Format("<searching...>");
file.FindFileInfoDetail(curApp, file.FileInfoFavourite, ScraperType.ALLGAME, saveType);
if ((saveType == ScraperSaveType.DataAndImages) || (saveType == ScraperSaveType.Data))
- file.SaveFromFileInfoFavourite();
+ file.SaveFromFileInfoFavourite(importTitle);
curItem.SubItems[1].Text = String.Format("<saved>");
}
}
@@ -675,5 +636,16 @@
}
#endregion
+
+ private void titleToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+
+ importTitle = this.titleToolStripMenuItem.Checked;
+ }
+
+ private void FileInfoScraperForm_Load(object sender, EventArgs e)
+ {
+ importTitle = titleToolStripMenuItem.Checked;
+ }
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.resx
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.resx 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.resx 2007-08-10 10:44:20 UTC (rev 824)
@@ -136,6 +136,9 @@
s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
</value>
</data>
+ <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>126, 17</value>
+ </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>40</value>
</metadata>
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -165,8 +165,8 @@
"rating",
"launchcount",
"lastTimeLaunched",
- "mainGenre",
- "subGenre",
+ "genre",
+ "genreStyle",
};
string[] sqloperators = new string[]
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-10 06:05:54 UTC (rev 823)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-10 10:44:20 UTC (rev 824)
@@ -207,7 +207,7 @@
currentNode.Tag = applicationItem;
Parent.Nodes.Add(currentNode);
- AttachChildNodes(currentNode, applicationItem.AppI...
[truncated message content] |
2 messages has been excluded from this view by a project administrator.
