Skip to content

Commit eb9c9e0

Browse files
MDoernerMDoerner
committed
Merge branch 'next' into LetReferenceInspectionsUseBaseClass
2 parents c38ddae + 5cc81de commit eb9c9e0

30 files changed

+818
-1625
lines changed

‎Rubberduck.Core/UI/About/AboutControl.xaml

+56-51
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,61 @@
88
d:DataContext="{d:DesignInstance {x:Type about:AboutControlViewModel}, IsDesignTimeCreatable=False}"
99
KeyDown="OnKeyDownHandler">
1010
<UserControl.Resources>
11-
<BitmapImage x:Key="RD" UriSource="pack://application:,,,/Rubberduck.Resources;component/Rubberduck.png" />
12-
<Style x:Key="NormalLabel" TargetType="TextBlock">
13-
<Style.Setters>
14-
<Setter Property="FontFamily" Value="Segoe UI" />
15-
<Setter Property="FontSize" Value="11" />
16-
<Setter Property="FontWeight" Value="Normal" />
17-
<Setter Property="Foreground" Value="{x:Static SystemColors.ControlTextBrush}" />
18-
</Style.Setters>
19-
</Style>
20-
<Style x:Key="SubtleLabel" TargetType="TextBlock">
21-
<Style.Setters>
22-
<Setter Property="FontFamily" Value="Segoe UI" />
23-
<Setter Property="FontSize" Value="11" />
24-
<Setter Property="FontWeight" Value="Thin" />
25-
<Setter Property="Foreground" Value="{x:Static SystemColors.GrayTextBrush}" />
26-
</Style.Setters>
27-
</Style>
28-
<Style x:Key="HeadingLabel" TargetType="TextBlock">
29-
<Style.Setters>
30-
<Setter Property="FontFamily" Value="Segoe UI" />
31-
<Setter Property="FontSize" Value="14" />
32-
<Setter Property="FontWeight" Value="Bold" />
33-
<Setter Property="Foreground" Value="{x:Static SystemColors.ControlTextBrush}" />
34-
</Style.Setters>
35-
</Style>
36-
<Style x:Key="SectionBorder" TargetType="Border">
37-
<Style.Setters>
38-
<Setter Property="Background" Value="{x:Static SystemColors.ControlBrush}" />
39-
<Setter Property="BorderBrush" Value="{x:Static SystemColors.HighlightBrush}" />
40-
<Setter Property="BorderThickness" Value="2" />
41-
<Setter Property="CornerRadius" Value="8" />
42-
<Setter Property="Margin" Value="8,8" />
43-
<Setter Property="Padding" Value="4" />
44-
</Style.Setters>
45-
</Style>
46-
<Style x:Key="ReportButtonBorder" TargetType="Border">
47-
<Style.Setters>
48-
<Setter Property="Margin" Value="10" />
49-
<Setter Property="CornerRadius" Value="6" />
50-
<Setter Property="BorderBrush" Value="Green" />
51-
<Setter Property="BorderThickness" Value="2" />
52-
<Setter Property="Background" Value="#FF40C954" />
53-
</Style.Setters>
54-
<Style.Triggers>
55-
<Trigger Property="IsMouseOver" Value="True">
56-
<Setter Property="Background" Value="#FF61D156" />
57-
</Trigger>
58-
</Style.Triggers>
59-
</Style>
60-
11+
<ResourceDictionary>
12+
<ResourceDictionary.MergedDictionaries>
13+
<ResourceDictionary Source="../Styles/DefaultStyle.xaml"/>
14+
</ResourceDictionary.MergedDictionaries>
15+
16+
<BitmapImage x:Key="RD" UriSource="pack://application:,,,/Rubberduck.Resources;component/Rubberduck.png" />
17+
<Style x:Key="NormalLabel" TargetType="TextBlock">
18+
<Style.Setters>
19+
<Setter Property="FontFamily" Value="Segoe UI" />
20+
<Setter Property="FontSize" Value="11" />
21+
<Setter Property="FontWeight" Value="Normal" />
22+
<Setter Property="Foreground" Value="{x:Static SystemColors.ControlTextBrush}" />
23+
</Style.Setters>
24+
</Style>
25+
<Style x:Key="SubtleLabel" TargetType="TextBlock">
26+
<Style.Setters>
27+
<Setter Property="FontFamily" Value="Segoe UI" />
28+
<Setter Property="FontSize" Value="11" />
29+
<Setter Property="FontWeight" Value="Thin" />
30+
<Setter Property="Foreground" Value="{x:Static SystemColors.GrayTextBrush}" />
31+
</Style.Setters>
32+
</Style>
33+
<Style x:Key="HeadingLabel" TargetType="TextBlock">
34+
<Style.Setters>
35+
<Setter Property="FontFamily" Value="Segoe UI" />
36+
<Setter Property="FontSize" Value="14" />
37+
<Setter Property="FontWeight" Value="Bold" />
38+
<Setter Property="Foreground" Value="{x:Static SystemColors.ControlTextBrush}" />
39+
</Style.Setters>
40+
</Style>
41+
<Style x:Key="SectionBorder" TargetType="Border">
42+
<Style.Setters>
43+
<Setter Property="Background" Value="{x:Static SystemColors.ControlBrush}" />
44+
<Setter Property="BorderBrush" Value="{x:Static SystemColors.HighlightBrush}" />
45+
<Setter Property="BorderThickness" Value="2" />
46+
<Setter Property="CornerRadius" Value="8" />
47+
<Setter Property="Margin" Value="8,8" />
48+
<Setter Property="Padding" Value="4" />
49+
</Style.Setters>
50+
</Style>
51+
<Style x:Key="ReportButtonBorder" TargetType="Border">
52+
<Style.Setters>
53+
<Setter Property="Margin" Value="10" />
54+
<Setter Property="CornerRadius" Value="6" />
55+
<Setter Property="BorderBrush" Value="{StaticResource GreenButtonBorderBrush}" />
56+
<Setter Property="BorderThickness" Value="2" />
57+
<Setter Property="Background" Value="{StaticResource GreenButtonBrush}" />
58+
</Style.Setters>
59+
<Style.Triggers>
60+
<Trigger Property="IsMouseOver" Value="True">
61+
<Setter Property="Background" Value="{StaticResource GreenButtonMouseOverBrush}" />
62+
</Trigger>
63+
</Style.Triggers>
64+
</Style>
65+
</ResourceDictionary>
6166
</UserControl.Resources>
6267
<Grid Background="{x:Static SystemColors.WindowBrush}">
6368
<Grid.ColumnDefinitions>
@@ -109,7 +114,7 @@
109114
NavigateUri="https://github.com/rubberduck-vba/Rubberduck/issues/new/choose"
110115
TextDecorations="{x:Null}"
111116
Command="{Binding UriCommand}" CommandParameter="{Binding ElementName=GitHubIssueUrl, Path=NavigateUri}">
112-
<Label Height="40" Foreground="White" FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
117+
<Label Height="40" Foreground="{StaticResource CaptionLightBrush}" FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
113118
VerticalContentAlignment="Center" HorizontalContentAlignment="Stretch"
114119
Content="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_ReportAnIssue}"/>
115120
</Hyperlink>

