Skip to content

Commit f911391

Browse files
bclothierbclothier
committed
Consolidate all styles and converters
1 parent ddce3b5 commit f911391

File tree

15 files changed

+82
-793
lines changed

15 files changed

+82
-793
lines changed

‎Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<BitmapImage x:Key="ExtractInterfaceImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/ExtractInterface.png" />
4848

4949
<converters:BooleanToNullableDoubleConverter x:Key="BoolToDouble" />
50-
<converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
5150
<converters:BooleanToDimmedBrushConverter x:Key="BooleanToDimmed" />
5251
<converters:TemplateCommandParameterToTupleConverter x:Key="TemplateCommandParameterToTuple" />
5352
<converters:InvertBoolValueConverter x:Key="NotBool" />
@@ -166,13 +165,6 @@
166165
</MenuItem>
167166
</CompositeCollection>
168167

169-
<Style x:Key="ToolbarIconStyle" TargetType="Image">
170-
<Setter Property="Height" Value="16" />
171-
<Setter Property="Width" Value="16" />
172-
<Setter Property="Margin" Value="2,0,2,0" />
173-
<Setter Property="VerticalAlignment" Value="Top" />
174-
</Style>
175-
176168
<Style x:Key="FooterStyle" TargetType="TextBox">
177169
<Setter Property="FontSize" Value="{Binding FontSize, Mode=OneWay}" />
178170
<Setter Property="IsReadOnly" Value="True" />

‎Rubberduck.Core/UI/CodeMetrics/CodeMetricsControl.xaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,9 @@
2020
<ResourceDictionary Source="../Styles/DefaultStyle.xaml"/>
2121
</ResourceDictionary.MergedDictionaries>
2222

23-
<BooleanToVisibilityConverter x:Key="BoolToVisibility"/>
24-
<converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
2523
<converters:BooleanToDimmedBrushConverter x:Key="BooleanToDimmed" />
2624
<converters:CodeExplorerNodeToIconConverter x:Key="NodeToIcon" />
2725
<converters:AccessibilityToIconConverter x:Key="AccessibilityToIcon" />
28-
29-
<Style x:Key="ToolbarIconStyle" TargetType="Image">
30-
<Setter Property="Height" Value="16" />
31-
<Setter Property="Width" Value="16" />
32-
<Setter Property="Margin" Value="2,0,2,0" />
33-
<Setter Property="VerticalAlignment" Value="Top" />
34-
</Style>
3526
</ResourceDictionary>
3627
</UserControl.Resources>
3728

‎Rubberduck.Core/UI/Controls/ToolBar.xaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
<ResourceDictionary.MergedDictionaries>
66
<ResourceDictionary Source="../Styles/DefaultStyle.xaml"/>
77
</ResourceDictionary.MergedDictionaries>
8-
9-
<BooleanToVisibilityConverter x:Key="BoolToVisibility"/>
108

119
<DataTemplate x:Key="MenuItemHeaderDropdownIndicatorTemplate">
1210
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
@@ -434,5 +432,14 @@
434432
</DataTrigger>
435433
</Style.Triggers>
436434
</Style>
437-
435+
<Style x:Key="ToolbarImageOpacity" TargetType="Image" >
436+
<Setter Property="Height" Value="16" />
437+
<Setter Property="Width" Value="16" />
438+
<Setter Property="Margin" Value="2,0,2,0" />
439+
<Style.Triggers>
440+
<Trigger Property="IsEnabled" Value="False">
441+
<Setter Property="Opacity" Value="0.3" />
442+
</Trigger>
443+
</Style.Triggers>
444+
</Style>
438445
</ResourceDictionary>

‎Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
<ResourceDictionary Source="../../Controls/ToolBar.xaml"/>
1414
</ResourceDictionary.MergedDictionaries>
1515

16-
<converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
17-
1816
<BitmapImage x:Key="InvalidEntryImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
1917
</ResourceDictionary>
2018
</UserControl.Resources>

‎Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,41 +12,6 @@
1212
<ResourceDictionary Source="../../Controls/ToolBar.xaml"/>
1313
</ResourceDictionary.MergedDictionaries>
1414

