Skip to content

Commit c60d5c7

Browse files
retailcoderretailcoder
committed
xaml tweaks, removed social media links
1 parent 0574202 commit c60d5c7

File tree

1 file changed

+92
-118
lines changed

1 file changed

+92
-118
lines changed

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

Lines changed: 92 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:about="clr-namespace:Rubberduck.UI.About"
7-
mc:Ignorable="d"
7+
mc:Ignorable="d"
88
d:DataContext="{d:DesignInstance {x:Type about:AboutControlViewModel}, IsDesignTimeCreatable=False}"
99
KeyDown="OnKeyDownHandler">
1010
<UserControl.Resources>
@@ -41,11 +41,11 @@
4141
<Style x:Key="SectionBorder" TargetType="Border">
4242
<Style.Setters>
4343
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrush}}" />
44-
<Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrush}}" />
45-
<Setter Property="BorderThickness" Value="2" />
44+
<Setter Property="BorderBrush" Value="Black" />
45+
<Setter Property="BorderThickness" Value="1" />
4646
<Setter Property="CornerRadius" Value="8" />
47-
<Setter Property="Margin" Value="8,8" />
48-
<Setter Property="Padding" Value="4" />
47+
<Setter Property="Margin" Value="10,0" />
48+
<Setter Property="Padding" Value="2" />
4949
</Style.Setters>
5050
</Style>
5151
<Style x:Key="ReportButtonBorder" TargetType="Border">
@@ -64,129 +64,100 @@
6464
</Style>
6565
</ResourceDictionary>
6666
</UserControl.Resources>
67-
<Grid Background="{DynamicResource {x:Static SystemColors.WindowBrush}}">
68-
<Grid.ColumnDefinitions>
69-
<ColumnDefinition Width="*" MinWidth="250"/>
70-
<ColumnDefinition Width="*" MinWidth="250"/>
71-
</Grid.ColumnDefinitions>
67+
68+
<Grid>
7269
<Grid.RowDefinitions>
7370
<RowDefinition Height="Auto"/>
7471
<RowDefinition Height="Auto"/>
7572
<RowDefinition Height="Auto"/>
76-
<RowDefinition Height="Auto"/>
7773
</Grid.RowDefinitions>
7874

79-
<Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Margin="10" BorderThickness="0,1" BorderBrush="Black">
75+
<!-- heading -->
76+
<Border Grid.Row="0" Margin="10" BorderThickness="0,1" BorderBrush="Black">
8077
<Image Source="{StaticResource RD}" Stretch="Uniform" />
8178
</Border>
82-
<Border Grid.Row="1" Grid.Column="0" Style="{StaticResource SectionBorder}">
83-
<StackPanel Grid.Column="0" Grid.Row="1"
84-
MinHeight="100" MinWidth="250"
85-
VerticalAlignment="Center">
86-
<TextBlock x:Name="Version" Text="{Binding Version}" Style="{StaticResource HeadingLabel}" HorizontalAlignment="Center" Margin="5" />
87-
<TextBlock x:Name="OperatingSystem" Text="{Binding OperatingSystem}" Style="{StaticResource NormalLabel}" HorizontalAlignment="Center"/>
88-
<TextBlock x:Name="HostProduct" Text="{Binding HostProduct}" Style="{StaticResource NormalLabel}" HorizontalAlignment="Center"/>
89-
<TextBlock x:Name="HostVersion" Text="{Binding HostVersion}" Style="{StaticResource NormalLabel}" HorizontalAlignment="Center"/>
90-
<TextBlock x:Name="HostExecutable" Text="{Binding HostExecutable}" Style="{StaticResource NormalLabel}" HorizontalAlignment="Center"/>
91-
<TextBlock Style="{StaticResource SubtleLabel}" HorizontalAlignment="Center" Margin="5,10,5,2">
79+
80+
<!-- client area -->
81+
<Border Grid.Row="1" Style="{StaticResource SectionBorder}">
82+
<Grid>
83+
<Grid.RowDefinitions>
84+
<RowDefinition Height="Auto" />
85+
<RowDefinition Height="Auto" />
86+
</Grid.RowDefinitions>
87+
<Grid.ColumnDefinitions>
88+
<ColumnDefinition Width="*" MinWidth="250"/>
89+
<ColumnDefinition Width="*" MinWidth="250"/>
90+
</Grid.ColumnDefinitions>
91+
92+
<StackPanel MinHeight="100" MinWidth="250" VerticalAlignment="Top">
93+
<TextBlock x:Name="Version" Text="{Binding Version}" Style="{StaticResource HeadingLabel}" HorizontalAlignment="Center" Margin="5" />
94+
<TextBlock x:Name="OperatingSystem" Text="{Binding OperatingSystem}" Style="{StaticResource NormalLabel}" HorizontalAlignment="Center"/>
95+
<TextBlock x:Name="HostProduct" Text="{Binding HostProduct}" Style="{StaticResource NormalLabel}" HorizontalAlignment="Center"/>
96+
<TextBlock x:Name="HostVersion" Text="{Binding HostVersion}" Style="{StaticResource NormalLabel}" HorizontalAlignment="Center"/>
97+
<TextBlock x:Name="HostExecutable" Text="{Binding HostExecutable}" Style="{StaticResource NormalLabel}" HorizontalAlignment="Center"/>
98+
<TextBlock Style="{StaticResource SubtleLabel}" HorizontalAlignment="Center" Margin="5,10,5,2">
9299
<Hyperlink Click="CopyVersionInfo_Click">
93100
<Run Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_CopyVersionLabel}"/>
94101
</Hyperlink>
95-
</TextBlock>
96-
<TextBlock Style="{StaticResource SubtleLabel}" HorizontalAlignment="Center" Margin="5,2,5,10" >
102+
</TextBlock>
103+
<TextBlock Style="{StaticResource SubtleLabel}" HorizontalAlignment="Center" Margin="5,2,5,10" >
97104
<Hyperlink Command="{Binding ViewLogCommand}">
98105
<Run Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_ViewLogLabel}"/>
99106
</Hyperlink>
100-
</TextBlock>
101-
</StackPanel>
102-
</Border>
103-
<Border Grid.Row="2" Grid.Column="0" Style="{StaticResource SectionBorder}">
107+
</TextBlock>
108+
</StackPanel>
104109

