Skip to content

Commit 383fe17

Browse files
GmausDevGmausDev
committed
Continue With #5451
Settings xamls
1 parent d843415 commit 383fe17

10 files changed

+81
-81
lines changed

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

Lines changed: 6 additions & 6 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="{StaticResource HeaderBackgroundDarkBrush}"
30+
<Label Background="{DynamicResource 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="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
42+
<DockPanel Background="{DynamicResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
4343
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
44-
<Label Foreground="{StaticResource CaptionLightBrush}"
44+
<Label Foreground="{DynamicResource 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="{StaticResource AddImage}" />
87+
<Image Source="{DynamicResource AddImage}" />
8888
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Add}" Margin="2,0" />
8989
</StackPanel>
9090
</Button>
@@ -94,9 +94,9 @@
9494
CommandParameter="{Binding ElementName=PathList, Path=SelectedItem}"
9595
BorderThickness="0"
9696
Background="Transparent"
97-
IsEnabled="{Binding ElementName=PathList, Path=SelectedItem, Converter={StaticResource HasSelectedItems}}">
97+
IsEnabled="{Binding ElementName=PathList, Path=SelectedItem, Converter={DynamicResource HasSelectedItems}}">
9898
<StackPanel Orientation="Horizontal">
99-
<Image Source="{StaticResource DeleteImage}" />
99+
<Image Source="{DynamicResource 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="{StaticResource HeaderBackgroundDarkBrush}"
27+
<Label Background="{DynamicResource 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="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
39+
<DockPanel Background="{DynamicResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
4040
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
41-
<Label Foreground="{StaticResource CaptionLightBrush}"
41+
<Label Foreground="{DynamicResource CaptionLightBrush}"
4242
FontWeight="SemiBold"
4343
Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=PageHeader}">
4444
</Label>

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

Lines changed: 8 additions & 8 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="{StaticResource HeaderBackgroundDarkBrush}"
38+
<Label Background="{DynamicResource 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="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
50+
<DockPanel Background="{DynamicResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
5151
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
52-
<Label Foreground="{StaticResource CaptionLightBrush}"
52+
<Label Foreground="{DynamicResource CaptionLightBrush}"
5353
FontWeight="SemiBold"
5454
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=PageHeader_GeneralSettings}">
5555
</Label>
@@ -118,8 +118,8 @@
118118
<DockPanel>
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}"
121-
Visibility="{Binding ShouldDisplayHotkeyModificationLabel, Converter={StaticResource BoolToVisibility}}"
122-
Foreground="{StaticResource CaptionErrorBrush}"
121+
Visibility="{Binding ShouldDisplayHotkeyModificationLabel, Converter={DynamicResource BoolToVisibility}}"
122+
Foreground="{DynamicResource CaptionErrorBrush}"
123123
FontWeight="Bold"/>
124124
</DockPanel>
125125

@@ -137,7 +137,7 @@
137137
HeadersVisibility="Column"
138138
VerticalScrollBarVisibility="Auto"
139139
HorizontalScrollBarVisibility="Hidden"
140-
ItemContainerStyle="{StaticResource PrettifyRow}"
140+
ItemContainerStyle="{DynamicResource PrettifyRow}"
141141
ColumnHeaderHeight="22"
142142
BorderThickness="0">
143143
<DataGrid.CellStyle>
@@ -161,7 +161,7 @@
161161
Width="Auto">
162162
<DataGridTemplateColumn.CellTemplate>
163163
<DataTemplate>
164-
<Label Visibility="{Binding IsValid, Converter={StaticResource BoolToHiddenVisibility}}"
164+
<Label Visibility="{Binding IsValid, Converter={DynamicResource BoolToHiddenVisibility}}"
165165
HorizontalContentAlignment="Center">
166166
<Image Source="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=exclamation}"
167167
ToolTip="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeyRestrictionToolTip}"/>
@@ -187,7 +187,7 @@
187187
SortMemberPath="KeyDisplaySymbol">
188188
<DataGridTemplateColumn.CellTemplate>
189189
<DataTemplate>
190-
<TextBox Text="{Binding Key1, Converter={StaticResource HotkeyDisplay}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
190+
<TextBox Text="{Binding Key1, Converter={DynamicResource HotkeyDisplay}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
191191
</DataTemplate>
192192
</DataGridTemplateColumn.CellTemplate>
193193
</DataGridTemplateColumn>

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

