pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Move StringListEditorDialog.xaml to src\Main\Base\Project\Src\Gui\Components\

pull/30/head
PeterForstmeier 13 years ago
parent
84e21490a0
commit
5bdef05fdd
6 changed files with 87 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      SharpDevelop.sln
  2. 2
      src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
  3. 154
      src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml
  4. 2
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  5. 8
      src/Main/Base/Project/Src/Gui/Components/StringListEditorDialog.xaml
  6. 2
      src/Main/Base/Project/Src/Gui/Components/StringListEditorDialog.xaml.cs

2
SharpDevelop.sln
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 4.3.0.8827-alpha
# SharpDevelop 4.3
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
ProjectSection(SolutionItems) = postProject
EndProjectSection

2
src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
Unescape View File

@ -96,7 +96,6 @@ @@ -96,7 +96,6 @@
<Compile Include="Project\ResourceScript.cs" />
<Compile Include="Project\SpecifyCliRuntimeLibraryCommand.cs" />
<Compile Include="Project\CppProject.cs" />
<Compile Include="Project\StringListEditorDialog.xaml.cs" />
<None Include="CppBinding.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@ -154,6 +153,5 @@ @@ -154,6 +153,5 @@
<Page Include="Project\ApplicationOptions.xaml" />
<Page Include="Project\LinkerOptions.xaml" />
<Page Include="Project\PreprocessorOptions.xaml" />
<Page Include="Project\StringListEditorDialog.xaml" />
</ItemGroup>
</Project>

154
src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml
Unescape View File

@ -7,82 +7,82 @@ @@ -7,82 +7,82 @@
xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
xmlns:core="http://icsharpcode.net/sharpdevelop/core">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<GroupBox Header="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker}">
<Grid ShowGridLines="True">
<Grid.RowDefinitions>
<RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
</Grid.ColumnDefinitions>
<GroupBox Header="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker}">
<Grid >
<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
</Grid.ColumnDefinitions>
<CheckBox x:Name="debugInfoCheckBox" VerticalAlignment="Center"
IsChecked="{Binding CheckBoxChecked}"
Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker.GenerateDebugInfo}">
</CheckBox>
<Label Grid.Row="1" VerticalAlignment="Center"
Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker.Library}"></Label>
<TextBox x:Name="libraryPathTextBox"
TextChanged="TextBox_TextChanged" Grid.Row="2" Margin="0,0,3,0"
Text="{Binding LibraryPath.Value, UpdateSourceTrigger=PropertyChanged}">
</TextBox>
<!--x:Name="libraryPathButton"-->
<Button VerticalAlignment="Center" Grid.Row="2" Padding="9,1"
Click="LibraryPathButton_Click"
Grid.Column="1" Content="..."></Button>
<Label Grid.Row="3" Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker.AdditionalLibs}"></Label>
<TextBox x:Name="additionalLibsTextBox" VerticalAlignment="Center" Margin="0,0,5,0"
TextChanged="TextBox_TextChanged" Grid.Row="4">
</TextBox>
<Button Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Padding="9,1"
Click="AdditionalLibsButton_Click" Content="..." ></Button>
<Label Grid.Row="5"
Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker.AddModule}"></Label>
<TextBox x:Name="addModuleTextBox" VerticalAlignment="Center" Margin="0,0,5,0"
TextChanged="TextBox_TextChanged" Grid.Row="6">
</TextBox>
<Button Grid.Column="1" Grid.Row="6" VerticalAlignment="Center" Padding="9,1"
Content="..."
Click="AddModuleButton_Click" ></Button>
<Label Grid.Row="7"
Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker.ManagedResourceFile}" ></Label>
<TextBox x:Name="resourceFileTextBox" VerticalAlignment="Center" Margin="0,0,5,0"
TextChanged="TextBox_TextChanged" Grid.Row="8"></TextBox>
<!--x:Name="resourceFileButton"-->
<Button Grid.Row="8" Grid.Column="1" VerticalAlignment="Center" Padding="9,1"
Click="ResourceFileButton_Click" Content="...."></Button>
<Label Grid.Row="9" Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.AdditionalOptions}"></Label>
<TextBox x:Name="additionalOptionsTextBox" VerticalAlignment="Center" Margin="0,0,5,0"
TextChanged="TextBox_TextChanged" Grid.Row="10" Grid.ColumnSpan="2">
</TextBox>
<CheckBox x:Name="debugInfoCheckBox" VerticalAlignment="Center"
IsChecked="{Binding CheckBoxChecked}"
Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker.GenerateDebugInfo}">
</CheckBox>
<Label Grid.Row="1" VerticalAlignment="Center"
Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker.Library}"></Label>
<TextBox x:Name="libraryPathTextBox"
TextChanged="TextBox_TextChanged" Grid.Row="2" Margin="0,0,3,0"
Text="{Binding LibraryPath.Value, UpdateSourceTrigger=PropertyChanged}">
</TextBox>
<!--x:Name="libraryPathButton"-->
<Button VerticalAlignment="Center" Grid.Row="2" Padding="9,1"
Click="LibraryPathButton_Click"
Grid.Column="1" Content="..."></Button>
<Label Grid.Row="3" Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker.AdditionalLibs}"></Label>
<TextBox x:Name="additionalLibsTextBox" VerticalAlignment="Center" Margin="0,0,5,0"
TextChanged="TextBox_TextChanged" Grid.Row="4">
</TextBox>
<Button Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Padding="9,1"
Click="AdditionalLibsButton_Click" Content="..." ></Button>
<Label Grid.Row="5"
Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker.AddModule}"></Label>
<TextBox x:Name="addModuleTextBox" VerticalAlignment="Center" Margin="0,0,5,0"
TextChanged="TextBox_TextChanged" Grid.Row="6">
</TextBox>
<Button Grid.Column="1" Grid.Row="6" VerticalAlignment="Center" Padding="9,1"
Content="..."
Click="AddModuleButton_Click" ></Button>
<Label Grid.Row="7"
Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker.ManagedResourceFile}" ></Label>
<TextBox x:Name="resourceFileTextBox" VerticalAlignment="Center" Margin="0,0,5,0"
TextChanged="TextBox_TextChanged" Grid.Row="8"></TextBox>
<!--x:Name="resourceFileButton"-->
<Button Grid.Row="8" Grid.Column="1" VerticalAlignment="Center" Padding="9,1"
Click="ResourceFileButton_Click" Content="...."></Button>
<Label Grid.Row="9" Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.AdditionalOptions}"></Label>
<TextBox x:Name="additionalOptionsTextBox" VerticalAlignment="Center" Margin="0,0,5,0"
TextChanged="TextBox_TextChanged" Grid.Row="10" Grid.ColumnSpan="2">
</TextBox>
</Grid>
</GroupBox>
</ScrollViewer>
</Grid>
</GroupBox>
</ScrollViewer>
</optionpanels:ProjectOptionPanel>