‎Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesWindow.xaml

+78-72
Original file line numberDiff line numberDiff line change
@@ -13,86 +13,92 @@
1313
d:DesignHeight="380" d:DesignWidth="600"
1414
d:DataContext="{d:DesignInstance local:AddRemoveReferencesViewModel}">
1515
<UserControl.Resources>
16-
<system:Int32 x:Key="ToolTipDelay">2000</system:Int32>
16+
<ResourceDictionary>
17+
<ResourceDictionary.MergedDictionaries>
18+
<ResourceDictionary Source="../Styles/DefaultStyle.xaml"/>
19+
</ResourceDictionary.MergedDictionaries>
1720

18-
<BitmapImage x:Key="BrowseIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/folder-open.png" />
19-
<BitmapImage x:Key="LibraryIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/node-select-all.png" />
20-
<BitmapImage x:Key="VbaProjectIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/ObjectClass.png" />
21-
<BitmapImage x:Key="PinnedIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/pinned.png" />
22-
<BitmapImage x:Key="RecentIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/clock-select.png" />
23-
<BitmapImage x:Key="AddIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow.png" />
24-
<BitmapImage x:Key="RemoveIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-180.png" />
21+
<system:Int32 x:Key="ToolTipDelay">2000</system:Int32>
2522

26-
<local:ReferenceStatusImageSourceConverter x:Key="StatusToIcon" />
27-
<local:PriorityButtonVisibilityConverter x:Key="PriorityButtonVisibility" />
28-
<local:PriorityButtonImageSourceConverter x:Key="PriorityButtonIcon" />
29-
<converters:BooleanToNonDimmedBrushConverter x:Key="BooleanToNonDimmed" />
30-
<converters:BoolToHiddenVisibilityConverter x:Key="ProjectVisibilityConverter" />
23+
<BitmapImage x:Key="BrowseIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/folder-open.png" />
24+
<BitmapImage x:Key="LibraryIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/node-select-all.png" />
25+
<BitmapImage x:Key="VbaProjectIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/ObjectClass.png" />
26+
<BitmapImage x:Key="PinnedIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/pinned.png" />
27+
<BitmapImage x:Key="RecentIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/clock-select.png" />
28+
<BitmapImage x:Key="AddIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow.png" />
29+
<BitmapImage x:Key="RemoveIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-180.png" />
3130

