Merge pull request #661 from gumme/WpfDesignerBrushEditorNameFix

Tab headers should not expose technology names or words.
icsharpcode · Feb 26, 2015 · a7c264e · a7c264e
2 parents a277944 + 3f52bfa
commit a7c264e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...pfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/BrushEditorView.xaml b/...pfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/BrushEditorView.xaml
@@ -72,12 +72,12 @@
 		<TabItem Header="Radial">
 			<BrushEditor:GradientBrushEditor />
 		</TabItem>
-		<TabItem Header="Brush List">
+		<TabItem Header="System brushes">
 			<ListBox MaxHeight="320" ItemsSource="{Binding AvailableBrushes}"
 			         SelectedValue="{Binding Brush.Color}"
 			         SelectedValuePath="Brush.Color" />
 		</TabItem>
-		<TabItem Header="Wpf Brush List">
+		<TabItem Header="Brushes">
 			<ListBox MaxHeight="320" ItemsSource="{Binding AvailableWpfBrushes}"
 			         SelectedValue="{Binding Brush.Color}"
 			         SelectedValuePath="Brush.Color" />

diff --git a/...fDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/SolidBrushEditor.xaml b/...fDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/SolidBrushEditor.xaml
@@ -8,12 +8,12 @@
 		<TabItem Header="Color Picker">
 			<widgets:ColorPicker Color="{Binding Color, ElementName=this}" />
 		</TabItem>
-		<TabItem Header="Color List">
+		<TabItem Header="System colors">
 			<ListBox ItemsSource="{Binding AvailableColors}"
 			         SelectedValue="{Binding Color, ElementName=this}"
 			         SelectedValuePath="Brush.Color" />
 		</TabItem>
-		<TabItem Header="Wpf Color List">
+		<TabItem Header="Colors">
 			<ListBox ItemsSource="{Binding AvailableWpfBrushes}"
 			         SelectedValue="{Binding Color, ElementName=this}"
 			         SelectedValuePath="Brush.Color" />