105-
<TextBlock Grid.Column="0" Grid.Row="2" TextAlignment="Center">
106-
<StackPanel Orientation="Vertical" Margin="10">
107-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_FoundAnIssue}"
108-
Style="{StaticResource HeadingLabel}"/>
109-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_HelpImproveRubberduck}"
110-
Style="{StaticResource NormalLabel}"/>
111-
<Border Style="{StaticResource ReportButtonBorder}">
112-
<TextBlock>
113-
<Hyperlink Name="GitHubIssueUrl"
114-
NavigateUri="https://github.com/rubberduck-vba/Rubberduck/issues/new/choose"
115-
TextDecorations="{x:Null}"
116-
Command="{Binding UriCommand}" CommandParameter="{Binding ElementName=GitHubIssueUrl, Path=NavigateUri}">
117-
<Label Height="40" Foreground="{StaticResource CaptionLightBrush}" FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
118-
VerticalContentAlignment="Center" HorizontalContentAlignment="Stretch"
119-
Content="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_ReportAnIssue}"/>
120-
</Hyperlink>
121-
</TextBlock>
122-
</Border>
123-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_FindRubberduckAt}"
124-
Style="{StaticResource NormalLabel}" Margin="0,5"/>
125-
<StackPanel HorizontalAlignment="Center"
126-
Orientation="Horizontal">
127-
<!-- Circle logos created with Ai->XAML Export Plug-In Version 0.2 (PC/64) -->
128-
<!-- By Mike Swanson (http://blog.mikeswanson.com/) -->
129-
<TextBlock Margin="10,5" TextAlignment="Center" HorizontalAlignment="Center">
130-
<Hyperlink Name="GitHubUrl"
131-
NavigateUri="https://github.com/rubberduck-vba/Rubberduck"
132-
Command="{Binding UriCommand}"
133-
CommandParameter="{Binding ElementName=GitHubUrl, Path=NavigateUri}"
134-
TextDecorations="{x:Null}">
135-
<Border Background="Transparent">
136-
<Path Stretch="Fill" Fill="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrush}}" Width="25" Height="25"
137-
Data=" M 59.996,0.000 C 26.866,0.000 0.000,26.863 0.000,60.003 C 0.000,86.510 17.190,108.999 41.035,116.934 C 44.035,117.484 45.130,115.632 45.130,114.041 C 45.130,112.617 45.078,108.844 45.049,103.837 C 28.359,107.463 24.837,95.794 24.837,95.794 C 22.109,88.862 18.175,87.017 18.175,87.017 C 12.728,83.294 18.588,83.370 18.588,83.370 C 24.609,83.794 27.778,89.553 27.778,89.553 C 33.130,98.722 41.821,96.074 45.240,94.539 C 45.785,90.661 47.335,88.017 49.049,86.517 C 35.725,85.003 21.719,79.856 21.719,56.863 C 21.719,50.313 24.057,44.957 27.895,40.763 C 27.278,39.245 25.219,33.145 28.483,24.884 C 28.483,24.884 33.521,23.271 44.982,31.035 C 49.768,29.704 54.901,29.039 60.003,29.016 C 65.099,29.039 70.232,29.704 75.025,31.035 C 86.479,23.271 91.508,24.884 91.508,24.884 C 94.781,33.145 92.722,39.245 92.105,40.763 C 95.950,44.957 98.272,50.313 98.272,56.863 C 98.272,79.913 84.244,84.985 70.877,86.471 C 73.032,88.323 74.951,91.985 74.951,97.582 C 74.951,105.603 74.877,112.074 74.877,114.041 C 74.877,115.646 75.958,117.513 79.003,116.927 C 102.824,108.977 120.000,86.503 120.000,60.003 C 120.000,26.863 93.134,0.000 59.996,0.000 Z"/>
138-
</Border>
139-
</Hyperlink>
140-
</TextBlock>
141-
<!--<TextBlock Text="GitHub" FontSize="9" TextAlignment="Center" />-->
142-
<TextBlock Margin="10,5" TextAlignment="Center" HorizontalAlignment="Center">
143-
<Hyperlink Name="TwitterUrl"
144-
NavigateUri="http://www.twitter.com/rubberduckvba"
145-
Command="{Binding UriCommand}"
146-
CommandParameter="{Binding ElementName=TwitterUrl, Path=NavigateUri}"
147-
TextDecorations="{x:Null}">
148-
<Border Background="Transparent">
149-
<Path Stretch="Fill" Fill="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrush}}" Width="25" Height="25"
150-
Data="F1 M 92.670,42.747 C 92.702,43.460 92.718,44.177 92.718,44.897 C 92.718,66.860 76.001,92.185 45.431,92.185 C 36.045,92.185 27.310,89.433 19.954,84.718 C 21.255,84.871 22.577,84.950 23.919,84.950 C 31.706,84.950 38.872,82.293 44.560,77.836 C 37.287,77.701 31.149,72.896 29.034,66.293 C 30.049,66.487 31.090,66.591 32.161,66.591 C 33.677,66.591 35.145,66.388 36.540,66.009 C 28.937,64.482 23.208,57.765 23.208,49.712 C 23.208,49.642 23.208,49.572 23.209,49.503 C 25.450,50.748 28.013,51.496 30.737,51.582 C 26.278,48.601 23.344,43.514 23.344,37.748 C 23.344,34.703 24.163,31.848 25.594,29.393 C 33.791,39.448 46.037,46.065 59.850,46.758 C 59.567,45.541 59.420,44.273 59.420,42.970 C 59.420,33.792 66.861,26.351 76.040,26.351 C 80.820,26.351 85.139,28.369 88.171,31.599 C 91.957,30.854 95.514,29.471 98.725,27.566 C 97.484,31.447 94.849,34.704 91.417,36.761 C 94.779,36.359 97.982,35.466 100.963,34.144 C 98.735,37.477 95.917,40.404 92.670,42.747 Z M 60.000,0.000 C 26.863,0.000 0.000,26.863 0.000,60.000 C 0.000,93.137 26.863,120.000 60.000,120.000 C 93.137,120.000 120.000,93.137 120.000,60.000 C 120.000,26.863 93.137,0.000 60.000,0.000 Z"/>
151-
</Border>
110+
<TextBlock Grid.Row="1" TextAlignment="Center">
111+
<StackPanel Orientation="Vertical" Margin="10">
112+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_FoundAnIssue}"
113+
Style="{StaticResource HeadingLabel}"/>
114+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_HelpImproveRubberduck}"
115+
Style="{StaticResource NormalLabel}"/>
116+
<Border Style="{StaticResource ReportButtonBorder}">
117+
<TextBlock>
118+
<Hyperlink Name="GitHubIssueUrl" NavigateUri="https://github.com/rubberduck-vba/Rubberduck/issues/new/choose" TextDecorations="{x:Null}"
119+
Command="{Binding UriCommand}" CommandParameter="{Binding ElementName=GitHubIssueUrl, Path=NavigateUri}">
120+
<Label Height="40" Foreground="{StaticResource CaptionLightBrush}" FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
121+
VerticalContentAlignment="Center" HorizontalContentAlignment="Stretch"
122+
Content="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_ReportAnIssue}"/>
152123
</Hyperlink>
124+
</TextBlock>
125+
</Border>
126+
<TextBlock HorizontalAlignment="Center" Style="{StaticResource SubtleLabel}">
127+
<Hyperlink Name="WebpageHyperlink"
128+
Command="{Binding UriCommand}"
129+
CommandParameter="{Binding ElementName=WebpageHyperlink, Path=NavigateUri}"
130+
NavigateUri="http://rubberduckvba.com/">rubberduckvba.com
131+
</Hyperlink>
153132
</TextBlock>
154-
<!--<TextBlock Text="Twitter" FontSize="9" TextAlignment="Center" />-->
155133
</StackPanel>
156-
<TextBlock HorizontalAlignment="Center" Style="{StaticResource SubtleLabel}">
157-
<Hyperlink Name="WebpageHyperlink"
158-
Command="{Binding UriCommand}"
159-
CommandParameter="{Binding ElementName=WebpageHyperlink, Path=NavigateUri}"
160-
NavigateUri="http://rubberduckvba.com/">rubberduckvba.com</Hyperlink>
161-
</TextBlock>
162-
</StackPanel>
163-
</TextBlock>
164-
</Border>
165-
<Border Grid.Row="1" Grid.Column="1" Grid.RowSpan="2" Style="{StaticResource SectionBorder}">
166-
<ScrollViewer Margin="5" Height="360" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
167-
<StackPanel VerticalAlignment="Top">
168-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_AttributionsLabel}"
169-
Style="{StaticResource HeadingLabel}" />
170-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_AttributionList}"
171-
Style="{StaticResource NormalLabel}" Margin="5" />
134+
</TextBlock>
172135

