diff --git a/Business/Menus.cs b/Business/Menus.cs index 1958f51..946c054 100644 --- a/Business/Menus.cs +++ b/Business/Menus.cs @@ -8,12 +8,12 @@ namespace SystemTrayMenu.Business using System.Collections.Generic; using System.ComponentModel; using System.Data; - using System.Diagnostics; using System.Drawing; using System.IO; using System.Linq; using System.Windows.Forms; using SystemTrayMenu.DataClasses; + using SystemTrayMenu.DllImports; using SystemTrayMenu.Handler; using SystemTrayMenu.Helper; using SystemTrayMenu.UserInterface; @@ -26,7 +26,6 @@ namespace SystemTrayMenu.Business private readonly Menu[] menus = new Menu[MenuDefines.MenusMax]; private readonly BackgroundWorker workerMainMenu = new(); private readonly List workersSubMenu = new(); - private readonly DgvMouseRow dgvMouseRow = new(); private readonly WaitToLoadMenu waitToOpenMenu = new(); private readonly KeyboardInput keyboardInput; @@ -88,7 +87,7 @@ namespace SystemTrayMenu.Business if (IconReader.MainPreload) { workerMainMenu.DoWork -= LoadMenu; - menus[0] = Create(menuData, Path.GetFileName(Config.Path)); + menus[0] = Create(menuData, new DirectoryInfo(Config.Path).Name); menus[0].HandleCreated += (s, e) => ExecuteWatcherHistory(); Scaling.CalculateFactorByDpi(menus[0].GetDataGridView().CreateGraphics()); IconReader.MainPreload = false; @@ -153,7 +152,7 @@ namespace SystemTrayMenu.Business Validity = MenuDataValidity.Valid, }; - Menu menuLoading = Create(menuDataLoading, Path.GetFileName(rowData.Path)); + Menu menuLoading = Create(menuDataLoading, new DirectoryInfo(rowData.Path).Name); menuLoading.IsLoadingMenu = true; AdjustMenusSizeAndLocation(); menus[rowData.Level + 1] = menuLoading; @@ -649,7 +648,7 @@ namespace SystemTrayMenu.Business string path = Config.Path; if (title == null) { - title = Path.GetFileName(menuData.RowDataParent.ResolvedPath); + title = new DirectoryInfo(menuData.RowDataParent.ResolvedPath).Name; path = menuData.RowDataParent.ResolvedPath; } diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 657790f..3606ce1 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -39,5 +39,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.0.15")] -[assembly: AssemblyFileVersion("1.3.0.15")] +[assembly: AssemblyVersion("1.3.0.16")] +[assembly: AssemblyFileVersion("1.3.0.16")] diff --git a/README.md b/README.md index c7c89d8..8fdadfe 100644 --- a/README.md +++ b/README.md @@ -283,7 +283,7 @@ Thanks for ideas, reporting issues and contributing! #376 Michelle H., #377 [SoenkeHob](https://github.com/SoenkeHob), #380 #394 [TransLucida](https://github.com/TransLucida), -#384 [boydfields](https://github.com/boydfields), +#384 #434 #435 [boydfields](https://github.com/boydfields), #386 [visusys](https://github.com/visusys), #387 #411 [yrctw](https://github.com/yrctw) diff --git a/UserInterface/AppContextMenu.cs b/UserInterface/AppContextMenu.cs index a8c6a44..1548ee5 100644 --- a/UserInterface/AppContextMenu.cs +++ b/UserInterface/AppContextMenu.cs @@ -91,7 +91,7 @@ namespace SystemTrayMenu.Helper aboutBox.AppMoreInfo += "#277 Jan S., #282 akuznets, #283 #284 #289 RuSieg, #285 #286 dao-net, #288 William P., #294 #295 #296 Stefan Mahrer, "; aboutBox.AppMoreInfo += "#225 #297 #299 #317 #321 #324 #330 #386 #390 #401 #402 #407 #409 #414 #416 #418 #428 #430 chip33, "; aboutBox.AppMoreInfo += "#298 phanirithvij, #306 wini2, #370 dna5589, #372 not-nef, #376 Michelle H., "; - aboutBox.AppMoreInfo += "#377 SoenkeHob, #380 #394 TransLucida, #384 boydfields, #386 visusys, #387 #411 yrctw" + Environment.NewLine; + aboutBox.AppMoreInfo += "#377 SoenkeHob, #380 #394 TransLucida, #384 #434 #435 boydfields, #386 visusys, #387 #411 yrctw" + Environment.NewLine; aboutBox.AppMoreInfo += @" Sponsors - Thank you! ------------------