Skip to content

Commit e3d7de9

Browse files
GmausDevGmausDev
committed
Continue With #5451
Control xamls
1 parent d843415 commit e3d7de9

File tree

8 files changed

+74
-74
lines changed

8 files changed

+74
-74
lines changed

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

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
</ResourceDictionary>
1515
</UserControl.Resources>
1616

17-
<Border Background="{StaticResource BackgroundSoftBrush}" DataContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext}">
17+
<Border Background="{DynamicResource BackgroundSoftBrush}" DataContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext}">
1818
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="WrapWithOverflow" TextAlignment="Center"
1919
MinWidth="200">
2020
<Run FontWeight="Bold" Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EmptyUIRefreshMessage_Title}"/><LineBreak/>
2121
<LineBreak/>
22-
<Button Command="{Binding RefreshCommand}" BorderThickness="0" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
23-
<Image Height="16" Source="{StaticResource DoubleArrowImage}" ClipToBounds="True" />
22+
<Button Command="{Binding RefreshCommand}" BorderThickness="0" Style="{DynamicResource {x:Static ToolBar.ButtonStyleKey}}">
23+
<Image Height="16" Source="{DynamicResource DoubleArrowImage}" ClipToBounds="True" />
2424
<Button.ToolTip>
2525
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Refresh}" />
2626
</Button.ToolTip>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
1818

19-
<Style x:Key="PrettifyRowModified" TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource PrettifyRow}">
19+
<Style x:Key="PrettifyRowModified" TargetType="{x:Type DataGridRow}" BasedOn="{DynamicResource PrettifyRow}">
2020
<EventSetter Event="MouseDoubleClick" Handler="GroupingGridItem_MouseDoubleClick" />
2121
<Setter Property="Height" Value="Auto" />
2222
<Setter Property="MinHeight" Value="26" />
@@ -29,7 +29,7 @@
2929
<Setter Property="Template">
3030
<Setter.Value>
3131
<ControlTemplate>
32-
<Expander Background="{StaticResource BackgroundLightBrush}" Foreground="{StaticResource CaptionDarkBrush}" FontWeight="SemiBold"
32+
<Expander Background="{DynamicResource BackgroundLightBrush}" Foreground="{DynamicResource CaptionDarkBrush}" FontWeight="SemiBold"
3333
IsExpanded="{Binding InitialExpandedState, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:GroupingGrid}}}">
3434
<Expander.Header>
3535
<StackPanel Orientation="Horizontal">
@@ -42,7 +42,7 @@
4242
VerticalAlignment="Center"
4343
Text="{Binding ItemCount, StringFormat=(\{0\})}"
4444
TextWrapping="NoWrap"
45-
Visibility="{Binding ShowGroupingItemCount, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:GroupingGrid}}}"/>
45+
Visibility="{Binding ShowGroupingItemCount, Converter={DynamicResource BooleanToVisibilityConverter}, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:GroupingGrid}}}"/>
4646
</StackPanel>
4747
</Expander.Header>
4848
<ItemsPresenter Margin="25,0,0,0" />
@@ -57,7 +57,7 @@
5757
</ResourceDictionary>
5858
</DataGrid.Resources>
5959
<DataGrid.GroupStyle>
60-
<GroupStyle ContainerStyle="{StaticResource GroupHeaderStyle}">
60+
<GroupStyle ContainerStyle="{DynamicResource GroupHeaderStyle}">
6161
<GroupStyle.Panel>
6262
<ItemsPanelTemplate>
6363
<DataGridRowsPresenter/>
@@ -79,7 +79,7 @@
7979
<Setter Property="VerticalGridLinesBrush" Value="Transparent" />
8080
<Setter Property="HeadersVisibility" Value="Column" />
8181
<Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
82-
<Setter Property="ItemContainerStyle" Value="{StaticResource PrettifyRowModified}" />
82+
<Setter Property="ItemContainerStyle" Value="{DynamicResource PrettifyRowModified}" />
8383
<Setter Property="ColumnHeaderHeight" Value="22" />
8484
</Style>
8585
</DataGrid.Style>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
</ControlTemplate>
3333
</Setter.Value>
3434
</Setter>
35-
<Setter Property="Foreground" Value="{StaticResource CaptionHyperlinkBrush}" />
35+
<Setter Property="Foreground" Value="{DynamicResource CaptionHyperlinkBrush}" />
3636
<Setter Property="Cursor" Value="Hand" />
3737
<Style.Triggers>
3838
<Trigger Property="IsMouseOver" Value="true">
39-
<Setter Property="Foreground" Value="{StaticResource CaptionHyperlinkVisitedBrush}" />
39+
<Setter Property="Foreground" Value="{DynamicResource CaptionHyperlinkVisitedBrush}" />
4040
</Trigger>
4141
<Trigger Property="IsEnabled" Value="false">
42-
<Setter Property="Foreground" Value="{StaticResource CaptionDisabledBrush}" />
42+
<Setter Property="Foreground" Value="{DynamicResource CaptionDisabledBrush}" />
4343
</Trigger>
4444
</Style.Triggers>
4545
</Style>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
<Border Grid.Row="0" Grid.Column="0" Grid.RowSpan="4" Grid.ColumnSpan="3" BorderBrush="Black" BorderThickness="1px" />
4040