173-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_SpecialThanksLabel}"
174-
Style="{StaticResource HeadingLabel}" Margin="0,5" />
175-
<StackPanel Margin="5,0,0,0">
176-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_CommunityHeader}"
177-
Style="{StaticResource NormalLabel}" FontWeight="Bold" />
178-
<TextBlock Style="{StaticResource NormalLabel}" Margin="5,0"
179-
xml:space="preserve">JetBrains ReSharper Community Team
180-
Code Review Stack Exchange
136+
<ScrollViewer Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" Margin="5" Height="360" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
137+
<StackPanel VerticalAlignment="Top">
138+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_AttributionsLabel}"
139+
Style="{StaticResource HeadingLabel}" />
140+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_AttributionList}"
141+
Style="{StaticResource NormalLabel}" Margin="5" />
142+
143+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_SpecialThanksLabel}"
144+
Style="{StaticResource HeadingLabel}" Margin="0,5" />
145+
<StackPanel Margin="5,0,0,0">
146+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_CommunityHeader}"
147+
Style="{StaticResource NormalLabel}" FontWeight="Bold" />
148+
<TextBlock Style="{StaticResource NormalLabel}" Margin="5,0"
149+
xml:space="preserve">Code Review (Stack Exchange)
181150
Stack Overflow
182151
Digital Ocean Hacktoberfest
183-
</TextBlock>
152+
JetBrains ReSharper Community Team
153+
Microsoft MVP Award Program
154+
</TextBlock>
184155

