Skip to content

Commit 7a5f201

Browse files
retailcoderretailcoder
committed
revert 383fe17 
1 parent f1f0b5e commit 7a5f201

10 files changed

+57
-57
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<RowDefinition Height="Auto"/>
2828
</Grid.RowDefinitions>
2929
<StackPanel Grid.Row="0" Margin="5,5,5,0">
30-
<Label Background="{DynamicResource HeaderBackgroundDarkBrush}"
30+
<Label Background="{StaticResource HeaderBackgroundDarkBrush}"
3131
HorizontalContentAlignment="Stretch"
3232
Margin="0,0,0,3">
3333
<Label.Style>
@@ -39,9 +39,9 @@
3939
</Style.Resources>
4040
</Style>
4141
</Label.Style>
42-
<DockPanel Background="{DynamicResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
42+
<DockPanel Background="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
4343
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
44-
<Label Foreground="{DynamicResource CaptionLightBrush}"
44+
<Label Foreground="{StaticResource CaptionLightBrush}"
4545
FontWeight="SemiBold"
4646
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=PageHeader_ReferenceSettings}">
4747
</Label>
@@ -84,7 +84,7 @@
8484
BorderThickness="0"
8585
Background="Transparent">
8686
<StackPanel Orientation="Horizontal">
87-
<Image Source="{DynamicResource AddImage}" />
87+
<Image Source="{StaticResource AddImage}" />
8888
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Add}" Margin="2,0" />
8989
</StackPanel>
9090
</Button>
@@ -96,7 +96,7 @@
9696
Background="Transparent"
9797
IsEnabled="{Binding ElementName=PathList, Path=SelectedItem, Converter={StaticResource HasSelectedItems}}">
9898
<StackPanel Orientation="Horizontal">
99-
<Image Source="{DynamicResource DeleteImage}" />
99+
<Image Source="{StaticResource DeleteImage}" />
100100
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Remove}" Margin="2,0" />
101101
</StackPanel>
102102
</Button>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</Grid.RowDefinitions>
2525
<ScrollViewer x:Name="ScrollViewer" Grid.Row="0">
2626
<StackPanel Margin="5,5,5,0" ScrollViewer.VerticalScrollBarVisibility="Auto">
27-
<Label Background="{DynamicResource HeaderBackgroundDarkBrush}"
27+
<Label Background="{StaticResource HeaderBackgroundDarkBrush}"
2828
HorizontalContentAlignment="Stretch"
2929
Margin="0,0,0,3">
3030
<Label.Style>
@@ -36,9 +36,9 @@
3636
</Style.Resources>
3737
</Style>
3838
</Label.Style>
39-
<DockPanel Background="{DynamicResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
39+
<DockPanel Background="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
4040
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
41-
<Label Foreground="{DynamicResource CaptionLightBrush}"
41+
<Label Foreground="{StaticResource CaptionLightBrush}"
4242
FontWeight="SemiBold"
4343
Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=PageHeader}">
4444
</Label>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<ScrollViewer x:Name="ScrollViewer">
3636
<Grid>
3737
<StackPanel Grid.Row="0" Margin="5,5,5,0">
38-
<Label Background="{DynamicResource HeaderBackgroundDarkBrush}"
38+
<Label Background="{StaticResource HeaderBackgroundDarkBrush}"
3939
HorizontalContentAlignment="Stretch"
4040
Margin="0,0,0,3">
4141
<Label.Style>
@@ -47,9 +47,9 @@
4747
</Style.Resources>
4848
</Style>
4949
</Label.Style>
50-
<DockPanel Background="{DynamicResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
50+
<DockPanel Background="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
5151
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
52-
<Label Foreground="{DynamicResource CaptionLightBrush}"
52+
<Label Foreground="{StaticResource CaptionLightBrush}"
5353
FontWeight="SemiBold"
5454
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=PageHeader_GeneralSettings}">
5555
</Label>
@@ -119,7 +119,7 @@
119119
<Label DockPanel.Dock="Left" Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeysLabel}" FontWeight="SemiBold" />
120120
<Label DockPanel.Dock="Right" Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeyRestrictionLabel}"
121121
Visibility="{Binding ShouldDisplayHotkeyModificationLabel, Converter={StaticResource BoolToVisibility}}"
122-
Foreground="{DynamicResource CaptionErrorBrush}"
122+
Foreground="{StaticResource CaptionErrorBrush}"
123123
FontWeight="Bold"/>
124124
</DockPanel>
125125

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<RowDefinition Height="Auto"/>
2828
</Grid.RowDefinitions>
2929
<StackPanel Grid.Row="0" Margin="5,5,5,0">
30-
<Label Background="{DynamicResource HeaderBackgroundDarkBrush}"
30+
<Label Background="{StaticResource HeaderBackgroundDarkBrush}"
3131
HorizontalContentAlignment="Stretch"
3232
Margin="0,0,0,3">
3333
<Label.Style>
@@ -39,9 +39,9 @@
3939
</Style.Resources>
4040
</Style>
4141
</Label.Style>
42-
<DockPanel Background="{DynamicResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
42+
<DockPanel Background="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
4343
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
44-
<Label Foreground="{DynamicResource CaptionLightBrush}"
44+
<Label Foreground="{StaticResource CaptionLightBrush}"
4545
FontWeight="SemiBold"
4646
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=PageHeader_IgnoredProjectsSettings}">
4747
</Label>
@@ -58,7 +58,7 @@
5858
BorderThickness="0"
5959
Background="Transparent">
6060
<StackPanel Orientation="Horizontal">
61-
<Image Source="{DynamicResource AddImage}" />
61+
<Image Source="{StaticResource AddImage}" />
6262
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Add}" Margin="2,0" />
6363
</StackPanel>
6464
</Button>
@@ -70,7 +70,7 @@
7070
Background="Transparent"
7171
IsEnabled="{Binding ElementName=PathList, Path=SelectedItem, Converter={StaticResource HasSelectedItems}}">
7272
<StackPanel Orientation="Horizontal">
73-
<Image Source="{DynamicResource DeleteImage}" />
73+
<Image Source="{StaticResource DeleteImage}" />
7474
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Remove}" Margin="2,0" />
7575
</StackPanel>
7676
</Button>

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</UserControl.Resources>
4141
<ScrollViewer Margin="0,0,10,0">
4242
<StackPanel Margin="5">
43-
<Label Background="{DynamicResource BackgroundDarkBrush}"
43+
<Label Background="{StaticResource BackgroundDarkBrush}"
4444
HorizontalContentAlignment="Stretch"
4545
Margin="0,0,0,5">
4646
<Label.Style>
@@ -52,9 +52,9 @@
5252
</Style.Resources>
5353
</Style>
5454
</Label.Style>
55-
<DockPanel Background="{DynamicResource BackgroundDarkBrush}" FlowDirection="LeftToRight">
55+
<DockPanel Background="{StaticResource BackgroundDarkBrush}" FlowDirection="LeftToRight">
5656
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
57-
<Label Foreground="{DynamicResource CaptionLightBrush}" FontWeight="SemiBold">
57+
<Label Foreground="{StaticResource CaptionLightBrush}" FontWeight="SemiBold">
5858
<Resx ResxName="Rubberduck.Resources.Settings.SettingsUI" Key="PageHeader_IndenterSettings"/>
5959
</Label>
6060
</StackPanel>
@@ -94,8 +94,8 @@
9494
</Grid.RowDefinitions>
9595
<Expander Grid.Row="0"
9696
IsExpanded="False"
97-
Background="{DynamicResource ExpanderBackgroundBrush}"
98-
BorderBrush="{DynamicResource ExpanderBorderBrush}"
97+
Background="{StaticResource ExpanderBackgroundBrush}"
98+
BorderBrush="{StaticResource ExpanderBorderBrush}"
9999
Margin="0,0,0,3">
100100
<Expander.Header>
101101
<Label FontWeight="SemiBold"
@@ -162,8 +162,8 @@
162162
</Expander>
163163
<Expander Grid.Row="1"
164164
IsExpanded="False"
165-
Background="{DynamicResource ExpanderBackgroundBrush}"
166-
BorderBrush="{DynamicResource ExpanderBorderBrush}"
165+
Background="{StaticResource ExpanderBackgroundBrush}"
166+
BorderBrush="{StaticResource ExpanderBorderBrush}"
167167
Margin="0,0,0,3">
168168
<Expander.Header>
169169
<Label FontWeight="SemiBold"
@@ -226,8 +226,8 @@
226226
</Expander>
227227
<Expander Grid.Row="2"
228228
IsExpanded="False"
229-
Background="{DynamicResource ExpanderBackgroundBrush}"
230-
BorderBrush="{DynamicResource ExpanderBorderBrush}"
229+
Background="{StaticResource ExpanderBackgroundBrush}"
230+
BorderBrush="{StaticResource ExpanderBorderBrush}"
231231
Margin="0,0,0,3">
232232
<Expander.Header>
233233
<Label FontWeight="SemiBold"
@@ -281,8 +281,8 @@
281281
</Expander>
282282
<Expander Grid.Row="3"
283283
IsExpanded="False"
284-
Background="{DynamicResource ExpanderBackgroundBrush}"
285-
BorderBrush="{DynamicResource ExpanderBorderBrush}"
284+
Background="{StaticResource ExpanderBackgroundBrush}"
285+
BorderBrush="{StaticResource ExpanderBorderBrush}"
286286
Margin="0,0,0,3">
287287
<Expander.Header>
288288
<Label FontWeight="SemiBold"
@@ -321,8 +321,8 @@
321321
</Expander>
322322
<Expander Grid.Row="4"
323323
IsExpanded="True"
324-
Background="{DynamicResource ExpanderBackgroundBrush}"
325-
BorderBrush="{DynamicResource ExpanderBorderBrush}"
324+
Background="{StaticResource ExpanderBackgroundBrush}"
325+
BorderBrush="{StaticResource ExpanderBorderBrush}"
326326
Margin="0,0,0,3">
327327
<Expander.Header>
328328
<Label FontWeight="SemiBold"

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@
3535
</ObjectDataProvider>
3636

