Skip to content

Commit b18726b

Browse files
cominterncomintern
authored
Merge branch 'next' into next
2 parents bc241f5 + b69b7cc commit b18726b

File tree

19 files changed

+217
-133
lines changed

19 files changed

+217
-133
lines changed

‎README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,6 @@ This library makes localizing WPF applications at runtime using resx files a bre
9595

9696
> Licensed under [The Code Project Open License](http://www.codeproject.com/info/cpol10.aspx) with the [author's permission](http://www.codeproject.com/Messages/5272045/Re-License.aspx) to re-release under the GPLv3.
9797
98-
###[Using Raw Input from C# to handle multiple keyboards](http://www.codeproject.com/Articles/17123/Using-Raw-Input-from-C-to-handle-multiple-keyboard)
99-
100-
A library using the Raw Input API for reacting to low level keyboard/mouse events.
101-
102-
> Licensed under [The Code Project Open License](http://www.codeproject.com/info/cpol10.aspx).
103-
10498
##Icons
10599

106100
We didn't come up with these icons ourselves! Here's who did what:

‎RetailCoder.VBE/Inspections/QuickFixes/PassParameterByReferenceQuickFix.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private VBAParser.ArgContext GetArgContextForIdentifier(RuleContext context, str
3737
{
3838
var argList = GetArgListForContext(context);
3939
return argList.arg().SingleOrDefault(parameter =>
40-
Identifier.GetName(parameter).Equals(identifier));
40+
Identifier.GetName(parameter.unrestrictedIdentifier()).Equals(identifier));
4141
}
4242
private string GenerateByRefReplacementLine(ITerminalNode terminalNode)
4343
{

‎RetailCoder.VBE/Properties/Resources.Designer.cs

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RetailCoder.VBE/Properties/Resources.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,9 +397,6 @@
397397
<data name="exclamation" type="System.Resources.ResXFileRef, System.Windows.Forms">
398398
<value>..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
399399
</data>
400-
<data name="RD_AboutWindow" type="System.Resources.ResXFileRef, System.Windows.Forms">
401-
<value>..\Resources\RD-AboutWindow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
402-
</data>
403400
<data name="application_resize" type="System.Resources.ResXFileRef, System.Windows.Forms">
404401
<value>..\Resources\application-resize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
405402
</data>

‎RetailCoder.VBE/Resources/AboutBanner.png

18.1 KB
Loading

‎RetailCoder.VBE/Resources/RD-AboutWindow.png

-12.8 KB
Binary file not shown.

‎RetailCoder.VBE/Resources/Rubberduck/RD-AboutWindow.png

-10.8 KB
Loading

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,7 @@
13551355
<Content Include="Resources\Rubberduck\RD-AboutWindow.png" />
13561356
<Content Include="Resources\Rubberduck\RD-InstallBanner.bmp" />
13571357
<Content Include="Resources\Rubberduck\RD-InstallWindow.bmp" />
1358-
<Resource Include="Resources\RD-AboutWindow.png" />
1358+
<Resource Include="Resources\AboutBanner.png" />
13591359
<Resource Include="Resources\twitter_circle_black-512.png" />
13601360
<Resource Include="Resources\RD-InstallWindow.png" />
13611361
<Resource Include="Resources\minus-circle1.png" />

‎RetailCoder.VBE/UI/About/AboutControl.xaml

Lines changed: 90 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -5,61 +5,66 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:about="clr-namespace:Rubberduck.UI.About"
77
mc:Ignorable="d"
8-
d:DesignHeight="350" d:DesignWidth="499"
8+
d:DesignWidth="499"
99
d:DataContext="{d:DesignInstance {x:Type about:AboutControlViewModel}, IsDesignTimeCreatable=False}">
1010
<UserControl.Resources>
11-
<BitmapImage x:Key="DuckImage" UriSource="../../Resources/RD-AboutWindow.png" />
11+
<BitmapImage x:Key="Ducky" UriSource="../../Resources/AboutBanner.png" />
12+
<BitmapImage x:Key="RD" UriSource="../../Resources/Rubberduck.png" />
1213
</UserControl.Resources>
1314
<Grid Background="#F6F6F6F6">
1415
<Grid.ColumnDefinitions>
1516
<ColumnDefinition Width="180" />
1617
<ColumnDefinition />
1718
</Grid.ColumnDefinitions>
1819
<Grid.RowDefinitions>
19-
<RowDefinition />
20-
<RowDefinition Height="55" />
20+
<RowDefinition Height="64" />
21+
<RowDefinition Height="Auto" MinHeight="250" />
22+
<RowDefinition Height="64" />
2123
</Grid.RowDefinitions>
22-
<StackPanel HorizontalAlignment="Left"
24+
25+
<Border Grid.Column="0" Grid.Row="0" Background="White" Margin="5,5,0,0">
26+
<TextBlock Margin="5,10,5,10" Text="{Binding Version}" Foreground="Black"
27+
FontWeight="Bold" FontSize="14"
28+
VerticalAlignment="Top" HorizontalAlignment="Left" />
29+
</Border>
30+
31+
<Border Grid.Column="1" Grid.Row="0" Background="White" Margin="0,5,5,0">
32+
<Image Source="{StaticResource RD}" Stretch="Uniform" />
33+
</Border>
34+
35+
<StackPanel Grid.Column="0" Grid.Row="1" Grid.RowSpan="2"
36+
Background="White"
37+
HorizontalAlignment="Left"
2338
VerticalAlignment="Top"
24-
Margin="10,10,0,10"
25-
DockPanel.Dock="Top">
26-
<Image Source="{StaticResource DuckImage}"
27-
Margin="0,0,0,5"
28-
Width="170"
29-
HorizontalAlignment="Center" />
30-
<TextBlock HorizontalAlignment="Center">
31-
<Hyperlink Name="WebpageHyperlink"
32-
NavigateUri="http://rubberduckvba.com/"
33-
Command="{Binding UriCommand}"
34-
CommandParameter="{Binding ElementName=WebpageHyperlink, Path=NavigateUri}">http://rubberduckvba.com/</Hyperlink>
39+
Margin="5,0,0,5" Height="316" Width="175">
40+
<Image Source="{StaticResource Ducky}" Stretch="UniformToFill" Height="292" />
41+
<TextBlock HorizontalAlignment="Center" Margin="0,5,0,0">
42+
<Hyperlink Name="WebpageHyperlink"
43+
NavigateUri="http://rubberduckvba.com/"
44+
FontWeight="Bold"
45+
Command="{Binding UriCommand}"
46+
CommandParameter="{Binding ElementName=WebpageHyperlink, Path=NavigateUri}">rubberduckvba.com</Hyperlink>
3547
</TextBlock>
3648
</StackPanel>
3749
<StackPanel Grid.Column="1"
38-
Grid.Row="0"
50+
Grid.Row="1"
3951
Background="White"
40-
Margin="10,10,10,30"
52+
Margin="0,0,5,5"
4153
Grid.RowSpan="2">
42-
<TextBlock Margin="10"
43-
Text="{Binding Version}"
44-
FontWeight="Bold"
45-
VerticalAlignment="Top"
46-
HorizontalAlignment="Left"
47-
FontSize="14" />
48-
54+
4955
<Label Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_AttributionsLabel}"
5056
FontWeight="SemiBold"
5157
FontSize="12"
5258
Margin="5,0,0,0" />
5359
<TextBlock Margin="15,0,0,10"
5460
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_AttributionList}"
5561
FontSize="10"/>
56-
62+
5763
<Label Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_SpecialThanksLabel}"
5864
FontWeight="SemiBold"
5965
FontSize="12"
6066
Margin="5,0,0,0" />
61-
<ScrollViewer Margin="15,0,10,10"
62-
Height="150">
67+
<ScrollViewer Margin="15,0,10,0" Height="150">
6368
<StackPanel>
6469
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_CommunityHeader}"
6570
FontWeight="SemiBold"
@@ -69,7 +74,7 @@
6974
Code Review Stack Exchange
7075
Stack Overflow
7176
</TextBlock>
72-
77+
7378
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_ContributorsHeader}"
7479
FontWeight="SemiBold"
7580
FontSize="10" />
@@ -78,6 +83,7 @@ Stack Overflow
7883
Andrew Jackson
7984
Andrin Meier
8085
Bruno Costa
86+
BZngr
8187
Carlos J. Quintero (MZ-Tools)
8288
@Comintern
8389
@daFreeMan
@@ -86,8 +92,10 @@ Francis Veilleux-Gaboury
8692
Frank Van Heeswijk
8793
Gareth Leachman
8894
@Heslacher
95+
INOPIAE
8996
Jeroen Vannevel
90-
Michal Krzych (vba4all.com)
97+
Max Dörner
98+
Michal Krzych
9199
@mjolka
92100
Philip Wales
93101
Rob Bovey (Smart Indenter)
@@ -103,53 +111,58 @@ Stephen Bullen (Smart Indenter)
103111
</ScrollViewer>
104112
</StackPanel>
105113