185-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_ContributorsHeader}"
186-
Style="{StaticResource NormalLabel}" FontWeight="Bold" />
187-
<TextBlock Style="{StaticResource NormalLabel}"
188-
Margin="5,0"
189-
xml:space="preserve">Abraham Hosch
156+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_ContributorsHeader}"
157+
Style="{StaticResource NormalLabel}" FontWeight="Bold" />
158+
<TextBlock Style="{StaticResource NormalLabel}"
159+
Margin="5,0"
160+
xml:space="preserve">Abraham Hosch
190161
Andrew Jackson
191162
Andrew Zschetzsche
192163
Andrew Mansell
@@ -224,20 +195,23 @@ Ross Knudsen
224195
Simon Forsberg
225196
Stephen Bullen (Smart Indenter)
226197
@tommy9
227-
Wayne Phillips (vbWatchdog)
228-
</TextBlock>
198+
Wayne Phillips (vbWatchdog, twinBASIC)
199+
</TextBlock>
229200

230-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_GeneralThanks}"
231-
FontSize="10"
232-
HorizontalAlignment="Left"
233-
TextWrapping="WrapWithOverflow"
234-
Margin="15,0,0,0"/>
201+
<TextBlock
202+
Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_GeneralThanks}"
203+
FontSize="10"
204+
HorizontalAlignment="Left"
205+
TextWrapping="WrapWithOverflow"
206+
Margin="15,0,0,0"/>
207+
</StackPanel>
235208
</StackPanel>
236-
</StackPanel>
237-
</ScrollViewer>
209+
</ScrollViewer>
210+
</Grid>
238211
</Border>
239-
<TextBlock Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3"
240-
Text="{Binding AboutCopyright}" Style="{StaticResource SubtleLabel}"
241-
Margin="0,15" HorizontalAlignment="Center" />
212+
213+
<!-- bottom copyright notice -->
214+
<TextBlock Grid.Row="2" Text="{Binding AboutCopyright}" Style="{StaticResource SubtleLabel}" Margin="0,15" HorizontalAlignment="Center" />
215+
242216
</Grid>
243217
</UserControl>

0 commit comments

Comments
 (0)