3737
<Style x:Key="HeaderText" TargetType="Label">
38-
<Setter Property="Foreground" Value="{DynamicResource CaptionLightBrush}"/>
38+
<Setter Property="Foreground" Value="{StaticResource CaptionLightBrush}"/>
3939
<Setter Property="FontWeight" Value="SemiBold"/>
4040
</Style>
4141
<Style x:Key="BorderHeader" TargetType="Border">
42-
<Setter Property="Background" Value="{DynamicResource HeaderBackgroundDarkBrush}"/>
42+
<Setter Property="Background" Value="{StaticResource HeaderBackgroundDarkBrush}"/>
4343
<Setter Property="CornerRadius" Value="5"/>
4444
</Style>
4545
</ResourceDictionary>
4646
</UserControl.Resources>
4747
<Grid>
4848
<ScrollViewer x:Name="ScrollViewer">
4949
<StackPanel Margin="5,5,5,0" ScrollViewer.VerticalScrollBarVisibility="Auto">
50-
<Border Style="{DynamicResource BorderHeader}"
50+
<Border Style="{StaticResource BorderHeader}"
5151
Margin="0,0,0,3" Height="36">
5252
<DockPanel FlowDirection="LeftToRight">
5353
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
54-
<Label Style="{DynamicResource HeaderText}"
54+
<Label Style="{StaticResource HeaderText}"
5555
Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI,Key=CodeInspectionSettingsPage_InspectionSeveritySettingsLabel}" Margin="5,5,0,5" Width="127" />
5656
<StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
5757
<StackPanel.Resources>
@@ -60,7 +60,7 @@
6060
</Style>
6161
</StackPanel.Resources>
6262
<Label Content="-" />
63-
<Image Source="{DynamicResource FilterImage}" Width="19" />
63+
<Image Source="{StaticResource FilterImage}" Width="19" />
6464
<Label Target="{Binding ElementName=searchBox, Path=ValueContainerInput}"
6565
Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionSettingsPage_FilterByDescription}" />
6666
<controls:SearchBox x:Name="searchBox"
@@ -89,7 +89,7 @@
8989
</StackPanel>
9090
</DockPanel>
9191
</Border>
92-
<Border BorderBrush="{DynamicResource HeaderBackgroundDarkBrush}" BorderThickness="1" CornerRadius="2">
92+
<Border BorderBrush="{StaticResource HeaderBackgroundDarkBrush}" BorderThickness="1" CornerRadius="2">
9393
<controls:GroupingGrid ItemsSource="{Binding InspectionSettings}"
9494
AutoGenerateColumns="False"
9595
CanUserReorderColumns="False"
@@ -136,9 +136,9 @@
136136
</controls:GroupingGrid>
137137
</Border>
138138

