From 6d868f9b7baa3add154849b85f57c81675425d01 Mon Sep 17 00:00:00 2001 From: PeterForstmeier Date: Fri, 30 Mar 2012 20:36:13 +0200 Subject: [PATCH] Cleanup --- .../Project/ICSharpCode.SharpDevelop.addin | 6 +- .../Project/ICSharpCode.SharpDevelop.csproj | 10 +-- .../Resources/old_SelectStylePanel.xfrm | 79 ------------------- ...lePanelXaml.xaml => SelectStylePanel.xaml} | 2 +- .../IDEOptions/SelectStylePanel.xaml.cs | 67 ++++++++++++++++ .../IDEOptions/old_SelectStylePanel.cs | 44 ----------- 6 files changed, 72 insertions(+), 136 deletions(-) delete mode 100644 src/Main/Base/Project/Resources/old_SelectStylePanel.xfrm rename src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/{SelectStylePanelXaml.xaml => SelectStylePanel.xaml} (84%) create mode 100644 src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.xaml.cs delete mode 100644 src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/old_SelectStylePanel.cs diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin index 97a2636bd3..5ff8075bc9 100755 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin @@ -1182,11 +1182,7 @@ class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.SelectCulturePanel"/> - - + class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.SelectStylePanel"/> diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index da23b6936b..67901c4cbd 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -253,8 +253,8 @@ SelectCulturePanel.xaml Code - - SelectStylePanelXaml.xaml + + SelectStylePanel.xaml Code @@ -533,9 +533,6 @@ UserControl - - UserControl - Component @@ -711,7 +708,6 @@ - @@ -889,7 +885,7 @@ - + diff --git a/src/Main/Base/Project/Resources/old_SelectStylePanel.xfrm b/src/Main/Base/Project/Resources/old_SelectStylePanel.xfrm deleted file mode 100644 index c26c4365f6..0000000000 --- a/src/Main/Base/Project/Resources/old_SelectStylePanel.xfrm +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanelXaml.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.xaml similarity index 84% rename from src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanelXaml.xaml rename to src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.xaml index d5465c54b0..10cc759aaf 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanelXaml.xaml +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.xaml @@ -1,6 +1,6 @@ + x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.SelectStylePanel" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui" xmlns:core="http://icsharpcode.net/sharpdevelop/core"> + /// Interaction logic for SelectStylePanelXaml.xaml + /// + public partial class SelectStylePanel :OptionPanel + { + public SelectStylePanel() + { + InitializeComponent(); + } + + public override void LoadOptions() + { + base.LoadOptions(); + + this.showExtensionsCheckBox.IsChecked = PropertyService.Get("ICSharpCode.SharpDevelop.Gui.ProjectBrowser.ShowExtensions", true); + + AddInTreeNode treeNode = AddInTree.GetTreeNode("/SharpDevelop/Workbench/Ambiences"); + + foreach (Codon codon in treeNode.Codons) { + this.selectAmbienceComboBox.Items.Add(codon.Id); + } + + this.selectAmbienceComboBox.Text = PropertyService.Get("SharpDevelop.UI.CurrentAmbience", "C#"); + + this.preferProjectAmbienceCheckBox.IsChecked = AmbienceService.UseProjectAmbienceIfPossible; + + this.showStatusBarCheckBox.IsChecked = PropertyService.Get("ICSharpCode.SharpDevelop.Gui.StatusBarVisible", true); + this.showToolBarCheckBox.IsChecked = PropertyService.Get("ICSharpCode.SharpDevelop.Gui.ToolBarVisible", true); + this.useProfessionalStyleCheckBox.IsChecked = PropertyService.Get("ICSharpCode.SharpDevelop.Gui.UseProfessionalRenderer", true); + } + + + public override bool SaveOptions() + { + PropertyService.Set("ICSharpCode.SharpDevelop.Gui.ProjectBrowser.ShowExtensions",this.showExtensionsCheckBox.IsChecked); + PropertyService.Set("SharpDevelop.UI.CurrentAmbience", this.selectAmbienceComboBox.Text); + PropertyService.Set("ICSharpCode.SharpDevelop.Gui.StatusBarVisible", this.showStatusBarCheckBox.IsChecked); + PropertyService.Set("ICSharpCode.SharpDevelop.Gui.ToolBarVisible", this.showToolBarCheckBox.IsChecked); + PropertyService.Set("ICSharpCode.SharpDevelop.Gui.UseProfessionalRenderer", this.useProfessionalStyleCheckBox.IsChecked); + AmbienceService.UseProjectAmbienceIfPossible = (bool)this.preferProjectAmbienceCheckBox.IsChecked; + return true; + } + } +} \ No newline at end of file diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/old_SelectStylePanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/old_SelectStylePanel.cs deleted file mode 100644 index e19dad2b60..0000000000 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/old_SelectStylePanel.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Windows.Forms; -using ICSharpCode.Core; - -namespace ICSharpCode.SharpDevelop.Gui.OptionPanels -{ - public class old_SelectStylePanel : XmlFormsOptionPanel - { - CheckBox showExtensionsCheckBox = new CheckBox(); - - public override void LoadPanelContents() - { - SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.SelectStylePanel.xfrm")); - - Get("showExtensions").Checked = PropertyService.Get("ICSharpCode.SharpDevelop.Gui.ProjectBrowser.ShowExtensions", true); - - AddInTreeNode treeNode = AddInTree.GetTreeNode("/SharpDevelop/Workbench/Ambiences"); - foreach (Codon codon in treeNode.Codons) { - ((ComboBox)ControlDictionary["selectAmbienceComboBox"]).Items.Add(codon.Id); - } - - ControlDictionary["selectAmbienceComboBox"].Text = PropertyService.Get("SharpDevelop.UI.CurrentAmbience", "C#"); - Get("preferProjectAmbience").Checked = AmbienceService.UseProjectAmbienceIfPossible; - - Get("showStatusBar").Checked = PropertyService.Get("ICSharpCode.SharpDevelop.Gui.StatusBarVisible", true); - Get("showToolBar").Checked = PropertyService.Get("ICSharpCode.SharpDevelop.Gui.ToolBarVisible", true); - Get("useProfessionalStyle").Checked = PropertyService.Get("ICSharpCode.SharpDevelop.Gui.UseProfessionalRenderer", true); - } - - public override bool StorePanelContents() - { - PropertyService.Set("ICSharpCode.SharpDevelop.Gui.ProjectBrowser.ShowExtensions", ((CheckBox)ControlDictionary["showExtensionsCheckBox"]).Checked); - PropertyService.Set("SharpDevelop.UI.CurrentAmbience", ((ComboBox)ControlDictionary["selectAmbienceComboBox"]).Text); - PropertyService.Set("ICSharpCode.SharpDevelop.Gui.StatusBarVisible", ((CheckBox)ControlDictionary["showStatusBarCheckBox"]).Checked); - PropertyService.Set("ICSharpCode.SharpDevelop.Gui.ToolBarVisible", ((CheckBox)ControlDictionary["showToolBarCheckBox"]).Checked); - PropertyService.Set("ICSharpCode.SharpDevelop.Gui.UseProfessionalRenderer", Get("useProfessionalStyle").Checked); - AmbienceService.UseProjectAmbienceIfPossible = Get("preferProjectAmbience").Checked; - return true; - } - } -}