4141
<Image Grid.Row="0" Grid.Column="0" VerticalAlignment="Top"
42-
Style="{StaticResource IconStyle}"
43-
Source="{Binding NavigateCommandParameter, Converter={StaticResource DeclarationToIcon}, Mode=OneWay}" />
42+
Style="{DynamicResource IconStyle}"
43+
Source="{Binding NavigateCommandParameter, Converter={DynamicResource DeclarationToIcon}, Mode=OneWay}" />
4444
<Image Grid.Row="0" Grid.Column="0" VerticalAlignment="Top"
45-
Style="{StaticResource IconStyle}"
46-
Source="{Binding Target.Accessibility, Converter={StaticResource AccessibilityToIcon}, Mode=OneWay}" />
45+
Style="{DynamicResource IconStyle}"
46+
Source="{Binding Target.Accessibility, Converter={DynamicResource AccessibilityToIcon}, Mode=OneWay}" />
4747

4848
<TextBlock Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2"
4949
Text="{Binding Target.IdentifierName}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<Image VerticalAlignment="Center" HorizontalAlignment="Center"
6161
Width="16" Height="16"
6262
Source="{Binding Text, ElementName=ValueContainer,
63-
Converter={StaticResource SearchToIcon},
63+
Converter={DynamicResource SearchToIcon},
6464
UpdateSourceTrigger=PropertyChanged}" />
6565
<i:Interaction.Behaviors>
6666
<local:FocusElementAfterClickBehavior FocusElement="{x:Reference ValueContainer}"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
SelectedItem="{Binding SelectedItem}">
3232
<DataGrid.Columns>
3333
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_MemberName}" Binding="{Binding ParentScope.IdentifierName}" />
34-
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_MemberType}" Binding="{Binding ParentScope.DeclarationType, Converter={StaticResource DeclarationTypeToString}}" />
34+
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_MemberType}" Binding="{Binding ParentScope.DeclarationType, Converter={DynamicResource DeclarationTypeToString}}" />
3535
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_Location}" Binding="{Binding Selection}" />
3636
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_Context}" Width="*">
3737
<DataGridTemplateColumn.CellTemplate>
3838
<DataTemplate>
39-
<ContentControl Content="{Binding Converter={StaticResource SearchResultConverter}}" />
39+
<ContentControl Content="{Binding Converter={DynamicResource SearchResultConverter}}" />
4040
</DataTemplate>
4141
</DataGridTemplateColumn.CellTemplate>
4242
</DataGridTemplateColumn>

0 commit comments

Comments
 (0)