rename StringListEditorXaml to StringListEditor

Author: siegfriedpammer

src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanel.xaml.cs

@@ -276,7 +276,7 @@ private string[] GetRuleAssemblyList(bool replacePath)
 		private void ChangeRuleAssembliesButtonClick( object sender, RoutedEventArgs e)
 		{
 			var  stringListDialog = new StringListEditorDialog();
-			stringListDialog.BrowseForDirectory = true;
+			stringListDialog.ShowBrowse = true;
 			stringListDialog.TitleText = StringParser.Parse("${res:ICSharpCode.CodeAnalysis.ProjectOptions.ChooseRuleAssemblyDirectory}");
 			stringListDialog.LoadList(GetRuleAssemblyList(false));
 			stringListDialog.ShowDialog();

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

@@ -165,7 +165,7 @@ public static void PopulateStringListEditor(string title, string listCaption,Tex
 			var  stringListDialog = new StringListEditorDialog();
 			stringListDialog.TitleText = title;
 			stringListDialog.ListCaption = listCaption;
-			stringListDialog.BrowseForDirectory = browseForDirectoty;
+			stringListDialog.ShowBrowse = browseForDirectoty;
 			string[] strings = textBox.Text.Split(';');
 			stringListDialog.LoadList (strings);
 			stringListDialog.ShowDialog();

src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.xaml

@@ -5,6 +5,6 @@
 	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop">
 
 	<Grid>
-		<gui:StringListEditorXaml x:Name="editor" BrowseForDirectory="True"></gui:StringListEditorXaml>
+		<gui:StringListEditor x:Name="editor" ShowBrowse="True" />
 	</Grid>
 </optionpanels:OptionPanel>

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

@@ -279,8 +279,8 @@
     <Compile Include="Src\Gui\Components\StringListEditorDialog.xaml.cs">
       <DependentUpon>StringListEditorDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Src\Gui\Components\StringListEditorXaml.xaml.cs">
-      <DependentUpon>StringListEditorXaml.xaml</DependentUpon>
+    <Compile Include="Src\Gui\Components\StringListEditor.xaml.cs">
+      <DependentUpon>StringListEditor.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Src\Gui\CustomFocusManager.cs" />
@@ -896,7 +896,7 @@
     <Page Include="Src\Editor\Dialogs\RenameSymbolDialog.xaml" />
     <Page Include="Src\Gui\Components\FontSelector.xaml" />
     <Page Include="Src\Gui\Components\StringListEditorDialog.xaml" />
-    <Page Include="Src\Gui\Components\StringListEditorXaml.xaml" />
+    <Page Include="Src\Gui\Components\StringListEditor.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ExternalToolPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\EditStandardHeaderPanel.xaml" />

…Gui/Components/StringListEditorXaml.xaml …Src/Gui/Components/StringListEditor.xamlsrc/Main/Base/Project/Src/Gui/Components/StringListEditorXaml.xaml renamed to src/Main/Base/Project/Src/Gui/Components/StringListEditor.xaml src/Main/Base/Project/Src/Gui/Components/StringListEditorXaml.xaml renamed to src/Main/Base/Project/Src/Gui/Components/StringListEditor.xaml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <UserControl
-	x:Class="ICSharpCode.SharpDevelop.Gui.StringListEditorXaml"
+	x:Class="ICSharpCode.SharpDevelop.Gui.StringListEditor"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
@@ -37,7 +37,7 @@
 			<Button x:Name="addButton"
 				IsEnabled="False"
 				Click="AddButton_Click"
-				Content="{core:Localize Dialog.ProjectOptions.ReferencePaths.AddPath}"
+				Content="{Binding AddButtonText}"
 				Style="{x:Static core:GlobalStyles.ButtonStyle}">
 			</Button>
 

…/Components/StringListEditorXaml.xaml.cs …/Gui/Components/StringListEditor.xaml.cssrc/Main/Base/Project/Src/Gui/Components/StringListEditorXaml.xaml.cs renamed to src/Main/Base/Project/Src/Gui/Components/StringListEditor.xaml.cs src/Main/Base/Project/Src/Gui/Components/StringListEditorXaml.xaml.cs renamed to src/Main/Base/Project/Src/Gui/Components/StringListEditor.xaml.cs

@@ -26,14 +26,14 @@
 namespace ICSharpCode.SharpDevelop.Gui
 {
 	/// <summary>
-	/// Interaction logic for StringListEditorXaml.xaml
+	/// Interaction logic for StringListEditor.xaml
 	/// </summary>
-	public partial class StringListEditorXaml : UserControl
+	public partial class StringListEditor : UserControl
 	{
-		bool browseForDirectory;
+		bool showBrowse;
 		public event EventHandler ListChanged;
 
-		public StringListEditorXaml()
+		public StringListEditor()
 		{
 			InitializeComponent();
 			moveUpButton.Content = new Image { Height = 16, Source = PresentationResourceService.GetBitmapSource("Icons.16x16.ArrowUp") };
@@ -44,16 +44,18 @@ public StringListEditorXaml()
 
 		public string TitleText {get;set;}
 
+		public string AddButtonText { get; set; }
+		
 		public string ListCaption {get;set;}
 
 
-		public bool BrowseForDirectory {
+		public bool ShowBrowse {
 			get {
-				return browseForDirectory;
+				return showBrowse;
 			}
 			set {
-				browseForDirectory = value;
-				if (browseForDirectory) {
+				showBrowse = value;
+				if (showBrowse) {
 					browseButton.Visibility = Visibility.Visible;
 				} else {
 					browseButton.Visibility = Visibility.Hidden;

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

@@ -22,7 +22,7 @@
 			<ColumnDefinition Width="70"></ColumnDefinition>
 		</Grid.ColumnDefinitions>
 
-		<local:StringListEditorXaml x:Name="stringListEditor" Grid.ColumnSpan="3" VerticalAlignment="Stretch"></local:StringListEditorXaml>
+		<local:StringListEditor x:Name="stringListEditor" Grid.ColumnSpan="3" VerticalAlignment="Stretch" />
 
 		<Button  Margin="0,3,5,3" Grid.Row="1" Grid.Column="1" IsDefault="True"  Click="Button_Click" Content="{core:Localize Global.OKButtonText}"></Button>
 		<Button  Margin="0,3,5,3" Grid.Row="1" Grid.Column="2" IsCancel="True"  Content="{core:Localize Global.CancelButtonText}"></Button>

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

@@ -39,9 +39,9 @@ public StringListEditorDialog()
 		}
 
 
-		public bool BrowseForDirectory {
-			get {return stringListEditor.BrowseForDirectory;}
-			set {stringListEditor.BrowseForDirectory = value;}
+		public bool ShowBrowse {
+			get {return stringListEditor.ShowBrowse;}
+			set {stringListEditor.ShowBrowse = value;}
 		}
 
 		public string ListCaption {
@@ -54,6 +54,11 @@ public string TitleText {
 			set {stringListEditor.TitleText = value;}
 		}
 
+		public string AddButtonText {
+			get {return stringListEditor.AddButtonText;}
+			set {stringListEditor.AddButtonText = value;}
+		}
+		
 		public string[] GetList() {
 			return stringListEditor.GetList();
 		}
@@ -66,13 +71,5 @@ void Button_Click(object sender, RoutedEventArgs e)
 		{
 			DialogResult = true;
 		}
-		
-		
-		public  string AddButtonText
-		{
-			get {return stringListEditor.Content.ToString();}
-			set {stringListEditor.addButton.Content = value;}
-		}
-		
 	}
 }

src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml

@@ -21,7 +21,7 @@
 			<optionpanels:StorageLocationPicker Margin="5,40,0,0"
 				x:Name="location" Location="{Binding ReferencePath.Location}" />
 
-			<gui:StringListEditorXaml x:Name="editor" Grid.Column="1" Grid.RowSpan="2"></gui:StringListEditorXaml>
+			<gui:StringListEditor x:Name="editor" Grid.Column="1" Grid.RowSpan="2"></gui:StringListEditor>
 
 		</Grid>
 	</ScrollViewer>

src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml.cs

@@ -31,7 +31,7 @@ public ReferencePaths()
 		{
 			InitializeComponent();
 
-			editor.BrowseForDirectory = true;
+			editor.ShowBrowse = true;
 			editor.TitleText = StringParser.Parse("${res:Global.Folder}:");
 			editor.ListCaption = StringParser.Parse("${res:Dialog.ProjectOptions.ReferencePaths}:");
 			editor.ListChanged += delegate { IsDirty = true; };