Browse Source

Convert SelectStylePanel from *.xrfm to Wpf

pull/30/head
PeterForstmeier 13 years ago
parent
commit
fcaa037aa6
  1. 4
      src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
  2. 9
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  3. 0
      src/Main/Base/Project/Resources/old_SelectStylePanel.xfrm
  4. 36
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanelXaml.xaml
  5. 2
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/old_SelectStylePanel.cs

4
src/Main/Base/Project/ICSharpCode.SharpDevelop.addin

@ -1183,6 +1183,10 @@ @@ -1183,6 +1183,10 @@
<OptionPanel id = "SelectStyle"
label = "${res:Dialog.Options.IDEOptions.SelectVisualStyle.PanelName}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.SelectStylePanel"/>
<OptionPanel id = "SelectStyleXaml"
label = "${res:Dialog.Options.IDEOptions.SelectVisualStyle.PanelName}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.SelectStylePanelXaml"/>
<OptionPanel id = "LoadSave"
label = "${res:Dialog.Options.IDEOptions.LoadSaveOptions.PanelName}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.LoadSaveOptions"/>

9
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -253,6 +253,10 @@ @@ -253,6 +253,10 @@
<DependentUpon>SelectCulturePanel.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectStylePanelXaml.xaml.cs">
<DependentUpon>SelectStylePanelXaml.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsl.xaml.cs">
<DependentUpon>TaskListOptionsl.xaml</DependentUpon>
<SubType>Code</SubType>
@ -529,7 +533,7 @@ @@ -529,7 +533,7 @@
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectStylePanel.cs">
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\old_SelectStylePanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\AssemblyReferencePanel.cs">
@ -707,7 +711,7 @@ @@ -707,7 +711,7 @@
<EmbeddedResource Include="Resources\NewFileWithNameDialog.xfrm" />
<EmbeddedResource Include="Resources\NewFileDialog.xfrm" />
<EmbeddedResource Include="Resources\OutputWindowOptionsPanel.xfrm" />
<EmbeddedResource Include="Resources\SelectStylePanel.xfrm" />
<EmbeddedResource Include="Resources\old_SelectStylePanel.xfrm" />
<EmbeddedResource Include="Resources\WordCountDialog.xfrm" />
<Compile Include="Src\Bookmarks\BookmarkBase.cs" />
<Compile Include="Src\Bookmarks\Commands\MenuCommands.cs" />
@ -885,6 +889,7 @@ @@ -885,6 +889,7 @@
<ItemGroup>
<Page Include="Src\Bookmarks\Pad\Controls\ListViewPad.xaml" />
<Page Include="Src\Gui\Components\StringListEditorXaml.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectStylePanelXaml.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsl.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildEvents.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\DebugOptions.xaml" />

0
src/Main/Base/Project/Resources/SelectStylePanel.xfrm → src/Main/Base/Project/Resources/old_SelectStylePanel.xfrm

36
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanelXaml.xaml

@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<gui:OptionPanel
x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.SelectStylePanelXaml" 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">
<StackPanel>
<GroupBox Margin="2,8,2,2"
Header="{core:Localize Dialog.Options.IDEOptions.SelectStyle.VisualStyleGroupBox}">
<StackPanel Margin="2">
<CheckBox Margin="2"
x:Name="showExtensionsCheckBox"
Content="{core:Localize Dialog.Options.IDEOptions.SelectStyle.ShowExtensionsCheckBox }"></CheckBox>
<Label Margin="0,8,0,0"
Content="{core:Localize Dialog.Options.IDEOptions.SelectStyle.SelectAmbienceLabel}"></Label>
<ComboBox x:Name="selectAmbienceComboBox" Margin="2,0,0,2"
></ComboBox>
<CheckBox Margin="2"
x:Name="preferProjectAmbienceCheckBox"
Content="{core:Localize Dialog.Options.IDEOptions.SelectStyle.UseProjectAmbience}"></CheckBox>
</StackPanel>
</GroupBox>
<CheckBox x:Name="showStatusBarCheckBox" Margin="4,8,2,2"
Content="{core:Localize Dialog.Options.IDEOptions.SelectStyle.ShowStatusBarCheckBox}"></CheckBox>
<CheckBox x:Name="showToolBarCheckBox" Margin="4"
Content="{core:Localize Dialog.Options.IDEOptions.SelectStyle.ShowToolBarCheckBox}"></CheckBox>
<CheckBox x:Name="useProfessionalStyleCheckBox" Margin="4"
Content="{core:Localize Dialog.Options.IDEOptions.SelectStyle.UseProfessionalStyleCheckBox}"></CheckBox>
</StackPanel>
</gui:OptionPanel>

2
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs → src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/old_SelectStylePanel.cs

@ -7,7 +7,7 @@ using ICSharpCode.Core; @@ -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();
Loading…
Cancel
Save