From: <nor...@us...> - 2007-08-27 13:37:30
|
Revision: 867 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=867&view=rev Author: northern_sky Date: 2007-08-26 11:09:04 -0700 (Sun, 26 Aug 2007) Log Message: ----------- Cleanup , moved out settings into own class 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.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 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.Designer.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/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/FileSettingsBox.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileSettingsBox.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/AllGameScraper.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/ImportBase.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/Items/FileItemInfo.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilterItem.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramSort.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Properties/Resources.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Properties/Resources.resx Added Paths: ----------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltUserSettings.cs Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -31,15 +31,15 @@ using System.IO; using System.Data; using MediaPortal.GUI.Library; -using GUIPrograms; +using GUIProgramsAlt; using MediaPortal.Database; using MediaPortal.Util; using MediaPortal.Configuration; using System.Data.SQLite; -using GUIPrograms.Items; +using GUIProgramsAlt.Items; #endregion Imports -namespace GUIPrograms.Database +namespace GUIProgramsAlt.Database { /// <summary> /// DBhandling methods Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class AppSettingsFilesImportProgress { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -31,10 +31,10 @@ using System.Text; using System.Windows.Forms; -using GUIPrograms.Items; -using GUIPrograms.Database; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Database; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class AppSettingsFilesImportProgress : AppSettingsBase { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class AppSettingsFilesView { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -33,11 +33,11 @@ using System.Windows.Forms; using Core.Util; -using GUIPrograms; -using GUIPrograms.Items; -using GUIPrograms.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Database; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class AppSettingsFilesView : UserControl { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class AppSettingsBase { @@ -100,7 +100,7 @@ // // applicationExeButton // - this.applicationExeButton.Image = global::GUIPrograms.Properties.Resources.browseButton_Image; + this.applicationExeButton.Image = global::GUIProgramsAlt.Properties.Resources.browseButtonImage; this.applicationExeButton.Location = new System.Drawing.Point(426, 96); this.applicationExeButton.Name = "applicationExeButton"; this.applicationExeButton.Size = new System.Drawing.Size(31, 23); @@ -209,7 +209,7 @@ // // applicationImageButton // - this.applicationImageButton.Image = global::GUIPrograms.Properties.Resources.browseButton_Image; + this.applicationImageButton.Image = global::GUIProgramsAlt.Properties.Resources.browseButtonImage; this.applicationImageButton.Location = new System.Drawing.Point(426, 121); this.applicationImageButton.Name = "applicationImageButton"; this.applicationImageButton.Size = new System.Drawing.Size(31, 23); @@ -219,7 +219,7 @@ // // startupDirButton // - this.startupDirButton.Image = global::GUIPrograms.Properties.Resources.browseButton_Image; + this.startupDirButton.Image = global::GUIProgramsAlt.Properties.Resources.browseButtonImage; this.startupDirButton.Location = new System.Drawing.Point(426, 201); this.startupDirButton.Name = "startupDirButton"; this.startupDirButton.Size = new System.Drawing.Size(31, 23); Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -34,12 +34,12 @@ using System.Windows.Forms; using Core.Util; -using GUIPrograms; -using GUIPrograms.Items; -using GUIPrograms.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Database; using MediaPortal.Configuration; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class AppSettingsBase : SettingsBase { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class AppSettingsDirCache { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -32,11 +32,11 @@ using System.Text; using System.Windows.Forms; -using GUIPrograms; -using GUIPrograms.Items; -using GUIPrograms.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Database; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class AppSettingsDirCache : AppSettingsBase { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class AppSettingsGamebase { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -33,11 +33,11 @@ using System.Text; using System.Windows.Forms; -using GUIPrograms; -using GUIPrograms.Items; -using GUIPrograms.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Database; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class AppSettingsGamebase : AppSettingsBase { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class AppSettingsGrouper { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -31,11 +31,11 @@ using System.Text; using System.Windows.Forms; -using GUIPrograms; -using GUIPrograms.Items; -using GUIPrograms.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Database; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class AppSettingsGrouper : AppSettingsBase { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class AppSettingsMame { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -33,11 +33,11 @@ using System.Text; using System.Windows.Forms; -using GUIPrograms; -using GUIPrograms.Items; -using GUIPrograms.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Database; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class AppSettingsMame : AppSettingsBase { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class FileDetailsForm { @@ -89,7 +89,7 @@ // buttonViewImg // this.buttonViewImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttonViewImg.Image = global::GUIPrograms.Properties.Resources.previewButton_Image; + this.buttonViewImg.Image = global::GUIProgramsAlt.Properties.Resources.previewButtonImage; this.buttonViewImg.Location = new System.Drawing.Point(431, 72); this.buttonViewImg.Name = "buttonViewImg"; this.buttonViewImg.Size = new System.Drawing.Size(31, 23); @@ -324,7 +324,7 @@ // btnImageFile // this.btnImageFile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnImageFile.Image = global::GUIPrograms.Properties.Resources.browseButton_Image; + this.btnImageFile.Image = global::GUIProgramsAlt.Properties.Resources.browseButtonImage; this.btnImageFile.Location = new System.Drawing.Point(468, 72); this.btnImageFile.Name = "btnImageFile"; this.btnImageFile.Size = new System.Drawing.Size(31, 23); @@ -383,7 +383,7 @@ // btnFilename // this.btnFilename.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnFilename.Image = global::GUIPrograms.Properties.Resources.browseButton_Image; + this.btnFilename.Image = global::GUIProgramsAlt.Properties.Resources.browseButtonImage; this.btnFilename.Location = new System.Drawing.Point(468, 45); this.btnFilename.Name = "btnFilename"; this.btnFilename.Size = new System.Drawing.Size(31, 23); Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -31,13 +31,13 @@ using System.Windows.Forms; using Core.Util; -using GUIPrograms; -using GUIPrograms.Items; -using GUIPrograms.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Database; using System.Data.SQLite; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class FileDetailsForm : Form { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class FileInfoScraperForm { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -34,11 +34,11 @@ using System.Windows.Forms; using System.Data.SQLite; -using GUIPrograms; -using GUIPrograms.Database; -using GUIPrograms.Items; +using GUIProgramsAlt; +using GUIProgramsAlt.Database; +using GUIProgramsAlt.Items; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class FileInfoScraperForm : Form { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileSettingsBox.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileSettingsBox.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileSettingsBox.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class FileSettingsBox { @@ -52,7 +52,7 @@ // // Button // - this.Button.Image = global::GUIPrograms.Properties.Resources.browseButton_Image; + this.Button.Image = global::GUIProgramsAlt.Properties.Resources.browseButtonImage; this.Button.Location = new System.Drawing.Point(423, 2); this.Button.Name = "Button"; this.Button.Size = new System.Drawing.Size(31, 23); Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileSettingsBox.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileSettingsBox.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileSettingsBox.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -5,8 +5,9 @@ using System.Data; using System.Text; using System.Windows.Forms; +using GUIProgramsAlt; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class FileSettingsBox : UserControl { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class ProgramViews { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -37,7 +37,7 @@ using MediaPortal.GUI.View; using MediaPortal.Util; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class ProgramViews : UserControl { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class SettingsBase { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -34,12 +34,12 @@ using System.Windows.Forms; using Core.Util; -using GUIPrograms; -using GUIPrograms.Items; -using GUIPrograms.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Database; using MediaPortal.GUI.Library; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class SettingsBase : UserControl { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class SettingsRoot { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -31,11 +31,11 @@ using System.Text; using System.Windows.Forms; -using GUIPrograms; -using GUIPrograms.Items; -using GUIPrograms.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Database; -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class SettingsRoot : SettingsBase { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.Designer.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.Designer.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -1,4 +1,4 @@ -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { partial class SetupForm { @@ -142,7 +142,7 @@ // // deleteApplicationToolStripMenuItem // - this.deleteApplicationToolStripMenuItem.Image = global::GUIPrograms.Properties.Resources.deleteButton_Image; + this.deleteApplicationToolStripMenuItem.Image = global::GUIProgramsAlt.Properties.Resources.deleteButtonImage; this.deleteApplicationToolStripMenuItem.Name = "deleteApplicationToolStripMenuItem"; this.deleteApplicationToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.deleteApplicationToolStripMenuItem.Text = "Delete application"; Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -14,14 +14,14 @@ using MediaPortal.Configuration; using System.IO; -using GUIPrograms.Database; -using GUIPrograms; -using GUIPrograms.Items; +using GUIProgramsAlt.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Items; #endregion -namespace GUIPrograms.Design +namespace GUIProgramsAlt.Design { public partial class SetupForm : Form { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -23,6 +23,7 @@ #endregion +#region Imports using System; using System.Collections.Generic; using System.Drawing; @@ -41,153 +42,73 @@ using MediaPortal.Profile; using MediaPortal.Util; -using GUIPrograms.Items; -using GUIPrograms.Database; -using GUIPrograms.Design; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Database; +using GUIProgramsAlt.Design; using System.Data.SQLite; using System.Data; -namespace GUIPrograms +#endregion Imports + +namespace GUIProgramsAlt { /// <summary> - /// The GUIProgramsAlt plugin is used to list a collection of arbitrary files + /// The GUIProgramsAlt plugin is used to list a collection of arbitrary files ,(focused on emulators) /// and use them as arguments when launching external applications. /// </summary> /// public class GUIProgramsAlt : GUIWindow, ISetupForm, IShowPlugin { - #region Serialisation + #region Variables - [Serializable] - public class MapSettings - { - protected int sortMethod; - protected int viewLayout; - protected bool sortAscending; - protected int lastApplicationID; - protected int lastFileID; - protected int lastViewLevel; - protected bool overviewVisible; - public MapSettings() - { - sortMethod = 0; //name - viewLayout = 0; //list - sortAscending = true; - overviewVisible = true; - lastApplicationID = -1; - lastFileID = -1; - lastViewLevel = 0; - } + bool currentSortAsc = true; + // FacadeView + const int facadeIDConst = 50; + ProgramViewHandler viewHandler = ProgramViewHandler.Instance; + List<ApplicationItem> globalApplicationList;// dbHandlerInstance.ApplicationItemList; + DirectoryHistory itemHistory = new DirectoryHistory(); + int slideSpeed = 3000; // speed in milliseconds between two slides + long slideTime = 0; + bool skipInit = false; + static string _thumbnailPath = string.Empty; + static string _lastThumbnailPath = string.Empty; + ProgramSort.SortMethod currentSortMethod = ProgramSort.SortMethod.Title; + DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance; - [XmlElement("SortMethod")] - public int SortMethod - { - get { return sortMethod; } - set { sortMethod = value; } - } + GUIProgramsAltUserSettings userSettings = new GUIProgramsAltUserSettings(); + ApplicationItem lastApp = null; + string prevFilepath = ""; + int selectedItemIndex = -1; + Layout currentLayout = Layout.List; - [XmlElement("ViewLayout")] - public int ViewLayout - { - get { return viewLayout; } - set { viewLayout = value; } - } + // Buttons + [SkinControl(2)] + protected GUIButtonControl btnViewAs = null; + [SkinControlAttribute(3)] + protected GUISortButtonControl btnSortBy = null; + [SkinControl(4)] + protected GUIButtonControl btnViews = null; + [SkinControl(5)] + protected GUIButtonControl btnRefresh = null; + //Images + [SkinControl(6)] + protected GUIImage screenShotImage = null; - [XmlElement("SortAscending")] - public bool SortAscending - { - get { return sortAscending; } - set { sortAscending = value; } - } + [SkinControl(facadeIDConst)] + protected GUIFacadeControl facadeView = null; - [XmlElement("OverviewVisible")] - public bool OverviewVisible - { - get { return overviewVisible; } - set { overviewVisible = value; } - } + - [XmlElement("LastAppID")] - public int LastAppID - { - get { return lastApplicationID; } - set { lastApplicationID = value; } - } + #endregion Variables - [XmlElement("LastFileID")] - public int LastFileID - { - get { return lastFileID; } - set { lastFileID = value; } - } - - [XmlElement("LastViewLevelID")] - public int LastViewLevel - { - get { return lastViewLevel; } - set { lastViewLevel = value; } - } - - - public string ViewLayoutTextName - { - get { return GetViewLayoutAsText(); } - } - - public void SwitchToNextViewLayout() - { - switch ((Layout)ViewLayout) - { - case Layout.List: - ViewLayout = (int)Layout.Icons; - - break; - case Layout.Icons: - ViewLayout = (int)Layout.LargeIcons; - - break; - case Layout.LargeIcons: - ViewLayout = (int)Layout.FilmStrip; - - break; - case Layout.FilmStrip: - ViewLayout = (int)Layout.List; - - break; - } - } - - string GetViewLayoutAsText() - { - string result = ""; - switch ((Layout)ViewLayout) - { - case Layout.List: - result = GUILocalizeStrings.Get(101); - break; - case Layout.Icons: - result = GUILocalizeStrings.Get(100); - break; - case Layout.LargeIcons: - result = GUILocalizeStrings.Get(417); - break; - case Layout.FilmStrip: - result = GUILocalizeStrings.Get(733); - break; - } - return result; - } - } - - void SaveSettings() { using (Settings xmlwriter = new Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) { - switch ((Layout)mapSettings.ViewLayout) + switch ((Layout)userSettings.ViewLayout) { case Layout.List: xmlwriter.SetValue("myprograms", "viewLayout", "list"); @@ -202,12 +123,12 @@ xmlwriter.SetValue("myprograms", "viewLayout", "filmstrip"); break; } - xmlwriter.SetValue("myprograms", "lastAppID", mapSettings.LastAppID.ToString()); - // xmlwriter.SetValue("myprograms", "lastViewLevel", mapSettings.LastViewLevel.ToString()); + xmlwriter.SetValue("myprograms", "lastAppID", userSettings.LastAppID.ToString()); + // xmlwriter.SetValue("myprograms", "lastViewLevel", userSettings.LastViewLevel.ToString()); xmlwriter.SetValue("myprograms", "lastViewLevel", ViewHandler.CurrentLevel); - xmlwriter.SetValue("myprograms", "sortMethod", mapSettings.SortMethod); + xmlwriter.SetValue("myprograms", "sortMethod", userSettings.SortMethod); // avoid bool conversion...... don't wanna know why it doesn't work! :-( - if (mapSettings.SortAscending) + if (userSettings.SortAscending) { xmlwriter.SetValue("myprograms", "sortASC", "yes"); } @@ -216,7 +137,7 @@ xmlwriter.SetValue("myprograms", "sortASC", "no"); } - if (mapSettings.OverviewVisible) + if (userSettings.OverviewVisible) { xmlwriter.SetValue("myprograms", "overviewvisible", "yes"); } @@ -225,8 +146,7 @@ xmlwriter.SetValue("myprograms", "overviewvisible", "no"); } - xmlwriter.SetValue("myprograms", "startWindow", StartWindow.ToString()); - xmlwriter.SetValue("myprograms", "startview", (int)mapSettings.ViewLayout); + xmlwriter.SetValue("myprograms", "startview", (int)userSettings.ViewLayout); } } @@ -239,33 +159,30 @@ string curText = ""; curText = xmlreader.GetValueAsString("myprograms", "viewLayout", "list"); - if (curText == "list") mapSettings.ViewLayout = (int)Layout.List; - else if (curText == "icons") mapSettings.ViewLayout = (int)Layout.Icons; - else if (curText == "largeicons") mapSettings.ViewLayout = (int)Layout.LargeIcons; - else if (curText == "filmstrip") mapSettings.ViewLayout = (int)Layout.FilmStrip; - else mapSettings.ViewLayout = (int)Layout.List; + if (curText == "list") userSettings.ViewLayout = (int)Layout.List; + else if (curText == "icons") userSettings.ViewLayout = (int)Layout.Icons; + else if (curText == "largeicons") userSettings.ViewLayout = (int)Layout.LargeIcons; + else if (curText == "filmstrip") userSettings.ViewLayout = (int)Layout.FilmStrip; + else userSettings.ViewLayout = (int)Layout.List; CurrentSortMethod = (ProgramSort.SortMethod)xmlreader.GetValueAsInt("myprograms", "sortMethod", (int)ProgramSort.SortMethod.Title); - mapSettings.LastAppID = xmlreader.GetValueAsInt("myprograms", "lastAppID", -1); - mapSettings.LastViewLevel = xmlreader.GetValueAsInt("myprograms", "lastViewLevel", -1); - mapSettings.SortAscending = xmlreader.GetValueAsBool("myprograms", "sortASC", true); - mapSettings.OverviewVisible = xmlreader.GetValueAsBool("myprograms", "sortASC", true); - - StartWindow = xmlreader.GetValueAsInt("myprograms", "startWindow", GetID); + userSettings.LastAppID = xmlreader.GetValueAsInt("myprograms", "lastAppID", -1); + userSettings.LastViewLevel = xmlreader.GetValueAsInt("myprograms", "lastViewLevel", -1); + userSettings.SortAscending = xmlreader.GetValueAsBool("myprograms", "sortASC", true); + userSettings.OverviewVisible = xmlreader.GetValueAsBool("myprograms", "sortASC", true); } } - void LoadLastAppIDFromSettings() { using (Settings xmlreader = new Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) { - mapSettings.LastAppID = xmlreader.GetValueAsInt("myprograms", "lastAppID", -1); - mapSettings.LastViewLevel = xmlreader.GetValueAsInt("myprograms", "lastViewLevel", -1); - mapSettings.SortMethod = xmlreader.GetValueAsInt("myprograms", "sortMethod", 0); - mapSettings.SortAscending = xmlreader.GetValueAsBool("myprograms", "sortAsc", true); - mapSettings.OverviewVisible = xmlreader.GetValueAsBool("myprograms", "overviewvisible", true); + userSettings.LastAppID = xmlreader.GetValueAsInt("myprograms", "lastAppID", -1); + userSettings.LastViewLevel = xmlreader.GetValueAsInt("myprograms", "lastViewLevel", -1); + userSettings.SortMethod = xmlreader.GetValueAsInt("myprograms", "sortMethod", 0); + userSettings.SortAscending = xmlreader.GetValueAsBool("myprograms", "sortAsc", true); + userSettings.OverviewVisible = xmlreader.GetValueAsBool("myprograms", "overviewvisible", true); } } @@ -273,92 +190,34 @@ { if (directoryName == "") directoryName = "root"; + object o; - FolderSettings.GetFolderSetting(directoryName, "Programs", typeof(MapSettings), out o); + FolderSettings.GetFolderSetting(directoryName, "Programs", typeof(GUIProgramsAltUserSettings), out o); if (o != null) - mapSettings = o as MapSettings; - if (mapSettings == null) - mapSettings = new MapSettings(); + userSettings = o as GUIProgramsAltUserSettings; + if (userSettings == null) + userSettings = new GUIProgramsAltUserSettings(); } void SaveFolderSettings(string directoryName) { if (directoryName == "") directoryName = "root"; - FolderSettings.AddFolderSetting(directoryName, "Programs", typeof(MapSettings), mapSettings); + FolderSettings.AddFolderSetting(directoryName, "Programs", typeof(GUIProgramsAltUserSettings), userSettings); } - #endregion Serialisation - - - #region Variables - - static int startWindow = (int)GUIWindow.Window.WINDOW_FILES; - bool currentSortAsc = true; - // FacadeView - const int facadeIDConst = 50; - ProgramViewHandler viewHandler = ProgramViewHandler.Instance; - List<ApplicationItem> globalApplicationList;// dbHandlerInstance.ApplicationItemList; - DirectoryHistory itemHistory = new DirectoryHistory(); - int slideSpeed = 3000; // speed in milliseconds between two slides - long slideTime = 0; - bool skipInit = false; - static string _thumbnailPath = string.Empty; - static string _lastThumbnailPath = string.Empty; - - ProgramSort.SortMethod currentSortMethod = ProgramSort.SortMethod.Title; - DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance; - - MapSettings mapSettings = new MapSettings(); - ApplicationItem lastApp = null; - string prevFilepath = ""; - int selectedItemIndex = -1; - Layout currentLayout = Layout.List; - - // Buttons - [SkinControl(2)] - protected GUIButtonControl btnViewAs = null; - [SkinControlAttribute(3)] - protected GUISortButtonControl btnSortBy = null; - [SkinControl(4)] - protected GUIButtonControl btnViews = null; - [SkinControl(5)] - protected GUIButtonControl btnRefresh = null; - //Images - [SkinControl(6)] - protected GUIImage screenShotImage = null; - - [SkinControl(facadeIDConst)] - protected GUIFacadeControl facadeView = null; - - - - #endregion Variables - - #region Enums - - public enum Layout - { - List = 0, - Icons = 1, - LargeIcons = 2, - FilmStrip = 3, - } - - #endregion Enums - #region Constructor / Destructor public GUIProgramsAlt() { - GetID = (int)Window.WINDOW_FILES; + + GetID = (int)Window.WINDOW_FILES; } #endregion Constructor / Destructor - #region Properties / Helper Routines public ProgramViewHandler ViewHandler @@ -382,12 +241,6 @@ } } - public int StartWindow - { - get { return startWindow; } - set { startWindow = value; } - } - public virtual Layout CurrentLayout { get { return currentLayout; } @@ -514,7 +367,7 @@ } } - btnViewAs.Label = mapSettings.ViewLayoutTextName; + btnViewAs.Label = userSettings.ViewLayoutTextName; switch (CurrentSortMethod) { @@ -549,7 +402,7 @@ { int itemIndex = facadeView.SelectedListItemIndex; - switch ((Layout)mapSettings.ViewLayout) + switch ((Layout)userSettings.ViewLayout) { case Layout.List: facadeView.View = GUIFacadeControl.ViewMode.List; @@ -768,13 +621,13 @@ lastApp = this.dbHandlerInstance.GetAppByID(lastApp.FatherID); if (lastApp != null) { - mapSettings.LastAppID = lastApp.ApplicationItemId; + userSettings.LastAppID = lastApp.ApplicationItemId; prevFilepath = lastApp.DefaultFilepath(); } else { // back to home screen..... - mapSettings.LastAppID = -1; + userSettings.LastAppID = -1; prevFilepath = ""; } } @@ -956,7 +809,7 @@ lastApp = (ApplicationItem)item; SaveItemIndex(GetSelectedItemNo().ToString(), lastApp, lastApp.lastFilepath); - mapSettings.LastAppID = lastApp.ApplicationItemId; + userSettings.LastAppID = lastApp.ApplicationItemId; prevFilepath = lastApp.DefaultFilepath(); ViewHandler.CurrentLevel = 0; //lastApp.ViewHandler = ViewHandler; @@ -968,7 +821,7 @@ if (lastApp != null) { - mapSettings.LastAppID = lastApp.ApplicationItemId; + userSettings.LastAppID = lastApp.ApplicationItemId; prevFilepath = lastApp.DefaultFilepath(); lastApp.LaunchFile(fileItem); } @@ -1180,35 +1033,20 @@ if (dlg.SelectedLabel == -1) return; if (dlg.SelectedLabel == 0) { - int nNewWindow = (int)Window.WINDOW_FILES; - StartWindow = nNewWindow; - mapSettings.ViewLayout = (int)Layout.List; + userSettings.ViewLayout = (int)Layout.List; ViewHandler.CurrentView = GUILocalizeStrings.Get(100000 + GetID);//my files - if (nNewWindow != GetID) - { - GUIWindowManager.ReplaceWindow(nNewWindow); - } } else { ViewDefinition selectedView = (ViewDefinition)ViewHandler.Views[dlg.SelectedLabel - 1]; ViewHandler.CurrentView = selectedView.Name; - int nNewWindow = (int)Window.WINDOW_FILES; - if (GetID != nNewWindow) - { - StartWindow = nNewWindow; - if (nNewWindow != GetID) - { - GUIWindowManager.ReplaceWindow(nNewWindow); - } - } - else - { + + if (facadeView.Count <= 0) { GUIControl.FocusControl(GetID, btnViewAs.GetID); } - } + } UpdateButtonStates(); @@ -1237,19 +1075,19 @@ if (skipInit) { - mapSettings.LastAppID = -1; + userSettings.LastAppID = -1; } else { LoadLastAppIDFromSettings(); // hacky load back the last applicationItem id, otherwise this can get lost from dx resets.... } - lastApp = this.dbHandlerInstance.GetAppByID(mapSettings.LastAppID); + lastApp = this.dbHandlerInstance.GetAppByID(userSettings.LastAppID); if (lastApp != null) { prevFilepath = lastApp.DefaultFilepath(); - this.CurrentSortAsc = mapSettings.SortAscending; - ViewHandler.CurrentLevel = mapSettings.LastViewLevel; + this.CurrentSortAsc = userSettings.SortAscending; + ViewHandler.CurrentLevel = userSettings.LastViewLevel; } else { @@ -1331,7 +1169,7 @@ if (control == btnViewAs) { - mapSettings.SwitchToNextViewLayout(); + userSettings.SwitchToNextViewLayout(); ShowThumbPanel(); Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj 2007-08-26 18:09:04 UTC (rev 867) @@ -7,8 +7,8 @@ <ProjectGuid>{F34EBAC9-C5B9-48FD-B82D-C6BA907F81B0}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>GUIPrograms</RootNamespace> - <AssemblyName>GUIPrograms</AssemblyName> + <RootNamespace>GUIProgramsAlt</RootNamespace> + <AssemblyName>GUIProgramsAlt</AssemblyName> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -142,6 +142,7 @@ </Compile> <Compile Include="GUIProgramsAlt.cs" /> <Compile Include="GUIProgramsAltFileInfo.cs" /> + <Compile Include="GUIProgramsAltUserSettings.cs" /> <Compile Include="Imports\AllGameScraper.cs" /> <Compile Include="Imports\DirectoryImport.cs" /> <Compile Include="Imports\GamebaseImport.cs" /> Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -40,14 +40,14 @@ using MediaPortal.Video.Database; -using GUIPrograms.Database; +using GUIProgramsAlt.Database; using MediaPortal.Configuration; -using GUIPrograms.Items; +using GUIProgramsAlt.Items; -namespace GUIPrograms +namespace GUIProgramsAlt { /// <summary> /// Added: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltUserSettings.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltUserSettings.cs (rev 0) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltUserSettings.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -0,0 +1,137 @@ +using System; + +using System.Xml.Serialization; +using System.Collections.Generic; +using System.Text; + + +using MediaPortal.GUI.Library; +using MediaPortal.Util; + +namespace GUIProgramsAlt +{ + [Serializable] + public class GUIProgramsAltUserSettings + { + protected int sortMethod; + protected int viewLayout; + protected bool sortAscending; + protected int lastApplicationID; + protected int lastFileID; + protected int lastViewLevel; + protected bool overviewVisible; + + public GUIProgramsAltUserSettings() + { + sortMethod = 0; //name + viewLayout = 0; //list + sortAscending = true; + overviewVisible = true; + lastApplicationID = -1; + lastFileID = -1; + lastViewLevel = 0; + } + + [XmlElement("SortMethod")] + public int SortMethod + { + get { return sortMethod; } + set { sortMethod = value; } + } + + [XmlElement("ViewLayout")] + public int ViewLayout + { + get { return viewLayout; } + set { viewLayout = value; } + } + + [XmlElement("SortAscending")] + public bool SortAscending + { + get { return sortAscending; } + set { sortAscending = value; } + } + + [XmlElement("OverviewVisible")] + public bool OverviewVisible + { + get { return overviewVisible; } + set { overviewVisible = value; } + } + + [XmlElement("LastAppID")] + public int LastAppID + { + get { return lastApplicationID; } + set { lastApplicationID = value; } + } + + [XmlElement("LastFileID")] + public int LastFileID + { + get { return lastFileID; } + set { lastFileID = value; } + } + + [XmlElement("LastViewLevelID")] + public int LastViewLevel + { + get { return lastViewLevel; } + set { lastViewLevel = value; } + } + + + public string ViewLayoutTextName + { + get { return GetViewLayoutAsText(); } + } + + string GetViewLayoutAsText() + { + string result = ""; + switch ((Layout)ViewLayout) + { + case Layout.List: + result = GUILocalizeStrings.Get(101); + break; + case Layout.Icons: + result = GUILocalizeStrings.Get(100); + break; + case Layout.LargeIcons: + result = GUILocalizeStrings.Get(417); + break; + case Layout.FilmStrip: + result = GUILocalizeStrings.Get(733); + break; + } + return result; + } + + public void SwitchToNextViewLayout() + { + switch ((Layout)ViewLayout) + { + case Layout.List: + ViewLayout = (int)Layout.Icons; + + break; + case Layout.Icons: + ViewLayout = (int)Layout.LargeIcons; + + break; + case Layout.LargeIcons: + ViewLayout = (int)Layout.FilmStrip; + + break; + case Layout.FilmStrip: + ViewLayout = (int)Layout.List; + + break; + } + } + + + } + +} Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/AllGameScraper.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/AllGameScraper.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/AllGameScraper.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -31,12 +31,12 @@ using System.Text.RegularExpressions; using MediaPortal.Utils; -using GUIPrograms; +using GUIProgramsAlt; using MediaPortal.GUI.Library; -using GUIPrograms.Database; -using GUIPrograms.Items; +using GUIProgramsAlt.Database; +using GUIProgramsAlt.Items; -namespace GUIPrograms.Imports +namespace GUIProgramsAlt.Imports { /// <summary> /// Gets information from an AllGame WebPage Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -5,14 +5,14 @@ using MediaPortal.GUI.Library; -using GUIPrograms.Items; -using GUIPrograms; -using GUIPrograms.Database; +using GUIProgramsAlt.Items; +using GUIProgramsAlt; +using GUIProgramsAlt.Database; using System.Data.SQLite; using System.IO; -namespace GUIPrograms.Imports +namespace GUIProgramsAlt.Imports { public class DirectoryImport: ImportBase { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -29,13 +29,13 @@ using MediaPortal.GUI.Library; -using GUIPrograms.Items; -using GUIPrograms; -using GUIPrograms.Database; +using GUIProgramsAlt.Items; +using GUIProgramsAlt; +using GUIProgramsAlt.Database; using System.Data.SQLite; -namespace GUIPrograms.Imports +namespace GUIProgramsAlt.Imports { /// <summary> /// Summary description for GamebaseImport. Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/ImportBase.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/ImportBase.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/ImportBase.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -3,9 +3,9 @@ using System.Text; using System.IO; -using GUIPrograms.Items; +using GUIProgramsAlt.Items; -namespace GUIPrograms.Imports +namespace GUIProgramsAlt.Imports { public abstract class ImportBase { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -35,13 +35,13 @@ using System.Text.RegularExpressions; using System.Text; -using GUIPrograms.Items; -using GUIPrograms; -using GUIPrograms.Database; +using GUIProgramsAlt.Items; +using GUIProgramsAlt; +using GUIProgramsAlt.Database; -namespace GUIPrograms.Imports +namespace GUIProgramsAlt.Imports { /// <summary> /// Summary description for MameImport. Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -40,13 +40,13 @@ using MediaPortal.Dialogs; using MediaPortal.Util; -using GUIPrograms; -using GUIPrograms.Database; -using GUIPrograms.Items; +using GUIProgramsAlt; +using GUIProgramsAlt.Database; +using GUIProgramsAlt.Items; #endregion Imports -namespace GUIPrograms.Items +namespace GUIProgramsAlt.Items { public abstract class ApplicationItem { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -37,15 +37,15 @@ using MediaPortal.GUI.Library; using MediaPortal.Util; -using GUIPrograms; -using GUIPrograms.Imports; -using GUIPrograms.Database; -using GUIPrograms.Items; +using GUIProgramsAlt; +using GUIProgramsAlt.Imports; +using GUIProgramsAlt.Database; +using GUIProgramsAlt.Items; #endregion Imports -namespace GUIPrograms.Items +namespace GUIProgramsAlt.Items { /// <summary> /// Summary description for ApplicationItemDirectoryCache. Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -24,12 +24,12 @@ #endregion using System; -using GUIPrograms; -using GUIPrograms.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Database; using System.Data.SQLite; using System.Data; -namespace GUIPrograms.Items +namespace GUIProgramsAlt.Items { /// <summary> /// Factory like object that creates the matchin Application descendant class Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -31,11 +31,11 @@ using MediaPortal.Dialogs; using MediaPortal.GUI.Library; -using GUIPrograms; -using GUIPrograms.Database; -using GUIPrograms.Imports; +using GUIProgramsAlt; +using GUIProgramsAlt.Database; +using GUIProgramsAlt.Imports; -namespace GUIPrograms.Items +namespace GUIProgramsAlt.Items { /// <summary> /// Summary description for ApplicationItemGameBase. Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -26,11 +26,11 @@ using MediaPortal.GUI.Library; using System.Data.SQLite; using System.Data; -using GUIPrograms.Database; +using GUIProgramsAlt.Database; -using GUIPrograms.Items; +using GUIProgramsAlt.Items; -namespace GUIPrograms.Items +namespace GUIProgramsAlt.Items { /// <summary> /// Summary description for appFilesEdit. Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -34,12 +34,12 @@ using MediaPortal.Dialogs; using MediaPortal.GUI.Library; -using GUIPrograms; -using GUIPrograms.Imports; +using GUIProgramsAlt; +using GUIProgramsAlt.Imports; #endregion Imports -namespace GUIPrograms.Items +namespace GUIProgramsAlt.Items { /// <summary> /// Summary description for ApplicationItemMame. Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -33,12 +33,12 @@ using MediaPortal.Configuration; using MediaPortal.GUI.Library; -using GUIPrograms; -using GUIPrograms.Database; -using GUIPrograms.Items; -using GUIPrograms.Imports; +using GUIProgramsAlt; +using GUIProgramsAlt.Database; +using GUIProgramsAlt.Items; +using GUIProgramsAlt.Imports; -namespace GUIPrograms.Items +namespace GUIProgramsAlt.Items { public class FileItem { Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItemInfo.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItemInfo.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItemInfo.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -29,12 +29,12 @@ using MediaPortal.Util; -using GUIPrograms.Items; +using GUIProgramsAlt.Items; // just 4 useMPsThumbsDirectory variable -using GUIPrograms.Database; +using GUIProgramsAlt.Database; -namespace GUIPrograms.Items +namespace GUIProgramsAlt.Items { /// <summary> /// Summary description for FileInfo. Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -30,10 +30,10 @@ using MediaPortal.GUI.Library; -using GUIPrograms; -using GUIPrograms.Database; +using GUIProgramsAlt; +using GUIProgramsAlt.Database; -namespace GUIPrograms.Items +namespace GUIProgramsAlt.Items { /// <summary> /// Summary description for FilelinkItem. Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilterItem.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilterItem.cs 2007-08-25 22:33:24 UTC (rev 866) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilterItem.cs 2007-08-26 18:09:04 UTC (rev 867) @@ -11,12 +11,12 @@ using MediaPortal.Ripper; using MediaPortal.Util; -using GUIPrograms; -using GUIPrograms... [truncated message content] |