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

SharpDevelop.sln

@@ -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

src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj

@@ -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 @@
     <Page Include="Project\ApplicationOptions.xaml" />
     <Page Include="Project\LinkerOptions.xaml" />
     <Page Include="Project\PreprocessorOptions.xaml" />
-    <Page Include="Project\StringListEditorDialog.xaml" />
   </ItemGroup>
 </Project>

src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml

@@ -8,9 +8,9 @@
 	xmlns:core="http://icsharpcode.net/sharpdevelop/core">
 	<ScrollViewer VerticalScrollBarVisibility="Auto">
 		<GroupBox Header="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker}">
-		<Grid ShowGridLines="True">
+			<Grid >
 				<Grid.RowDefinitions>
-				<RowDefinition Height="30"></RowDefinition>
+					<RowDefinition Height="Auto"></RowDefinition>
 					<RowDefinition Height="Auto"></RowDefinition>
 					<RowDefinition Height="Auto"></RowDefinition>
 					<RowDefinition Height="Auto"></RowDefinition>
@@ -84,5 +84,5 @@
 			
 			</Grid>
 		</GroupBox>
-</ScrollViewer>
+	</ScrollViewer>
 </optionpanels:ProjectOptionPanel>

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

@@ -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 @@
   </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" />

src/Main/Base/Project/Src/Gui/Components/StringListEditorDialog.xaml

@@ -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 @@
 			<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>

src/Main/Base/Project/Src/Gui/Components/StringListEditorDialog.xaml.cs

@@ -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