Skip to content

Commit 9bb420c

Browse files
committed
Merge pull request #1203 from Hosch250/BugBlipper
UI tweaks
2 parents 6c18761 + 0add765 commit 9bb420c

File tree

9 files changed

+254
-109
lines changed

9 files changed

+254
-109
lines changed

RetailCoder.VBE/UI/About/AboutControl.xaml

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,51 @@
6060
Margin="5,0,0,0" />
6161
<ScrollViewer Margin="15,0,10,10"
6262
Height="150">
63-
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_SpecialThanksList}"
64-
FontSize="10" />
63+
<StackPanel>
64+
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_CommunityHeader}"
65+
FontWeight="SemiBold"
66+
FontSize="10" />
67+
<TextBlock FontSize="10"
68+
xml:space="preserve">Code Review Stack Exchange
69+
JetBrains ReSharper Community Team
70+
Stack Overflow
71+
</TextBlock>
72+
73+
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_BlogsHeader}"
74+
FontWeight="SemiBold"
75+
FontSize="10" />
76+
<TextBlock FontSize="10"
77+
xml:space="preserve">Michal Krzych (vba4all.com)
78+
Knjname developer blog (clockahead.blogspot.jp)
79+
</TextBlock>
80+
81+
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_ContributorsHeader}"
82+
FontWeight="SemiBold"
83+
FontSize="10" />
84+
<TextBlock FontSize="10"
85+
xml:space="preserve">Abraham Hosch
86+
Andrew Jackson
87+
Andrin Meier
88+
Bruno Costa
89+
Carlos J. Quintero (MZ-Tools articles &amp; help with VBE API)
90+
@daFreeMan
91+
@Duga SE chat bot
92+
Francis Veilleux-Gaboury
93+
Frank Van Heeswijk
94+
@Heslacher
95+
Jeroen Vannevel
96+
@mjolka
97+
Philip Wales
98+
Rob Bovey
99+
Ross McLean
100+
Ross Knudsen
101+
Simon Forsberg
102+
Stephen Bullen
103+
</TextBlock>
104+
105+
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_GeneralThanks}"
106+
FontSize="10" />
107+
</StackPanel>
65108
</ScrollViewer>
66109
</StackPanel>
67110

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

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

RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,37 +1268,8 @@ Are you sure you want to proceed with this rename?</value>
12681268
GitHub integration powered by LibGit2Sharp
12691269
Fugue icons by Yusuke Kamiyamane</value>
12701270
</data>
1271-
<data name="AboutWindow_SpecialThanksList" xml:space="preserve">
1272-
<value>Community:
1273-
Code Review Stack Exchange
1274-
JetBrains ReSharper Community Team
1275-
Stack Overflow
1276-
1277-
Blogs:
1278-
Michal Krzych (vba4all.com)
1279-
Knjname developer blog (clockahead.blogspot.jp)
1280-
1281-
Contributors &amp; supporters:
1282-
Abraham Hosch
1283-
Andrew Jackson
1284-
Andrin Meier
1285-
Bruno Costa
1286-
Carlos J. Quintero (MZ-Tools articles &amp; help with VBE API)
1287-
@daFreeMan
1288-
@Duga SE chat bot
1289-
Francis Veilleux-Gaboury
1290-
Frank Van Heeswijk
1291-
@Heslacher
1292-
Jeroen Vannevel
1293-
@mjolka
1294-
Philip Wales
1295-
Rob Bovey
1296-
Ross McLean
1297-
Ross Knudsen
1298-
Simon Forsberg
1299-
Stephen Bullen
1300-
1301-
All contributors to our GitHub repository
1271+
<data name="AboutWindow_GeneralThanks" xml:space="preserve">
1272+
<value>All contributors to our GitHub repository
13021273
All our stargazers, likers &amp; followers, for the warm fuzzies
13031274
...and anyone reading this!</value>
13041275
</data>
@@ -1425,4 +1396,28 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
14251396
<data name="ParserState_Resolving" xml:space="preserve">
14261397
<value>Resolving...</value>
14271398
</data>
1399+
<data name="AboutWindow_BlogsHeader" xml:space="preserve">
1400+
<value>Blogs:</value>
1401+
</data>
1402+
<data name="AboutWindow_CommunityHeader" xml:space="preserve">
1403+
<value>Community:</value>
1404+
</data>
1405+
<data name="AboutWindow_ContributorsHeader" xml:space="preserve">
1406+
<value>Contributors &amp; supporters:</value>
1407+
</data>
1408+
<data name="SourceControl_MergeStatus" xml:space="preserve">
1409+
<value>Merge status</value>
1410+
</data>
1411+
<data name="SourceControl_UpdateSettingsMessage" xml:space="preserve">
1412+
<value>Your user name, email address, and default repository location have been saved.</value>
1413+
</data>
1414+
<data name="SourceControl_UpdateSettingsTitle" xml:space="preserve">
1415+
<value>Settings updated</value>
1416+
</data>
1417+
<data name="SourceControl_NoBranchesMessage" xml:space="preserve">
1418+
<value>Repository does not contain any branches.</value>
1419+
</data>
1420+
<data name="SourceControl_NoBranchesTitle" xml:space="preserve">
1421+
<value>No branches found</value>
1422+
</data>
14281423
</root>

0 commit comments

Comments
 (0)