32-
<Style x:Key="DialogButtonStyle" TargetType="Button">
33-
<Setter Property="Margin" Value="5,0" />
34-
<Setter Property="Height" Value="24" />
35-
<Setter Property="Padding" Value="10,0" />
36-
</Style>
37-
<Style TargetType="{x:Type TabItem}">
38-
<Setter Property="Background" Value="Transparent" />
39-
<Setter Property="Template">
40-
<Setter.Value>
41-
<ControlTemplate TargetType="{x:Type TabItem}">
42-
<Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderThickness="0,0,0,2" BorderBrush="Transparent" Margin="2">
43-
<ContentPresenter ContentSource="Header" Margin="2" />
44-
</Border>
45-
<ControlTemplate.Triggers>
46-
<Trigger Property="IsSelected" Value="True">
47-
<Setter TargetName="PART_Border" Property="BorderBrush" Value="Blue" />
48-
</Trigger>
49-
</ControlTemplate.Triggers>
50-
</ControlTemplate>
51-
</Setter.Value>
52-
</Setter>
53-
</Style>
54-
<Style TargetType="{x:Type TabControl}">
55-
<Setter Property="OverridesDefaultStyle" Value="True" />
56-
<Setter Property="SnapsToDevicePixels" Value="True" />
57-
<Setter Property="Template">
58-
<Setter.Value>
59-
<ControlTemplate TargetType="{x:Type TabControl}">
60-
<Grid KeyboardNavigation.TabNavigation="Local">
61-
<Grid.RowDefinitions>
62-
<RowDefinition Height="Auto"/>
63-
<RowDefinition Height="*"/>
64-
</Grid.RowDefinitions>
65-
<TabPanel
31+
<local:ReferenceStatusImageSourceConverter x:Key="StatusToIcon" />
32+
<local:PriorityButtonVisibilityConverter x:Key="PriorityButtonVisibility" />
33+
<local:PriorityButtonImageSourceConverter x:Key="PriorityButtonIcon" />
34+
<converters:BooleanToNonDimmedBrushConverter x:Key="BooleanToNonDimmed" />
35+
<converters:BoolToHiddenVisibilityConverter x:Key="ProjectVisibilityConverter" />
36+
37+
<Style x:Key="DialogButtonStyle" TargetType="Button">
38+
<Setter Property="Margin" Value="5,0" />
39+
<Setter Property="Height" Value="24" />
40+
<Setter Property="Padding" Value="10,0" />
41+
</Style>
42+
<Style TargetType="{x:Type TabItem}">
43+
<Setter Property="Background" Value="Transparent" />
44+
<Setter Property="Template">
45+
<Setter.Value>
46+
<ControlTemplate TargetType="{x:Type TabItem}">
47+
<Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderThickness="0,0,0,2" BorderBrush="Transparent" Margin="2">
48+
<ContentPresenter ContentSource="Header" Margin="2" />
49+
</Border>
50+
<ControlTemplate.Triggers>
51+
<Trigger Property="IsSelected" Value="True">
52+
<Setter TargetName="PART_Border" Property="BorderBrush" Value="{StaticResource TabSelectionUnderlineBrush}" />
53+
</Trigger>
54+
</ControlTemplate.Triggers>
55+
</ControlTemplate>
56+
</Setter.Value>
57+
</Setter>
58+
</Style>
59+
<Style TargetType="{x:Type TabControl}">
60+
<Setter Property="OverridesDefaultStyle" Value="True" />
61+
<Setter Property="SnapsToDevicePixels" Value="True" />
62+
<Setter Property="Template">
63+
<Setter.Value>
64+
<ControlTemplate TargetType="{x:Type TabControl}">
65+
<Grid KeyboardNavigation.TabNavigation="Local">
66+
<Grid.RowDefinitions>
67+
<RowDefinition Height="Auto"/>
68+
<RowDefinition Height="*"/>
69+
</Grid.RowDefinitions>
70+
<TabPanel
6671
Name="HeaderPanel"
6772
Grid.Row="0"
6873
Panel.ZIndex="1"
6974
Margin="0,0,4,-1"
7075
IsItemsHost="True"
7176
KeyboardNavigation.TabIndex="1"
7277
Background="Transparent" />
73-
</Grid>
74-
<ControlTemplate.Triggers>
75-
<Trigger Property="IsEnabled" Value="False" />
76-
</ControlTemplate.Triggers>
77-
</ControlTemplate>
78-
</Setter.Value>
79-
</Setter>
80-
</Style>
81-
<Style x:Key="SelectableText" TargetType="{x:Type TextBox}">
82-
<Setter Property="Margin" Value="2" />
83-
<Setter Property="Foreground" Value ="{x:Static SystemColors.GrayTextBrush}" />
84-
<Setter Property="Background" Value="Transparent" />
85-
<Setter Property="BorderThickness" Value="0" />
86-
<Setter Property="IsReadOnly" Value="True" />
87-
<Setter Property="TextWrapping" Value="NoWrap" />
88-
<Setter Property="VerticalAlignment" Value="Center" />
89-
</Style>
90-
<Style x:Key="BorderStyle" TargetType="{x:Type Border}">
91-
<Setter Property="BorderThickness" Value="1" />
92-
<Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
93-
<Setter Property="Background" Value="{x:Static SystemColors.ControlBrush}" />
94-
<Setter Property="Padding" Value="2" />
95-
</Style>
78+
</Grid>
79+
<ControlTemplate.Triggers>
80+
<Trigger Property="IsEnabled" Value="False" />
81+
</ControlTemplate.Triggers>
82+
</ControlTemplate>
83+
</Setter.Value>
84+
</Setter>
85+
</Style>
86+
<Style x:Key="SelectableText" TargetType="{x:Type TextBox}">
87+
<Setter Property="Margin" Value="2" />
88+
<Setter Property="Foreground" Value ="{x:Static SystemColors.GrayTextBrush}" />
89+
<Setter Property="Background" Value="Transparent" />
90+
<Setter Property="BorderThickness" Value="0" />
91+
<Setter Property="IsReadOnly" Value="True" />
92+
<Setter Property="TextWrapping" Value="NoWrap" />
93+
<Setter Property="VerticalAlignment" Value="Center" />
94+
</Style>
95+
<Style x:Key="BorderStyle" TargetType="{x:Type Border}">
96+
<Setter Property="BorderThickness" Value="1" />
97+
<Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
98+
<Setter Property="Background" Value="{x:Static SystemColors.ControlBrush}" />
99+
<Setter Property="Padding" Value="2" />
100+
</Style>
101+
</ResourceDictionary>
96102
</UserControl.Resources>
97103
<Grid Margin="0,0,0,0">
98104
<Grid.RowDefinitions>
@@ -257,7 +263,7 @@
257263
<ColumnDefinition Width="*" />
258264
<ColumnDefinition Width="50" />
259265
</Grid.ColumnDefinitions>
260-
<Button Name="MoveUpButton" Grid.Column="0" Margin="1" Background="Transparent" BorderBrush="LightGray"
266+
<Button Name="MoveUpButton" Grid.Column="0" Margin="1" Background="Transparent" BorderBrush="{StaticResource ButtonFaceBrush}"
261267
Command="{Binding DataContext.MoveUpCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:AddRemoveReferencesWindow}}}"
262268
ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=References_MoveUpToolTip}" ToolTipService.InitialShowDelay="{StaticResource ToolTipDelay}">
263269
<Button.Style>
@@ -304,7 +310,7 @@
304310
<controls:BindableListItemDrillThroughBehavior />
305311
</i:Interaction.Behaviors>
306312
</Button>
307-
<Button Name="MoveDownButton" Grid.Column="1" Margin="1" Background="Transparent" BorderBrush="LightGray"
313+
<Button Name="MoveDownButton" Grid.Column="1" Margin="1" Background="Transparent" BorderBrush="{StaticResource ButtonFaceBrush}"
308314
Command="{Binding DataContext.MoveDownCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:AddRemoveReferencesWindow}}}"
309315
ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=References_MoveDownToolTip}" ToolTipService.InitialShowDelay="{StaticResource ToolTipDelay}">
310316
<Button.Style>

0 commit comments

Comments
 (0)