15-
<converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
16-
17-
<Style x:Key="PrettifyRow" TargetType="{x:Type DataGridRow}">
18-
<Style.Resources>
19-
<Style TargetType="{x:Type Border}">
20-
<Setter Property="CornerRadius" Value="2"/>
21-
</Style>
22-
</Style.Resources>
23-
<Setter Property="BorderThickness" Value="0,.5,0,0" />
24-
<Setter Property="BorderBrush" Value="DarkGray" />
25-
<Setter Property="Height" Value="26" />
26-
<Setter Property="TextBlock.FontWeight" Value="Normal" />
27-
<Style.Triggers>
28-
<Trigger Property="IsSelected" Value="True">
29-
<Setter Property="BorderThickness" Value="1.5" />
30-
</Trigger>
31-
<MultiTrigger>
32-
<MultiTrigger.Conditions>
33-
<Condition Property="IsSelected" Value="True" />
34-
<Condition Property="Selector.IsSelectionActive" Value="True" />
35-
</MultiTrigger.Conditions>
36-
<Setter Property="BorderBrush" Value="#adc6e5"/>
37-
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
38-
</MultiTrigger>
39-
<MultiTrigger>
40-
<MultiTrigger.Conditions>
41-
<Condition Property="IsSelected" Value="True" />
42-
<Condition Property="Selector.IsSelectionActive" Value="False" />
43-
</MultiTrigger.Conditions>
44-
<Setter Property="BorderBrush" Value="LightGray"/>
45-
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
46-
</MultiTrigger>
47-
</Style.Triggers>
48-
</Style>
49-
5015
<BitmapImage x:Key="InvalidInterfaceImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
5116
</ResourceDictionary>
5217
</UserControl.Resources>

‎Rubberduck.Core/UI/Refactorings/Rename/RenameView.xaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@
77
mc:Ignorable="d"
88
d:DesignHeight="300" d:DesignWidth="300">
99
<UserControl.Resources>
10-
<converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
10+
<ResourceDictionary>
11+
<ResourceDictionary.MergedDictionaries>
12+
<ResourceDictionary Source="../../Controls/ToolBar.xaml"/>
13+
</ResourceDictionary.MergedDictionaries>
1114

12-
<BitmapImage x:Key="InvalidNameImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
15+
<BitmapImage x:Key="InvalidNameImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
16+
</ResourceDictionary>
1317
</UserControl.Resources>
1418
<Grid>
1519
<Grid.RowDefinitions>

‎Rubberduck.Core/UI/Settings/AddRemoveReferencesUserSettings.xaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717

1818
<BitmapImage x:Key="AddImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/plus-circle.png" />
1919
<BitmapImage x:Key="DeleteImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" />
20-
21-
<converters:SelectedItemToBooleanConverter x:Key="HasSelectedItems"/>
22-
23-
<Style TargetType="ScrollViewer">
24-
<Style.Setters>
25-
<Setter Property="settings:ScrollViewerCorrector.FixScrolling" Value="True" />
26-
</Style.Setters>
27-
</Style>
2820
</ResourceDictionary>
2921
</UserControl.Resources>
3022
<Grid>

‎Rubberduck.Core/UI/Settings/AutoCompleteSettings.xaml

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,11 @@
1212
d:DesignWidth="500"
1313
d:DesignHeight="350">
1414
<UserControl.Resources>
15-
<Style x:Key="PrettifyRow" TargetType="{x:Type DataGridRow}">
16-
<Style.Resources>
17-
<Style TargetType="{x:Type Border}">
18-
<Setter Property="CornerRadius" Value="2"/>
19-
</Style>
20-
</Style.Resources>
21-
<Setter Property="BorderThickness" Value="0,.5,0,0" />
22-
<Setter Property="BorderBrush" Value="DarkGray" />
23-
<Setter Property="Height" Value="26" />
24-
<Setter Property="TextBlock.FontWeight" Value="Normal" />
25-
<Style.Triggers>
26-
<Trigger Property="IsSelected" Value="True">
27-
<Setter Property="BorderThickness" Value="1.5" />
28-
</Trigger>
29-
<MultiTrigger>
30-
<MultiTrigger.Conditions>
31-
<Condition Property="IsSelected" Value="True" />
32-
<Condition Property="Selector.IsSelectionActive" Value="True" />
33-
</MultiTrigger.Conditions>
34-
<Setter Property="BorderBrush" Value="#adc6e5"/>
35-
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
36-
</MultiTrigger>
37-
<MultiTrigger>
38-
<MultiTrigger.Conditions>
39-
<Condition Property="IsSelected" Value="True" />
40-
<Condition Property="Selector.IsSelectionActive" Value="False" />
41-
</MultiTrigger.Conditions>
42-
<Setter Property="BorderBrush" Value="LightGray"/>
43-
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
44-
</MultiTrigger>
45-
</Style.Triggers>
46-
</Style>
47-
<Style TargetType="ScrollViewer">
48-
<Style.Setters>
49-
<Setter Property="settings:ScrollViewerCorrector.FixScrolling" Value="True" />
50-
</Style.Setters>
51-
</Style>
15+
<ResourceDictionary>
16+
<ResourceDictionary.MergedDictionaries>
17+
<ResourceDictionary Source="../Controls/ToolBar.xaml"/>
18+
</ResourceDictionary.MergedDictionaries>
19+
</ResourceDictionary>
5220
</UserControl.Resources>
5321
<Grid>
5422
<Grid.RowDefinitions>