106-
<StackPanel HorizontalAlignment="Left"
107-
Grid.Row="1"
108-
Grid.Column="0"
109-
Grid.ColumnSpan="2"
110-
Margin="10"
114+
<Border Grid.Row="2" Grid.Column="0">
115+
<StackPanel HorizontalAlignment="Center"
111116
Orientation="Horizontal">
112-
<!-- Circle logos created with Ai->XAML Export Plug-In Version 0.2 (PC/64) -->
113-
<!-- By Mike Swanson (http://blog.mikeswanson.com/) -->
114-
<TextBlock>
115-
<Hyperlink Name="GitHubUrl"
116-
NavigateUri="https://github.com/rubberduck-vba/Rubberduck"
117-
Command="{Binding UriCommand}"
118-
CommandParameter="{Binding ElementName=GitHubUrl, Path=NavigateUri}"
119-
TextDecorations="{x:Null}">
120-
<Viewbox Width="35"
121-
Height="35">
122-
<Canvas Width="120"
123-
Height="120"
124-
Background="Transparent">
125-
<Path Fill="Black"
126-
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"/>
127-
</Canvas>
128-
</Viewbox>
129-
</Hyperlink>
130-
<Hyperlink Name="TwitterUrl"
131-
NavigateUri="http://www.twitter.com/rubberduckvba"
132-
Command="{Binding UriCommand}"
133-
CommandParameter="{Binding ElementName=TwitterUrl, Path=NavigateUri}"
134-
TextDecorations="{x:Null}">
135-
<Viewbox Margin="10,0,0,0"
136-
Width="35"
137-
Height="35">
138-
<Canvas Width="120"
139-
Height="120"
140-
Background="Transparent">
141-
<Path Fill="Black"
142-
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"/>
143-
</Canvas>
144-
</Viewbox>
145-
</Hyperlink>
146-
</TextBlock>
147-
</StackPanel>
148-
<TextBlock Grid.Row="1"
149-
Grid.Column="1"
150-
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_Copyright}"
151-
FontSize="8"
152-
VerticalAlignment="Bottom"
153-
Margin="10,0,0,10"/>
117+
118+
<!-- Circle logos created with Ai->XAML Export Plug-In Version 0.2 (PC/64) -->
119+
<!-- By Mike Swanson (http://blog.mikeswanson.com/) -->
120+
121+
<StackPanel Margin="2,0,20,0" HorizontalAlignment="Center">
122+
<TextBlock TextAlignment="Center" HorizontalAlignment="Center">
123+
<Hyperlink Name="GitHubUrl"
124+
NavigateUri="https://github.com/rubberduck-vba/Rubberduck"
125+
Command="{Binding UriCommand}"
126+
CommandParameter="{Binding ElementName=GitHubUrl, Path=NavigateUri}"
127+
TextDecorations="{x:Null}">
128+
<Viewbox Width="25"
129+
Height="25">
130+
<Canvas Width="120"
131+
Height="120"
132+
Background="Transparent">
133+
<Path Fill="Black"
134+
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"/>
135+
</Canvas>
136+
</Viewbox>
137+
</Hyperlink>
138+
</TextBlock>
139+
<TextBlock Text="GitHub" FontSize="9" TextAlignment="Center" />
140+
</StackPanel>
141+
<StackPanel Margin="25,0,0,0" HorizontalAlignment="Center">
142+
<TextBlock 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+
<Viewbox Width="25"
149+
Height="25">
150+
<Canvas Width="120"
151+
Height="120"
152+
Background="Transparent">
153+
<Path Fill="Black"
154+
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"/>
155+
</Canvas>
156+
</Viewbox>
157+
</Hyperlink>
158+
</TextBlock>
159+
<TextBlock Text="Twitter" FontSize="9" TextAlignment="Center" />
160+
</StackPanel>
161+
</StackPanel>
162+
</Border>
163+
<TextBlock Grid.Row="2" Grid.Column="1"
164+
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_Copyright}"
165+
FontSize="8" Margin="10"
166+
VerticalAlignment="Bottom" HorizontalAlignment="Center" Height="11" Width="237" />
154167
</Grid>
155168
</UserControl>

‎RetailCoder.VBE/UI/About/AboutDialog.Designer.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)