139-
<Border Style="{DynamicResource BorderHeader}"
139+
<Border Style="{StaticResource BorderHeader}"
140140
Margin="0,15,0,5">
141-
<Label Style="{DynamicResource HeaderText}"
141+
<Label Style="{StaticResource HeaderText}"
142142
Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionSettingsPage_Misc}">
143143
</Label>
144144
</Border>
@@ -148,9 +148,9 @@
148148
Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionSettingsPage_Misc_RunInspectionsOnSuccessfulParse}" />
149149
</StackPanel>
150150

151-
<Border Style="{DynamicResource BorderHeader}"
151+
<Border Style="{StaticResource BorderHeader}"
152152
Margin="0,15,0,5">
153-
<Label Style="{DynamicResource HeaderText}"
153+
<Label Style="{StaticResource HeaderText}"
154154
Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionSettingsPage_WhitelistedIdentifiersLabel}" />
155155
</Border>
156156

@@ -164,7 +164,7 @@
164164
BorderThickness="0"
165165
Background="Transparent">
166166
<StackPanel Orientation="Horizontal">
167-
<Image Source="{DynamicResource AddImage}" />
167+
<Image Source="{StaticResource AddImage}" />
168168
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Add}"
169169
Margin="2,0" />
170170
</StackPanel>
@@ -176,14 +176,14 @@
176176
Background="Transparent"
177177
IsEnabled="{Binding ElementName=WhitelistedIdentifiersGrid, Path=SelectedItem, Converter={StaticResource HasSelectedItems}}">
178178
<StackPanel Orientation="Horizontal">
179-
<Image Source="{DynamicResource DeleteImage}" />
179+
<Image Source="{StaticResource DeleteImage}" />
180180
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Remove}"
181181
Margin="2,0" />
182182
</StackPanel>
183183
</Button>
184184
</ToolBar>
185185
</ToolBarTray>
186-
<Border BorderBrush="{DynamicResource HeaderBackgroundDarkBrush}" BorderThickness="1" CornerRadius="2">
186+
<Border BorderBrush="{StaticResource HeaderBackgroundDarkBrush}" BorderThickness="1" CornerRadius="2">
187187
<DataGrid Name="WhitelistedIdentifiersGrid"
188188
ItemsSource="{Binding WhitelistedIdentifierSettings}"
189189
AutoGenerateColumns="False"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<Border Grid.ColumnSpan="2"
3838
Height="50"
3939
VerticalAlignment="Top"
40-
BorderBrush="{DynamicResource BlackBrush}"
40+
BorderBrush="{StaticResource BlackBrush}"
4141
BorderThickness="0, 1">
42-
<StackPanel Background="{DynamicResource BackgroundLightBrush}">
42+
<StackPanel Background="{StaticResource BackgroundLightBrush}">
4343
<Label Content="{Binding ElementName=ListBox, Path=SelectedItem.Label}" FontWeight="Bold" />
4444
<TextBlock Text="{Binding ElementName=ListBox, Path=SelectedItem.Instructions}" Margin="10, 0" />
4545
</StackPanel>
@@ -62,7 +62,7 @@
6262
Grid.ColumnSpan="2"
6363
Height="40"
6464
VerticalAlignment="Bottom"
65-
BorderBrush="{DynamicResource BlackBrush}"
65+
BorderBrush="{StaticResource BlackBrush}"
6666
BorderThickness="0, 1, 0, 0">
6767
<DockPanel VerticalAlignment="Center"
6868
Height="40"

0 commit comments

Comments
 (0)