From fcaa037aa6b5dafd9a44ae7e9f1ce8bf98bac78d Mon Sep 17 00:00:00 2001 From: PeterForstmeier Date: Fri, 30 Mar 2012 20:20:01 +0200 Subject: [PATCH] Convert SelectStylePanel from *.xrfm to Wpf --- .../Project/ICSharpCode.SharpDevelop.addin | 4 +++ .../Project/ICSharpCode.SharpDevelop.csproj | 9 +++-- ...lePanel.xfrm => old_SelectStylePanel.xfrm} | 0 .../IDEOptions/SelectStylePanelXaml.xaml | 36 +++++++++++++++++++ ...tStylePanel.cs => old_SelectStylePanel.cs} | 2 +- 5 files changed, 48 insertions(+), 3 deletions(-) rename src/Main/Base/Project/Resources/{SelectStylePanel.xfrm => old_SelectStylePanel.xfrm} (100%) create mode 100644 src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanelXaml.xaml rename src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/{SelectStylePanel.cs => old_SelectStylePanel.cs} (97%) diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin index 499f25d7f0..97a2636bd3 100755 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin @@ -1183,6 +1183,10 @@ + + diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index ec91625130..da23b6936b 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -253,6 +253,10 @@ SelectCulturePanel.xaml Code + + SelectStylePanelXaml.xaml + Code + TaskListOptionsl.xaml Code @@ -529,7 +533,7 @@ UserControl - + UserControl @@ -707,7 +711,7 @@ - + @@ -885,6 +889,7 @@ + diff --git a/src/Main/Base/Project/Resources/SelectStylePanel.xfrm b/src/Main/Base/Project/Resources/old_SelectStylePanel.xfrm similarity index 100% rename from src/Main/Base/Project/Resources/SelectStylePanel.xfrm rename to src/Main/Base/Project/Resources/old_SelectStylePanel.xfrm diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanelXaml.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanelXaml.xaml new file mode 100644 index 0000000000..d5465c54b0 --- /dev/null +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanelXaml.xaml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/old_SelectStylePanel.cs similarity index 97% rename from src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs rename to src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/old_SelectStylePanel.cs index cdf5c4ad97..e19dad2b60 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/old_SelectStylePanel.cs @@ -7,7 +7,7 @@ using ICSharpCode.Core; namespace ICSharpCode.SharpDevelop.Gui.OptionPanels { - public class SelectStylePanel : XmlFormsOptionPanel + public class old_SelectStylePanel : XmlFormsOptionPanel { CheckBox showExtensionsCheckBox = new CheckBox();