From 24c370b738e8a0fe60a7f0f8cbe7dcafd2c30128 Mon Sep 17 00:00:00 2001 From: Markus Hofknecht Date: Mon, 23 Mar 2020 12:38:23 +0100 Subject: [PATCH] [Feature] CodeBuity&Refactor #49, [Feature] Code review tool #10 --- Controls/AppContextMenu.cs | 10 +++++----- Controls/Menu.cs | 8 ++++---- Controls/RowData.cs | 4 ++-- Handler/KeyboardInput.cs | 4 ++-- Helper/AppRestart.cs | 4 ++-- Helper/DataGridViewExtensions.cs | 6 +++--- Helper/File/FileIni.cs | 3 +-- Helper/File/FileUrl.cs | 6 +++--- Helper/File/IconReader.cs | 4 ++-- Helper/Scaling.cs | 2 +- Helper/ShellContextMenu.cs | 2 +- Helper/WindowsExplorerSort.cs | 3 +-- 12 files changed, 27 insertions(+), 29 deletions(-) diff --git a/Controls/AppContextMenu.cs b/Controls/AppContextMenu.cs index d8a7ec6..36113ae 100644 --- a/Controls/AppContextMenu.cs +++ b/Controls/AppContextMenu.cs @@ -212,7 +212,7 @@ namespace SystemTrayMenu.Controls public IEnumerable GetCultureList( CultureTypes cultureType = CultureTypes.SpecificCultures) { - var cultureList = CultureInfo.GetCultures(cultureType).ToList(); + List cultureList = CultureInfo.GetCultures(cultureType).ToList(); cultureList.Sort((p1, p2) => string.Compare( p1.NativeName, p2.NativeName, true)); return cultureList; @@ -234,12 +234,12 @@ namespace SystemTrayMenu.Controls } public static Bitmap ResizeImage(Image image, int width, int height) { - var destRect = new Rectangle(0, 0, width, height); - var destImage = new Bitmap(width, height); + Rectangle destRect = new Rectangle(0, 0, width, height); + Bitmap destImage = new Bitmap(width, height); destImage.SetResolution(image.HorizontalResolution, image.VerticalResolution); - using (var graphics = Graphics.FromImage(destImage)) + using (Graphics graphics = Graphics.FromImage(destImage)) { graphics.CompositingMode = CompositingMode.SourceCopy; graphics.CompositingQuality = CompositingQuality.HighQuality; @@ -247,7 +247,7 @@ namespace SystemTrayMenu.Controls graphics.SmoothingMode = SmoothingMode.HighQuality; graphics.PixelOffsetMode = PixelOffsetMode.HighQuality; - using (var wrapMode = new ImageAttributes()) + using (ImageAttributes wrapMode = new ImageAttributes()) { wrapMode.SetWrapMode(WrapMode.TileFlipXY); graphics.DrawImage(image, destRect, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel, wrapMode); diff --git a/Controls/Menu.cs b/Controls/Menu.cs index 967722d..47aade1 100644 --- a/Controls/Menu.cs +++ b/Controls/Menu.cs @@ -168,7 +168,7 @@ namespace SystemTrayMenu { DataGridViewElementStates states = DataGridViewElementStates.None; dgv.AutoResizeRows(); - int height = (int)(dgv.Rows.GetRowsHeight(states)); + int height = dgv.Rows.GetRowsHeight(states); int heightMax = screen.Bounds.Height - new Taskbar().Size.Height - labelTitle.Height; @@ -209,7 +209,7 @@ namespace SystemTrayMenu DataGridView dgv = menuPredecessor.GetDataGridView(); if (dgv.Rows.Count > trigger.RowIndex) { - var cellRectangle = dgv.GetCellDisplayRectangle( + Rectangle cellRectangle = dgv.GetCellDisplayRectangle( 0, trigger.RowIndex, false); int y = menuPredecessor.Location.Y + menuPredecessor.dgv.Location.Y + @@ -229,7 +229,7 @@ namespace SystemTrayMenu DataGridViewExtensions.FastAutoSizeColumns(dgv); bool scrollbarShown = false; - foreach (var scroll in dgv.Controls.OfType()) + foreach (VScrollBar scroll in dgv.Controls.OfType()) { if (scroll.Visible) { @@ -312,7 +312,7 @@ namespace SystemTrayMenu { get { - var Params = base.CreateParams; + CreateParams Params = base.CreateParams; Params.ExStyle |= 0x80; return Params; } diff --git a/Controls/RowData.cs b/Controls/RowData.cs index 9bf8262..66f6ad0 100644 --- a/Controls/RowData.cs +++ b/Controls/RowData.cs @@ -77,7 +77,7 @@ namespace SystemTrayMenu.Controls else { IWshShell shell = new WshShell(); - var lnk = shell.CreateShortcut(TargetFilePath) + IWshShortcut lnk = shell.CreateShortcut(TargetFilePath) as IWshShortcut; Arguments = lnk.Arguments; WorkingDirectory = lnk.WorkingDirectory; @@ -156,7 +156,7 @@ namespace SystemTrayMenu.Controls private bool SetSln() { bool handled = false; - var executable = new StringBuilder(1024); + StringBuilder executable = new StringBuilder(1024); try { _ = FindExecutable(TargetFilePath, string.Empty, executable); diff --git a/Handler/KeyboardInput.cs b/Handler/KeyboardInput.cs index 9d313c4..35cf39a 100644 --- a/Handler/KeyboardInput.cs +++ b/Handler/KeyboardInput.cs @@ -46,8 +46,8 @@ namespace SystemTrayMenu.Handler { if (!string.IsNullOrEmpty(Properties.Settings.Default.HotKey)) { - var cvt = new KeysConverter(); - var key = (Keys)cvt.ConvertFrom( + KeysConverter cvt = new KeysConverter(); + Keys key = (Keys)cvt.ConvertFrom( Properties.Settings.Default.HotKey); try { diff --git a/Helper/AppRestart.cs b/Helper/AppRestart.cs index 0f37706..8f5f97b 100644 --- a/Helper/AppRestart.cs +++ b/Helper/AppRestart.cs @@ -21,8 +21,8 @@ namespace SystemTrayMenu.Helper [MethodImpl(MethodImplOptions.NoInlining)] private static string GetCurrentMethod() { - var st = new StackTrace(); - var sf = st.GetFrame(1); + StackTrace st = new StackTrace(); + StackFrame sf = st.GetFrame(1); return sf.GetMethod().Name; } diff --git a/Helper/DataGridViewExtensions.cs b/Helper/DataGridViewExtensions.cs index c83f637..1131493 100644 --- a/Helper/DataGridViewExtensions.cs +++ b/Helper/DataGridViewExtensions.cs @@ -8,16 +8,16 @@ namespace SystemTrayMenu.Helper { public static void FastAutoSizeColumns(this DataGridView dgv) { - var rows = dgv.Rows + System.Collections.Generic.IEnumerable rows = dgv.Rows .Cast(); - using (var gfx = dgv.CreateGraphics()) + using (System.Drawing.Graphics gfx = dgv.CreateGraphics()) { int i = 1; gfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias; float widthMax = dgv.Columns[i].HeaderCell.Size.Width; foreach (DataGridViewRow row in rows) { - var checkWidth = gfx.MeasureString( + float checkWidth = gfx.MeasureString( row.Cells[i].Value.ToString() + "_", dgv.RowTemplate.DefaultCellStyle.Font).Width; if (checkWidth > widthMax) diff --git a/Helper/File/FileIni.cs b/Helper/File/FileIni.cs index 632cf62..94a9ad9 100644 --- a/Helper/File/FileIni.cs +++ b/Helper/File/FileIni.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Helper/File/FileUrl.cs b/Helper/File/FileUrl.cs index b9e84b8..d3d5a32 100644 --- a/Helper/File/FileUrl.cs +++ b/Helper/File/FileUrl.cs @@ -22,7 +22,7 @@ namespace SystemTrayMenu.Helper if (userChoiceKey == null) { //Read default browser path from Win XP registry key - var browserKey = Registry.ClassesRoot.OpenSubKey(@"HTTP\shell\open\command", false); + RegistryKey browserKey = Registry.ClassesRoot.OpenSubKey(@"HTTP\shell\open\command", false); //If browser path wasn’t found, try Win Vista (and newer) registry key if (browserKey == null) @@ -31,7 +31,7 @@ namespace SystemTrayMenu.Helper Registry.CurrentUser.OpenSubKey( urlAssociation, false); } - var path = CleanifyBrowserPath(browserKey.GetValue(null) as string); + string path = CleanifyBrowserPath(browserKey.GetValue(null) as string); browserKey.Close(); return path; } @@ -43,7 +43,7 @@ namespace SystemTrayMenu.Helper // now look up the path of the executable string concreteBrowserKey = browserPathKey.Replace("$BROWSER$", progId); - var kp = Registry.ClassesRoot.OpenSubKey(concreteBrowserKey, false); + RegistryKey kp = Registry.ClassesRoot.OpenSubKey(concreteBrowserKey, false); browserPath = CleanifyBrowserPath(kp.GetValue(null) as string); kp.Close(); } diff --git a/Helper/File/IconReader.cs b/Helper/File/IconReader.cs index 2bebda5..fadff68 100644 --- a/Helper/File/IconReader.cs +++ b/Helper/File/IconReader.cs @@ -214,8 +214,8 @@ namespace SystemTrayMenu.Helper public static Icon AddIconOverlay(Icon originalIcon, Icon overlay) { - var target = new Bitmap(originalIcon.Width, originalIcon.Height, PixelFormat.Format32bppArgb); - var graphics = Graphics.FromImage(target); + Bitmap target = new Bitmap(originalIcon.Width, originalIcon.Height, PixelFormat.Format32bppArgb); + Graphics graphics = Graphics.FromImage(target); graphics.DrawIcon(originalIcon, 0, 0); graphics.DrawIcon(overlay, 0, 0); target.MakeTransparent(target.GetPixel(1, 1)); diff --git a/Helper/Scaling.cs b/Helper/Scaling.cs index f83a3ba..afed89f 100644 --- a/Helper/Scaling.cs +++ b/Helper/Scaling.cs @@ -31,7 +31,7 @@ namespace SystemTrayMenu.Helper int LogicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.VERTRES); int PhysicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.DESKTOPVERTRES); - Factor = (float)PhysicalScreenHeight / (float)LogicalScreenHeight; // 1.25 = 125% + Factor = PhysicalScreenHeight / (float)LogicalScreenHeight; // 1.25 = 125% } diff --git a/Helper/ShellContextMenu.cs b/Helper/ShellContextMenu.cs index fb041b4..bfdd994 100644 --- a/Helper/ShellContextMenu.cs +++ b/Helper/ShellContextMenu.cs @@ -1578,7 +1578,7 @@ namespace SystemTrayMenu.Helper m_filterFunc, IntPtr.Zero, #pragma warning disable CS0618 // depricated - (int)AppDomain.GetCurrentThreadId()); + AppDomain.GetCurrentThreadId()); #pragma warning restore CS0618 // depricated } // ************************************************************************ diff --git a/Helper/WindowsExplorerSort.cs b/Helper/WindowsExplorerSort.cs index bcbf113..ab6c1f5 100644 --- a/Helper/WindowsExplorerSort.cs +++ b/Helper/WindowsExplorerSort.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Runtime.InteropServices; namespace SystemTrayMenu.Helper