From b28aff5e1af6871169c0ba49bcf9952e8bee8d5b Mon Sep 17 00:00:00 2001 From: Schwirg László Date: Fri, 16 Jun 2023 17:07:24 +0200 Subject: [PATCH] v1.19.1.0 --- Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - ColorConsole.cs | 9 ++++----- Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - Menu.cs | 19 ++----------------- Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - ColorConsole.cs b/Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - ColorConsole.cs index 5ddf79f..799a0ab 100644 --- a/Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - ColorConsole.cs +++ b/Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - ColorConsole.cs @@ -153,12 +153,11 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ColorConsoleNS } else { - if (validitylist != null && validitylist.Any()) { prompt += $" Valid values are {'\''+string.Join("','", validitylist)+'\''}."; } - if (defaultvalue != null) { prompt += $" Default value is '{defaultvalue}'."; } - if (exitvalue != null) { prompt += $" Enter '{exitvalue}' to exit."; } + if (validitylist != null && validitylist.Any()) { prompt += $"Valid values: {'\''+string.Join("','", validitylist)+'\''}. "; } + if (defaultvalue != null) { prompt += $"Default value: '{defaultvalue}'. "; } + if (exitvalue != null) { prompt += $"Enter '{exitvalue}' to exit. "; } - Write(text, f, b, bracket, prefix, suffix); - if (!string.IsNullOrWhiteSpace(text+bracket+prefix+suffix)) WriteLine(); + Write(text, f, b, bracket, prefix, suffix); if (!string.IsNullOrWhiteSpace(text+bracket+prefix+suffix)) WriteLine(); if (prompt != null) { WriteLine(prompt); } Write("-->"); input = Console.ReadLine(); if (defaultvalue!=null && (input == null || input == "")) { input = defaultvalue; } diff --git a/Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - Menu.cs b/Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - Menu.cs index 1cb1ddd..9a741c6 100644 --- a/Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - Menu.cs +++ b/Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - Menu.cs @@ -348,31 +348,16 @@ namespace Vrh.Log4Pro.MaintenanceConsole.MenuNS } else { - ColorConsole.Write(SelectionPrompt, ConsoleColor.Yellow); - ColorConsole.Write(" --> ", ConsoleColor.White); - var remembercursorleft = ColorConsole.CursorLeft; - var remembercursortop = ColorConsole.CursorTop; + ColorConsole.WriteLine(SelectionPrompt, ConsoleColor.Yellow); if (NumOfMenuItems==0) { - ColorConsole.WriteLine(); ColorConsole.WriteLine("No items in menu!"); selectionliststr = "EX"; } else { - if (selectionMode == SelectionMode.Multi) - { - ColorConsole.WriteLine(); - ColorConsole.WriteLine("Multiple selections are separated with comma(,), enter asterisk(*) to select all!"); - } - var remembercursorleft2 = ColorConsole.CursorLeft; - var remembercursortop2 = ColorConsole.CursorTop; - ColorConsole.SetCursorPosition(remembercursorleft, remembercursortop); + if (selectionMode == SelectionMode.Multi) { ColorConsole.WriteLine("Multiple selections are separated with comma(,), enter asterisk(*) to select all!"); } selectionliststr = ColorConsole.ReadLine().ToUpper(); - if (selectionMode == SelectionMode.Multi) - { - ColorConsole.SetCursorPosition(remembercursorleft2, remembercursortop2); - } } } if (selectionliststr == "EX") diff --git a/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs b/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs index c227e7e..cbfc753 100644 --- a/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs +++ b/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs @@ -32,5 +32,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.19.0.0")] -[assembly: AssemblyFileVersion("1.19.0.0")] +[assembly: AssemblyVersion("1.19.1.0")] +[assembly: AssemblyFileVersion("1.19.1.0")] -- libgit2 0.21.2