2
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
Unescape View File

@ -202,6 +202,7 @@ @@ -202,6 +202,7 @@
</Compile>
<Compile Include="Src\Gui\Components\LocalizedPropertyGrid\StringParserPropertyContainer.cs" />
<Compile Include="Src\Gui\Components\SideBar\TextEditorSideBar.cs" />
<Compile Include="Src\Gui\Components\StringListEditorDialog.xaml.cs" />
<Compile Include="Src\Gui\Components\StringListEditorXaml.xaml.cs">
<DependentUpon>StringListEditorXaml.xaml</DependentUpon>
<SubType>Code</SubType>
@ -888,6 +889,7 @@ @@ -888,6 +889,7 @@
</ItemGroup>
<ItemGroup>
<Page Include="Src\Bookmarks\Pad\Controls\ListViewPad.xaml" />
<Page Include="Src\Gui\Components\StringListEditorDialog.xaml" />
<Page Include="Src\Gui\Components\StringListEditorXaml.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\EditStandardHeaderPanel.xaml" />

8
src/AddIns/BackendBindings/CppBinding/CppBinding/Project/StringListEditorDialog.xaml → src/Main/Base/Project/Src/Gui/Components/StringListEditorDialog.xaml
Unescape View File

@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Window
x:Class="ICSharpCode.CppBinding.Project.StringListEditorDialog" 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;assembly=ICSharpCode.SharpDevelop"
x:Class="ICSharpCode.SharpDevelop.Gui.StringListEditorDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:ICSharpCode.SharpDevelop.Gui"
xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
xmlns:core="http://icsharpcode.net/sharpdevelop/core"
Width="400" Height="400"
@ -17,7 +20,8 @@ @@ -17,7 +20,8 @@
<ColumnDefinition Width="70"></ColumnDefinition>
<ColumnDefinition Width="70"></ColumnDefinition>
</Grid.ColumnDefinitions>
<gui:StringListEditorXaml x:Name="stringListEditor" Grid.ColumnSpan="3"></gui:StringListEditorXaml>
<local:StringListEditorXaml x:Name="stringListEditor" Grid.ColumnSpan="3"></local:StringListEditorXaml>
<Button Grid.Row="1" Grid.Column="1" IsCancel="True" Margin="5" Content="{core:Localize Global.CancelButtonText}"></Button>
<Button Grid.Row="1" Grid.Column="2" IsDefault="True" Margin="5" Click="Button_Click" Content="{core:Localize Global.OKButtonText}"></Button>

2
src/AddIns/BackendBindings/CppBinding/CppBinding/Project/StringListEditorDialog.xaml.cs → src/Main/Base/Project/Src/Gui/Components/StringListEditorDialog.xaml.cs
Unescape View File

@ -15,7 +15,7 @@ using System.Windows.Documents; @@ -15,7 +15,7 @@ using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
namespace ICSharpCode.CppBinding.Project
namespace ICSharpCode.SharpDevelop.Gui
{
/// <summary>
/// Interaction logic for StringListEditorDialog.xaml
Write Preview
Loading…
Cancel
Save