From a60d2b62bdec47617abf17c740a7f6926db3940d Mon Sep 17 00:00:00 2001 From: IvenBach Date: Tue, 7 Nov 2017 21:45:51 -0800 Subject: [PATCH] ExceL.EXE -> EXCEL.EXE for about box --- RetailCoder.VBE/App.cs | 18 +++------------- RetailCoder.VBE/UI/About/AboutControl.xaml.cs | 21 +++++-------------- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/RetailCoder.VBE/App.cs b/RetailCoder.VBE/App.cs index 28c7e2883c..923f62c023 100644 --- a/RetailCoder.VBE/App.cs +++ b/RetailCoder.VBE/App.cs @@ -193,24 +193,12 @@ public void LogRubberduckStart() var headers = new List { $"\r\n\tRubberduck version {version} loading:", - $"\tOperating System: {Environment.OSVersion.VersionString} {GetBitness(Environment.Is64BitOperatingSystem)}", - $"\tHost Product: {Application.ProductName} {GetBitness(Environment.Is64BitProcess)}", + $"\tOperating System: {Environment.OSVersion.VersionString} {(Environment.Is64BitOperatingSystem ? "x64" : "x86")}", + $"\tHost Product: {Application.ProductName} {(Environment.Is64BitProcess ? "x64" : "x86")}", $"\tHost Version: {Application.ProductVersion}", - $"\tHost Executable: {Path.GetFileName(Application.ExecutablePath)}", + $"\tHost Executable: {Path.GetFileName(Application.ExecutablePath).ToUpper()}", // .ToUpper() used to convert ExceL.EXE -> EXCEL.EXE }; LogLevelHelper.SetDebugInfo(string.Join(Environment.NewLine, headers)); - - string GetBitness(bool is64Bit) - { - if (is64Bit) - { - return "x64"; - } - else - { - return "x86"; - } - } } private bool _disposed; diff --git a/RetailCoder.VBE/UI/About/AboutControl.xaml.cs b/RetailCoder.VBE/UI/About/AboutControl.xaml.cs index 97a9aec338..6052f6edf0 100644 --- a/RetailCoder.VBE/UI/About/AboutControl.xaml.cs +++ b/RetailCoder.VBE/UI/About/AboutControl.xaml.cs @@ -1,6 +1,7 @@ using System.Windows; using System.Windows.Input; using System; +using System.IO; using Application = System.Windows.Forms.Application; namespace Rubberduck.UI.About @@ -31,27 +32,15 @@ private void CopyVersionInfo_MouseLeftButtonDown(object sender, MouseButtonEvent private void CopyVersionInfoToClipboard() { - System.Text.StringBuilder sb = new System.Text.StringBuilder(); + var sb = new System.Text.StringBuilder(); sb.AppendLine($"Rubberduck version: {this.Version.Text}"); - sb.AppendLine($"Operating System: {Environment.OSVersion.VersionString}, {GetBitness(Environment.Is64BitOperatingSystem)}"); - sb.AppendLine($"Host Product: {Application.ProductName} {GetBitness(Environment.Is64BitProcess)}"); + sb.AppendLine($"Operating System: {Environment.OSVersion.VersionString}, {(Environment.Is64BitOperatingSystem ? "x64" : "x86")}"); + sb.AppendLine($"Host Product: {Application.ProductName} {(Environment.Is64BitProcess ? "x64" : "x86")}"); sb.AppendLine($"Host Version: {Application.ProductVersion}"); - sb.AppendFormat($"Host Executable: {System.IO.Path.GetFileName(Application.ExecutablePath)}"); + sb.AppendFormat($"Host Executable: {Path.GetFileName(Application.ExecutablePath).ToUpper()}"); // .ToUpper() used to convert ExceL.EXE -> EXCEL.EXE Clipboard.SetText(sb.ToString()); System.Windows.MessageBox.Show("Version information copied to clipboard.", "Copy successfull"); - - string GetBitness(bool is64Bit) - { - if (is64Bit) - { - return "x64"; - } - else - { - return "x86"; - } - } } } }