Browse Source

Merge pull request #661 from gumme/WpfDesignerBrushEditorNameFix

Tab headers should not expose technology names or words.
pull/664/head
Andreas Weizel 10 years ago
parent
commit
a7c264e9b1
  1. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/BrushEditorView.xaml
  2. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/SolidBrushEditor.xaml

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/BrushEditorView.xaml

@ -72,12 +72,12 @@
<TabItem Header="Radial"> <TabItem Header="Radial">
<BrushEditor:GradientBrushEditor /> <BrushEditor:GradientBrushEditor />
</TabItem> </TabItem>
<TabItem Header="Brush List"> <TabItem Header="System brushes">
<ListBox MaxHeight="320" ItemsSource="{Binding AvailableBrushes}" <ListBox MaxHeight="320" ItemsSource="{Binding AvailableBrushes}"
SelectedValue="{Binding Brush.Color}" SelectedValue="{Binding Brush.Color}"
SelectedValuePath="Brush.Color" /> SelectedValuePath="Brush.Color" />
</TabItem> </TabItem>
<TabItem Header="Wpf Brush List"> <TabItem Header="Brushes">
<ListBox MaxHeight="320" ItemsSource="{Binding AvailableWpfBrushes}" <ListBox MaxHeight="320" ItemsSource="{Binding AvailableWpfBrushes}"
SelectedValue="{Binding Brush.Color}" SelectedValue="{Binding Brush.Color}"
SelectedValuePath="Brush.Color" /> SelectedValuePath="Brush.Color" />

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/SolidBrushEditor.xaml

@ -8,12 +8,12 @@
<TabItem Header="Color Picker"> <TabItem Header="Color Picker">
<widgets:ColorPicker Color="{Binding Color, ElementName=this}" /> <widgets:ColorPicker Color="{Binding Color, ElementName=this}" />
</TabItem> </TabItem>
<TabItem Header="Color List"> <TabItem Header="System colors">
<ListBox ItemsSource="{Binding AvailableColors}" <ListBox ItemsSource="{Binding AvailableColors}"
SelectedValue="{Binding Color, ElementName=this}" SelectedValue="{Binding Color, ElementName=this}"
SelectedValuePath="Brush.Color" /> SelectedValuePath="Brush.Color" />
</TabItem> </TabItem>
<TabItem Header="Wpf Color List"> <TabItem Header="Colors">
<ListBox ItemsSource="{Binding AvailableWpfBrushes}" <ListBox ItemsSource="{Binding AvailableWpfBrushes}"
SelectedValue="{Binding Color, ElementName=this}" SelectedValue="{Binding Color, ElementName=this}"
SelectedValuePath="Brush.Color" /> SelectedValuePath="Brush.Color" />

Loading…
Cancel
Save