Skip to content

Commit 275ba27

Browse files
retailcoderretailcoder
committed
closes #1785; fixes #2612; ref. #2087 
1 parent 425891d commit 275ba27

11 files changed

+69
-53
lines changed

‎RetailCoder.VBE/App.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using System.Windows.Forms;
1616
using Rubberduck.UI.Command.MenuItems.CommandBars;
1717
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
18+
using Rubberduck.VersionCheck;
1819

1920
namespace Rubberduck
2021
{
@@ -28,6 +29,7 @@ public sealed class App : IDisposable
2829
private readonly IAppMenu _appMenus;
2930
private readonly RubberduckCommandBar _stateBar;
3031
private readonly IRubberduckHooks _hooks;
32+
private readonly IVersionCheck _version;
3133

3234
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
3335

@@ -39,7 +41,8 @@ public App(IVBE vbe,
3941
IGeneralConfigService configService,
4042
IAppMenu appMenus,
4143
RubberduckCommandBar stateBar,
42-
IRubberduckHooks hooks)
44+
IRubberduckHooks hooks,
45+
IVersionCheck version)
4346
{
4447
_vbe = vbe;
4548
_messageBox = messageBox;
@@ -49,6 +52,7 @@ public App(IVBE vbe,
4952
_appMenus = appMenus;
5053
_stateBar = stateBar;
5154
_hooks = hooks;
55+
_version = version;
5256

5357
_hooks.MessageReceived += _hooks_MessageReceived;
5458
_configService.SettingsChanged += _configService_SettingsChanged;
@@ -229,8 +233,8 @@ private void CheckForLegacyIndenterSettings()
229233

230234
private void LogRubberduckSart()
231235
{
232-
var version = GetType().Assembly.GetName().Version.ToString();
233-
GlobalDiagnosticsContext.Set("RubberduckVersion", version);
236+
var version = _version.CurrentVersion;
237+
GlobalDiagnosticsContext.Set("RubberduckVersion", version.ToString());
234238
var headers = new List<string>
235239
{
236240
string.Format("Rubberduck version {0} loading:", version),

‎RetailCoder.VBE/Extension.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ private void InitializeAddIn()
172172
{
173173
splash = new Splash
174174
{
175+
// note: IVersionCheck.CurrentVersion could return this string.
175176
Version = string.Format("version {0}", Assembly.GetExecutingAssembly().GetName().Version)
176177
};
177178
splash.Show();

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

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,11 @@
6565
FontWeight="SemiBold"
6666
FontSize="10" />
6767
<TextBlock FontSize="10"
68-
xml:space="preserve">Code Review Stack Exchange
69-
JetBrains ReSharper Community Team
68+
xml:space="preserve">JetBrains ReSharper Community Team
69+
Code Review Stack Exchange
7070
Stack Overflow
7171
</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-
72+
8173
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_ContributorsHeader}"
8274
FontWeight="SemiBold"
8375
FontSize="10" />
@@ -86,7 +78,7 @@ Knjname developer blog (clockahead.blogspot.jp)
8678
Andrew Jackson
8779
Andrin Meier
8880
Bruno Costa
89-
Carlos J. Quintero (MZ-Tools articles &amp; help with VBE API)
81+
Carlos J. Quintero (MZ-Tools)
9082
@Comintern
9183
@daFreeMan
9284
@Duga SE chat bot
@@ -95,13 +87,14 @@ Frank Van Heeswijk
9587
Gareth Leachman
9688
@Heslacher
9789
Jeroen Vannevel
90+
Michal Krzych (vba4all.com)
9891
@mjolka
9992
Philip Wales
100-
Rob Bovey
93+
Rob Bovey (Smart Indenter)
10194
Ross McLean
10295
Ross Knudsen
10396
Simon Forsberg
104-
Stephen Bullen
97+
Stephen Bullen (Smart Indenter)
10598
</TextBlock>
10699

107100
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_GeneralThanks}"

‎RetailCoder.VBE/UI/About/AboutControlViewModel.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,24 @@
33
using System.Reflection;
44
using NLog;
55
using Rubberduck.UI.Command;
6+
using Rubberduck.VersionCheck;
67

78
namespace Rubberduck.UI.About
89
{
910
public class AboutControlViewModel
1011
{
12+
private readonly IVersionCheck _version;
13+
14+
public AboutControlViewModel(IVersionCheck version)
15+
{
16+
_version = version;
17+
}
18+
1119
public string Version
1220
{
1321
get
1422
{
15-
var name = Assembly.GetExecutingAssembly().GetName();
16-
return string.Format(RubberduckUI.Rubberduck_AboutBuild, name.Version, name.ProcessorArchitecture);
23+
return string.Format(RubberduckUI.Rubberduck_AboutBuild, _version.CurrentVersion);
1724
}
1825
}
1926

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

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

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ public AboutDialog()
88
{
99
InitializeComponent();
1010

11-
ViewModel = new AboutControlViewModel();
11+
// todo: inject these dependencies?
12+
ViewModel = new AboutControlViewModel(new VersionCheck.VersionCheck());
1213
}
1314

1415
private AboutControlViewModel _viewModel;
@@ -22,10 +23,6 @@ private AboutControlViewModel ViewModel
2223
}
2324
}
2425

25-
private void AboutDialog_Load(object sender, System.EventArgs e)
26-
{
27-
28-
}
2926
protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
3027
{
3128
if (keyData == Keys.Escape)

‎RetailCoder.VBE/UI/About/AboutDialog.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,4 @@
139139
AAAABwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAAAAAQAAACMAAAA/AAAAP4DAAD+BwAA
140140
</value>
141141
</data>
142-
</root>
142+
</root>

‎RetailCoder.VBE/UI/RubberduckUI.Designer.cs

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

‎RetailCoder.VBE/UI/RubberduckUI.de.resx

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,7 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
371371
<value>Konnte das Rubberduck Add-In nicht laden</value>
372372
</data>
373373
<data name="Rubberduck_AboutBuild" xml:space="preserve">
374-
<value>Build {0} ({1})</value>
375-
<comment>0: Version; 1: Architektur</comment>
374+
<value>Version</value>
376375
</data>
377376
<data name="TodoMarkerBug" xml:space="preserve">
378377
<value>BUG</value>
@@ -1051,7 +1050,7 @@ Wollen Sie trotzdem fortfahren?</value>
10511050
<value>Über Rubberduck</value>
10521051
</data>
10531052
<data name="AboutWindow_Copyright" xml:space="preserve">
1054-
<value>© Copyright 2014-2016 Mathieu Guindon &amp; Christopher McClellan</value>
1053+
<value>© Copyright 2014-2017 Mathieu Guindon &amp; Christopher McClellan</value>
10551054
</data>
10561055
<data name="AboutWindow_SpecialThanksLabel" xml:space="preserve">
10571056
<value>Spezieller Dank</value>
@@ -1824,43 +1823,43 @@ End Sub</value>
18241823
<data name="ContextReferences" xml:space="preserve">
18251824
<value>Referenzen</value>
18261825
</data>
1827-
<data name="DialogCaption_SaveInspectionSettings">
1826+
<data name="DialogCaption_SaveInspectionSettings" xml:space="preserve">
18281827
<value>Einstellungen für Inspektionen speichern</value>
18291828
</data>
1830-
<data name="DialogCaption_SaveToDoSettings">
1829+
<data name="DialogCaption_SaveToDoSettings" xml:space="preserve">
18311830
<value>Einstellungen für Todo-Liste speichern</value>
18321831
</data>
1833-
<data name="DialogMask_XmlFilesOnly">
1832+
<data name="DialogMask_XmlFilesOnly" xml:space="preserve">
18341833
<value>XML Datei (.xml)|*.xml|Rubberduck config file|*.config</value>
18351834
</data>
1836-
<data name="DialogCaption_SaveGeneralSettings">
1835+
<data name="DialogCaption_SaveGeneralSettings" xml:space="preserve">
18371836
<value>Allgemeine Einstellungen speichern</value>
18381837
</data>
1839-
<data name="DialogCaption_LoadToDoSettings">
1838+
<data name="DialogCaption_LoadToDoSettings" xml:space="preserve">
18401839
<value>Einstellungen für Todo-Liste Laden</value>
18411840
</data>
1842-
<data name="DialogCaption_SaveUnitTestSettings">
1841+
<data name="DialogCaption_SaveUnitTestSettings" xml:space="preserve">
18431842
<value>Einstellungen für Unit-Tests speichern</value>
18441843
</data>
1845-
<data name="DialogCaption_LoadUnitTestSettings">
1844+
<data name="DialogCaption_LoadUnitTestSettings" xml:space="preserve">
18461845
<value>Einstellungen für Unit-Tests laden</value>
18471846
</data>
1848-
<data name="DialogCaption_LoadInspectionSettings">
1847+
<data name="DialogCaption_LoadInspectionSettings" xml:space="preserve">
18491848
<value>Einstellungen für Inspektionen laden</value>
18501849
</data>
1851-
<data name="SettingsCaption_ExportSettings">
1850+
<data name="SettingsCaption_ExportSettings" xml:space="preserve">
18521851
<value>Export</value>
18531852
</data>
1854-
<data name="DialogCaption_SaveIndenterSettings">
1853+
<data name="DialogCaption_SaveIndenterSettings" xml:space="preserve">
18551854
<value>Einstellungen für Einrückung speichern</value>
18561855
</data>
1857-
<data name="DialogCaption_LoadIndenterSettings">
1856+
<data name="DialogCaption_LoadIndenterSettings" xml:space="preserve">
18581857
<value>Einstellungen für Einrückung laden</value>
18591858
</data>
1860-
<data name="DialogCaption_LoadGeneralSettings">
1859+
<data name="DialogCaption_LoadGeneralSettings" xml:space="preserve">
18611860
<value>Allgemeine Einstellungen Laden</value>
18621861
</data>
1863-
<data name="SettingsCaption_ImportSettings">
1862+
<data name="SettingsCaption_ImportSettings" xml:space="preserve">
18641863
<value>Import</value>
18651864
</data>
1866-
</root>
1865+
</root>

‎RetailCoder.VBE/UI/RubberduckUI.fr.resx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,7 @@ Attention: les valeurs personnalisées seront perdues. Le fichier original se
375375
<value>Une erreur est survenue lors du chargement du complément Rubberduck.</value>
376376
</data>
377377
<data name="Rubberduck_AboutBuild" xml:space="preserve">
378-
<value>Version {0} ({1})</value>
379-
<comment>0: Version; 1: ProcessorArchitecture</comment>
378+
<value>Version {0}</value>
380379
</data>
381380
<data name="TodoMarkerBug" xml:space="preserve">
382381
<value>BUG </value>
@@ -1309,7 +1308,7 @@ Icônes "Fugue" par Yusuke Kamiyamane</value>
13091308
<value>Clé invalide</value>
13101309
</data>
13111310
<data name="AboutWindow_Copyright" xml:space="preserve">
1312-
<value>© Copyright 2014-2016 Mathieu Guindon &amp; Christopher McClellan</value>
1311+
<value>© Copyright 2014-2017 Mathieu Guindon &amp; Christopher McClellan</value>
13131312
</data>
13141313
<data name="UnitTest_NewModule_RunOnce" xml:space="preserve">
13151314
<value>cette procédure s'exécute une seule fois par module</value>

0 commit comments

Comments
 (0)