Lines changed: 6 additions & 6 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="{StaticResource HeaderBackgroundDarkBrush}"
30+
<Label Background="{DynamicResource 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="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
42+
<DockPanel Background="{DynamicResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
4343
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
44-
<Label Foreground="{StaticResource CaptionLightBrush}"
44+
<Label Foreground="{DynamicResource 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="{StaticResource AddImage}" />
61+
<Image Source="{DynamicResource AddImage}" />
6262
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Add}" Margin="2,0" />
6363
</StackPanel>
6464
</Button>
@@ -68,9 +68,9 @@
6868
CommandParameter="{Binding ElementName=PathList, Path=SelectedItem}"
6969
BorderThickness="0"
7070
Background="Transparent"
71-
IsEnabled="{Binding ElementName=PathList, Path=SelectedItem, Converter={StaticResource HasSelectedItems}}">
71+
IsEnabled="{Binding ElementName=PathList, Path=SelectedItem, Converter={DynamicResource HasSelectedItems}}">
7272
<StackPanel Orientation="Horizontal">
73-
<Image Source="{StaticResource DeleteImage}" />
73+
<Image Source="{DynamicResource 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: 18 additions & 18 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="{StaticResource BackgroundDarkBrush}"
43+
<Label Background="{DynamicResource 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="{StaticResource BackgroundDarkBrush}" FlowDirection="LeftToRight">
55+
<DockPanel Background="{DynamicResource BackgroundDarkBrush}" FlowDirection="LeftToRight">
5656
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
57-
<Label Foreground="{StaticResource CaptionLightBrush}" FontWeight="SemiBold">
57+
<Label Foreground="{DynamicResource 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="{StaticResource ExpanderBackgroundBrush}"
98-
BorderBrush="{StaticResource ExpanderBorderBrush}"
97+
Background="{DynamicResource ExpanderBackgroundBrush}"
98+
BorderBrush="{DynamicResource 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="{StaticResource ExpanderBackgroundBrush}"
166-
BorderBrush="{StaticResource ExpanderBorderBrush}"
165+
Background="{DynamicResource ExpanderBackgroundBrush}"
166+
BorderBrush="{DynamicResource ExpanderBorderBrush}"
167167
Margin="0,0,0,3">
168168
<Expander.Header>
169169
<Label FontWeight="SemiBold"
@@ -212,22 +212,22 @@
212212
<ComboBox Margin="5,0,0,5"
213213
Width="210"
214214
HorizontalAlignment="Left"
215-
ItemsSource="{Binding Source={StaticResource CommentStyles},Converter={StaticResource LocalizedEndOfLineCommentStyles},UpdateSourceTrigger=PropertyChanged}"
216-
SelectedItem="{Binding EndOfLineCommentStyle,Mode=TwoWay,Converter={StaticResource EndOfLineCommentStyleTextToEnumValue},UpdateSourceTrigger=PropertyChanged}"/>
215+
ItemsSource="{Binding Source={DynamicResource CommentStyles},Converter={DynamicResource LocalizedEndOfLineCommentStyles},UpdateSourceTrigger=PropertyChanged}"
216+
SelectedItem="{Binding EndOfLineCommentStyle,Mode=TwoWay,Converter={DynamicResource EndOfLineCommentStyleTextToEnumValue},UpdateSourceTrigger=PropertyChanged}"/>
217217
<controls:NumberPicker Margin="0,-4,0,0"
218218
HorizontalAlignment="Left"
219219
MinNumber="0"
220220
MaxNumber="{x:Static smartIndenter:IndenterSettings.MaximumEndOfLineCommentColumnSpaceAlignment}"
221221
NumValue="{Binding EndOfLineCommentColumnSpaceAlignment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
222-
Visibility="{Binding EndOfLineCommentStyle,Converter={StaticResource EndOfLineCommentStyleToVisibility}}"/>
222+
Visibility="{Binding EndOfLineCommentStyle,Converter={DynamicResource EndOfLineCommentStyleToVisibility}}"/>
223223
</StackPanel>
224224
</StackPanel>
225225
</StackPanel>
226226
</Expander>
227227
<Expander Grid.Row="2"
228228
IsExpanded="False"
229-
Background="{StaticResource ExpanderBackgroundBrush}"
230-
BorderBrush="{StaticResource ExpanderBorderBrush}"
229+
Background="{DynamicResource ExpanderBackgroundBrush}"
230+
BorderBrush="{DynamicResource ExpanderBorderBrush}"
231231
Margin="0,0,0,3">
232232
<Expander.Header>
233233
<Label FontWeight="SemiBold"
@@ -275,14 +275,14 @@
275275
Content="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=EmptyLineHeading}" />
276276
<ComboBox Margin="5,0,0,5"
277277
HorizontalAlignment="Left"
278-
ItemsSource="{Binding Source={StaticResource EmptyLineOptions},Converter={StaticResource LocalizedEmptyLineHandlers},UpdateSourceTrigger=PropertyChanged}"
279-
SelectedItem="{Binding EmptyLineHandlingMethod,Mode=TwoWay,Converter={StaticResource EmptyLineHandlingValueTextToEnumValue},UpdateSourceTrigger=PropertyChanged}"/>
278+
ItemsSource="{Binding Source={DynamicResource EmptyLineOptions},Converter={DynamicResource LocalizedEmptyLineHandlers},UpdateSourceTrigger=PropertyChanged}"
279+
SelectedItem="{Binding EmptyLineHandlingMethod,Mode=TwoWay,Converter={DynamicResource EmptyLineHandlingValueTextToEnumValue},UpdateSourceTrigger=PropertyChanged}"/>
280280
</StackPanel>
281281
</Expander>
282282
<Expander Grid.Row="3"
283283
IsExpanded="False"
284-
Background="{StaticResource ExpanderBackgroundBrush}"
285-
BorderBrush="{StaticResource ExpanderBorderBrush}"
284+
Background="{DynamicResource ExpanderBackgroundBrush}"
285+
BorderBrush="{DynamicResource 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="{StaticResource ExpanderBackgroundBrush}"
325-
BorderBrush="{StaticResource ExpanderBorderBrush}"
324+
Background="{DynamicResource ExpanderBackgroundBrush}"
325+
BorderBrush="{DynamicResource ExpanderBorderBrush}"
326326
Margin="0,0,0,3">
327327
<Expander.Header>
328328
<Label FontWeight="SemiBold"

0 commit comments

Comments
 (0)