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] |