‎Rubberduck.Core/UI/Settings/GeneralSettings.xaml

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -21,53 +21,14 @@
2121
<converters:DelimiterToTextConverter x:Key="DelimiterToText" />
2222
<converters:HotkeyDisplayConverter x:Key="HotkeyDisplay" />
2323
<hiddenVisibility:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
24-
<BooleanToVisibilityConverter x:Key="BoolToVisibility" />
25-
24+
2625
<ObjectDataProvider x:Key="Delimiters"
2726
MethodName="GetValues"
2827
ObjectType="{x:Type core:Enum}">
2928
<ObjectDataProvider.MethodParameters>
3029
<x:Type Type="settings:DelimiterOptions"/>
3130
</ObjectDataProvider.MethodParameters>
3231
</ObjectDataProvider>
33-
34-
<Style x:Key="PrettifyRow" TargetType="{x:Type DataGridRow}">
35-
<Style.Resources>
36-
<Style TargetType="{x:Type Border}">
37-
<Setter Property="CornerRadius" Value="2"/>
38-
</Style>
39-
</Style.Resources>
40-
<Setter Property="BorderThickness" Value="0,.5,0,0" />
41-
<Setter Property="BorderBrush" Value="DarkGray" />
42-
<Setter Property="Height" Value="26" />
43-
<Setter Property="TextBlock.FontWeight" Value="Normal" />
44-
<Style.Triggers>
45-
<Trigger Property="IsSelected" Value="True">
46-
<Setter Property="BorderThickness" Value="1.5" />
47-
</Trigger>
48-
<MultiTrigger>
49-
<MultiTrigger.Conditions>
50-
<Condition Property="IsSelected" Value="True" />
51-
<Condition Property="Selector.IsSelectionActive" Value="True" />
52-
</MultiTrigger.Conditions>
53-
<Setter Property="BorderBrush" Value="#adc6e5"/>
54-
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
55-
</MultiTrigger>
56-
<MultiTrigger>
57-
<MultiTrigger.Conditions>
58-
<Condition Property="IsSelected" Value="True" />
59-
<Condition Property="Selector.IsSelectionActive" Value="False" />
60-
</MultiTrigger.Conditions>
61-
<Setter Property="BorderBrush" Value="LightGray"/>
62-
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
63-
</MultiTrigger>
64-
</Style.Triggers>
65-
</Style>
66-
<Style TargetType="ScrollViewer">
67-
<Style.Setters>
68-
<Setter Property="settings:ScrollViewerCorrector.FixScrolling" Value="True" />
69-
</Style.Setters>
70-
</Style>
7132
</ResourceDictionary>
7233
</UserControl.Resources>
7334
<Grid>

‎Rubberduck.Core/UI/Settings/IndenterSettings.xaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@
3636
<x:TypeExtension Type="{x:Type smartIndenter:EmptyLineHandling}"/>
3737
</ObjectDataProvider.MethodParameters>
3838
</ObjectDataProvider>
39-
<Style TargetType="ScrollViewer">
40-
<Style.Setters>
41-
<Setter Property="settings:ScrollViewerCorrector.FixScrolling" Value="True" />
42-
</Style.Setters>
43-
</Style>
4439
</ResourceDictionary>
4540
</UserControl.Resources>
4641
<ScrollViewer Margin="0,0,10,0">

0 commit comments

Comments
 (0)