From: <che...@us...> - 2007-08-06 09:46:48
|
Revision: 796 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=796&view=rev Author: chef_koch Date: 2007-08-06 02:46:45 -0700 (Mon, 06 Aug 2007) Log Message: ----------- moved duplicated code to AppSettingsBase Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs 2007-08-05 22:21:57 UTC (rev 795) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs 2007-08-06 09:46:45 UTC (rev 796) @@ -189,9 +189,9 @@ this.winStyleComboBox.FormattingEnabled = true; this.winStyleComboBox.Items.AddRange(new object[] { "Normal", + "Hidden", "Minimized", - "Maximized", - "Hidden"}); + "Maximized"}); this.winStyleComboBox.Location = new System.Drawing.Point(94, 150); this.winStyleComboBox.Name = "winStyleComboBox"; this.winStyleComboBox.Size = new System.Drawing.Size(325, 21); Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-08-05 22:21:57 UTC (rev 795) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-08-06 09:46:45 UTC (rev 796) @@ -56,94 +56,53 @@ { base.LoadSettings(curApp); - AppItemToForm(curApp); - } + enabledCheckbox.Checked = curApp.Enabled; + titleTextBox.Text = curApp.Title; - public override void SaveSettings(ApplicationItem curApp) - { - base.SaveSettings(curApp); + applicationExeTextBox.Text = curApp.Filename; + applicationArgumentsTextBox.Text = curApp.Arguments; + // Pre-Post-Launch + preLaunch = curApp.PreLaunch; + postLaunch = curApp.PostLaunch; + // ProcessWindowStyle + // The enumerator ProcessWindowStyle has these items: + //Normal = 0, + //Hidden = 1, + //Minimized = 2, + //Maximized = 3, + // In our comboBox we use now the same order, so we only need to use the integer of the enum. + winStyleComboBox.SelectedIndex = (int)curApp.WindowStyle; - FormToAppItem(curApp); - } - - - - - - - - - public virtual bool AppItemToForm(ApplicationItem curApp) - { - if (curApp != null) - { - preLaunch = curApp.PreLaunch; - postLaunch = curApp.PostLaunch; - } - + // Image settings if (ProgramUtils.UseThumbsDir()) - applicationImageTextBox.Text = MediaPortal.Util.Utils.GetCoverArtName( - Config.GetSubFolder(Config.Dir.Thumbs, @"MyProgramsAlt"), - titleTextBox.Text); + applicationImageTextBox.Text = ProgramUtils.GetApplicationImage(curApp); else applicationImageTextBox.Text = curApp.Imagefile; applicationImageTextBox.ReadOnly = ProgramUtils.UseThumbsDir(); applicationImageButton.Visible = !ProgramUtils.UseThumbsDir(); - - return true; } - public virtual void FormToAppItem(ApplicationItem curApp) + public override void SaveSettings(ApplicationItem curApp) { - if (curApp != null) - { - curApp.PreLaunch = preLaunch; - curApp.PostLaunch = postLaunch; - } + base.SaveSettings(curApp); + curApp.Enabled = enabledCheckbox.Checked; + curApp.Title = titleTextBox.Text; + + curApp.Filename = applicationExeTextBox.Text; + curApp.Arguments = applicationArgumentsTextBox.Text; + // Pre-Post-Launch + curApp.PreLaunch = preLaunch; + curApp.PostLaunch = postLaunch; + // ProcessWindowStyle + curApp.WindowStyle = (ProcessWindowStyle)winStyleComboBox.SelectedIndex; + + // Image settings if (!ProgramUtils.UseThumbsDir()) curApp.Imagefile = applicationImageTextBox.Text; } - protected void SetWindowStyle(ProcessWindowStyle val) - { - switch (val) - { - case ProcessWindowStyle.Normal: - winStyleComboBox.SelectedIndex = 0; - break; - case ProcessWindowStyle.Minimized: - winStyleComboBox.SelectedIndex = 1; - break; - case ProcessWindowStyle.Maximized: - winStyleComboBox.SelectedIndex = 2; - break; - case ProcessWindowStyle.Hidden: - winStyleComboBox.SelectedIndex = 3; - break; - } - } - - protected ProcessWindowStyle GetSelectedWindowStyle() - { - if (winStyleComboBox.SelectedIndex == 1) - { - return ProcessWindowStyle.Minimized; - } - else if (winStyleComboBox.SelectedIndex == 2) - { - return ProcessWindowStyle.Maximized; - } - else if (winStyleComboBox.SelectedIndex == 3) - { - return ProcessWindowStyle.Hidden; - } - else - return ProcessWindowStyle.Normal; - - } - private void InitDefault() { //{ Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-05 22:21:57 UTC (rev 795) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-08-06 09:46:45 UTC (rev 796) @@ -45,15 +45,11 @@ InitializeComponent(); } - public override bool AppItemToForm(ApplicationItem curApp) + public override void LoadSettings(ApplicationItem curApp) { ProgramUtils.FillComboBox("tblPlatform", "platform", platformComboBox); - base.AppItemToForm(curApp); - enabledCheckbox.Checked = curApp.Enabled; - titleTextBox.Text = curApp.Title; - applicationExeTextBox.Text = curApp.Filename; - applicationArgumentsTextBox.Text = curApp.Arguments; - SetWindowStyle(curApp.WindowStyle); + base.LoadSettings(curApp); + startupDirComboBox.Text = curApp.StartupDir; shellexecuteCheckBox.Checked = curApp.UseShellExecute; quoteCheckBox.Checked = curApp.UseQuotes; @@ -63,27 +59,22 @@ { platformComboBox.SelectedValue = curApp.PlatformId; } - - return true; } - public override void FormToAppItem(ApplicationItem curApp) + public override void SaveSettings(ApplicationItem curApp) { - base.FormToAppItem(curApp); - curApp.Enabled = this.enabledCheckbox.Checked; - curApp.Title = titleTextBox.Text; - curApp.Filename = applicationExeTextBox.Text; - curApp.Arguments = applicationArgumentsTextBox.Text; - curApp.WindowStyle = GetSelectedWindowStyle(); + base.SaveSettings(curApp); + curApp.StartupDir = startupDirComboBox.Text; curApp.UseShellExecute = shellexecuteCheckBox.Checked; curApp.UseQuotes = quoteCheckBox.Checked; curApp.WaitForExit = waitExitCheckBox.Checked; curApp.SourceType = ItemType.DIRCACHE; - curApp.RefreshGUIAllowed = (allowRefreshCheckBox.Checked); - curApp.PlatformId =(int) platformComboBox.SelectedValue; + curApp.RefreshGUIAllowed = allowRefreshCheckBox.Checked; + curApp.PlatformId = (int)platformComboBox.SelectedValue; } + public override bool EntriesOK(ApplicationItem curApp) { conditionChecker.Clear(); @@ -104,13 +95,13 @@ return conditionChecker.IsOk; } + public override void LoadFromAppItem(ApplicationItem applicationItem) { titleTextBox.Text = applicationItem.Title; applicationExeTextBox.Text = applicationItem.Filename; applicationArgumentsTextBox.Text = applicationItem.Arguments; - SetWindowStyle(applicationItem.WindowStyle); startupDirComboBox.Text = applicationItem.StartupDir; shellexecuteCheckBox.Checked = applicationItem.UseShellExecute; quoteCheckBox.Checked = applicationItem.UseQuotes; Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-05 22:21:57 UTC (rev 795) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-08-06 09:46:45 UTC (rev 796) @@ -46,53 +46,41 @@ InitializeComponent(); } - private void AppSettingsGamebase_Load(object sender, EventArgs e) + public override void LoadSettings(ApplicationItem curApp) { - // 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; - } + base.LoadSettings(curApp); - public override bool AppItemToForm(ApplicationItem curApp) - { - - base.AppItemToForm(curApp); - this.enabledCheckbox.Checked = curApp.Enabled; - this.titleTextBox.Text = curApp.Title; - this.applicationExeTextBox.Text = curApp.Filename; - this.applicationArgumentsTextBox.Text = curApp.Arguments; this.startupDirComboBox.Text = curApp.StartupDir; - this.quoteCheckBox.Checked = true; //(curApp.UseQuotes); this.waitExitCheckBox.Checked = (curApp.WaitForExit); - SetWindowStyle(curApp.WindowStyle); - this.allowRefreshCheckBox.Checked = curApp.RefreshGUIAllowed; - - return true; } - public override void FormToAppItem(ApplicationItem curApp) + public override void SaveSettings(ApplicationItem curApp) { - base.FormToAppItem(curApp); - curApp.Enabled = this.enabledCheckbox.Checked; - curApp.Title = this.titleTextBox.Text; - curApp.Filename = this.applicationExeTextBox.Text; - curApp.Arguments = this.applicationArgumentsTextBox.Text; - curApp.WindowStyle = GetSelectedWindowStyle(); + base.SaveSettings(curApp); + curApp.StartupDir = this.startupDirComboBox.Text; curApp.UseShellExecute = this.shellexecuteCheckBox.Checked; curApp.UseQuotes = this.quoteCheckBox.Checked; curApp.WaitForExit = this.waitExitCheckBox.Checked; curApp.SourceType = ItemType.GAMEBASE; - curApp.RefreshGUIAllowed = this.allowRefreshCheckBox.Checked; } + + private void AppSettingsGamebase_Load(object sender, EventArgs e) + { + // 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; + } + + public override bool EntriesOK(ApplicationItem curApp) { conditionChecker.Clear(); @@ -113,6 +101,7 @@ return conditionChecker.IsOk; } + private void informationLabel_Click(object sender, EventArgs e) { ProcessStartInfo startInfo = new ProcessStartInfo(@"http://www.bu22.com/"); Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs 2007-08-05 22:21:57 UTC (rev 795) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.cs 2007-08-06 09:46:45 UTC (rev 796) @@ -44,6 +44,19 @@ InitializeComponent(); } + public override void LoadSettings(ApplicationItem curApp) + { + base.LoadSettings(curApp); + } + + public override void SaveSettings(ApplicationItem curApp) + { + base.SaveSettings(curApp); + + curApp.SourceType = ItemType.GROUPER; + } + + private void AppSettingsGrouper_Load(object sender, EventArgs e) { winTypeLabel.Text = "Grouper."; @@ -68,25 +81,7 @@ shellexecuteCheckBox.Visible = false; informationLabel.Visible = false; - this.prePostButton.Visible = false; + prePostButton.Visible = false; } - - public override void FormToAppItem(ApplicationItem curApp) - { - base.FormToAppItem(curApp); - curApp.Enabled = enabledCheckbox.Checked; - curApp.Title = titleTextBox.Text; - curApp.SourceType = ItemType.GROUPER; - - } - - public override bool AppItemToForm(ApplicationItem curApp) - { - base.AppItemToForm(curApp); - this.enabledCheckbox.Checked = curApp.Enabled; - titleTextBox.Text = curApp.Title; - - return true; - } } } \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs 2007-08-05 22:21:57 UTC (rev 795) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.cs 2007-08-06 09:46:45 UTC (rev 796) @@ -46,34 +46,20 @@ InitializeComponent(); } - public override bool AppItemToForm(ApplicationItem curApp) + public override void LoadSettings(ApplicationItem curApp) { - base.AppItemToForm(curApp); - this.enabledCheckbox.Checked = curApp.Enabled; - this.titleTextBox.Text = curApp.Title; - this.applicationExeTextBox.Text = curApp.Filename; - this.applicationArgumentsTextBox.Text = curApp.Arguments; - SetWindowStyle(curApp.WindowStyle); - - return true; + base.LoadSettings(curApp); } - public override void FormToAppItem(ApplicationItem curApp) + public override void SaveSettings(ApplicationItem curApp) { + base.SaveSettings(curApp); - base.FormToAppItem(curApp); - curApp.Enabled = this.enabledCheckbox.Checked; - curApp.Title = this.titleTextBox.Text; - curApp.Filename = this.applicationExeTextBox.Text; - curApp.Arguments = this.applicationArgumentsTextBox.Text; - curApp.WindowStyle = GetSelectedWindowStyle(); curApp.SourceType = ItemType.MAMEDIRECT; - - curApp.RefreshGUIAllowed = true; - } + void catverLink_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e) { LaunchLink(catverLink.Text); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |