Improve UI design and semantics

Author: Decimation

SmartImage 3/Modes/GuiMode.cs

@@ -115,7 +115,7 @@ public sealed class GuiMode : BaseProgramMode
 		X           = Pos.Right(Btn_Restart),
 		Y           = Pos.Y(Btn_Restart),
 		Enabled     = false,
-		ColorScheme = Styles.Cs_Btn2,
+		ColorScheme = Styles.Cs_Btn1,
 
 	};
 
@@ -265,8 +265,9 @@ public GuiMode(string[] args) : base(args, SearchQuery.Null)
 			ColumnStyles = columnStyles,
 		};
 
-		Tv_Results.Border = Styles.Br_1;
-		Tv_Results.Table  = Dt_Results;
+		Tv_Results.Border  = Styles.Br_1;
+		Tv_Results.Table   = Dt_Results;
+		Tv_Results.Visible = false;
 
 		Tv_Results.CellActivated += OnCellActivated;
 		Btn_Run.Clicked          += OnRun;
@@ -313,12 +314,16 @@ public GuiMode(string[] args) : base(args, SearchQuery.Null)
 	public override void PreSearch(object? sender)
 	{
 		Tf_Input.SetFocus();
+		Tv_Results.Visible = true;
+
 	}
 
 	public override void PostSearch(object? sender, List<SearchResult> results1)
 	{
+
 		if (Client.IsComplete) {
-			Btn_Run.Enabled = false;
+			Btn_Run.Enabled    = false;
+			Btn_Cancel.Enabled = false;
 		}
 	}
 
@@ -681,6 +686,7 @@ private void OnRestart()
 
 		Status              = ProgramStatus.Restart;
 		Btn_Restart.Enabled = false;
+		Btn_Cancel.Enabled = false;
 		Btn_Run.Enabled     = true;
 
 		Token.Dispose();
@@ -755,7 +761,7 @@ private async void OnRun()
 
 		Debug.WriteLine($"{text}", nameof(OnRun));
 		var ok = await SetQuery(text);
-
+		Btn_Cancel.Enabled = ok;
 		if (!ok) {
 			return;
 		}

SmartImage 3/Program.cs

@@ -24,6 +24,7 @@
 using ConfigurationManager = System.Configuration.ConfigurationManager;
 using SmartImage.Modes;
 using SmartImage.UI;
+using Attribute = Terminal.Gui.Attribute;
 
 #pragma warning disable CS0168
 
@@ -56,7 +57,7 @@ public static void Init()
 	public static async Task Main(string[] args)
 	{
 		// Console.OutputEncoding = Encoding.Unicode;
-
+		
 		ConsoleUtil.SetConsoleMode();
 #if TEST
 		// args = new String[] { null };

SmartImage 3/UI/Styles.cs

@@ -9,55 +9,65 @@ internal static class Styles
 {
 	#region Attributes
 
-	internal static readonly Attribute Atr_Green_Black        = Attribute.Make(Color.Green, Color.Black);
-	internal static readonly Attribute Atr_Red_Black          = Attribute.Make(Color.Red, Color.Black);
-	internal static readonly Attribute Atr_BrightYellow_Black = Attribute.Make(Color.BrightYellow, Color.Black);
-	internal static readonly Attribute Atr_White_Black        = Attribute.Make(Color.White, Color.Black);
-	internal static readonly Attribute Atr_Cyan_Black         = Attribute.Make(Color.Cyan, Color.Black);
-	internal static readonly Attribute Atr_Cyan_White         = Attribute.Make(Color.Cyan, Color.White);
-	internal static readonly Attribute Atr_Blue_White         = Attribute.Make(Color.Blue, Color.White);
-	internal static readonly Attribute Atr_BrightRed_Black    = Attribute.Make(Color.BrightRed, Color.Black);
-	internal static readonly Attribute Atr_BrightGreen_Black  = Attribute.Make(Color.BrightGreen, Color.Black);
-	internal static readonly Attribute Atr_Black_White        = Attribute.Make(Color.Black, Color.White);
-	internal static readonly Attribute Atr_Gray_Black         = Attribute.Make(Color.Gray, Color.Black);
-	internal static readonly Attribute Atr_White_DarkGray     = Attribute.Make(Color.White, Color.DarkGray);
-	internal static readonly Attribute Atr_DarkGray_Black     = Attribute.Make(Color.DarkGray, Color.Black);
-	private static readonly  Attribute Atr_BrightBlue_Black   = Attribute.Make(Color.BrightBlue, Color.Black);
-	private static readonly  Attribute Atr_Blue_Black         = Attribute.Make(Color.Blue, Color.Black);
-	private static readonly  Attribute Atr_Brown_Black        = Attribute.Make(Color.Brown, Color.Black);
+	internal static readonly Attribute Atr_Green_Black         = Attribute.Make(Color.Green, Color.Black);
+	internal static readonly Attribute Atr_Red_Black           = Attribute.Make(Color.Red, Color.Black);
+	internal static readonly Attribute Atr_BrightYellow_Black  = Attribute.Make(Color.BrightYellow, Color.Black);
+	internal static readonly Attribute Atr_White_Black         = Attribute.Make(Color.White, Color.Black);
+	internal static readonly Attribute Atr_White_Blue          = Attribute.Make(Color.White, Color.Blue);
+	internal static readonly Attribute Atr_Cyan_Black          = Attribute.Make(Color.Cyan, Color.Black);
+	internal static readonly Attribute Atr_White_Cyan          = Attribute.Make(Color.White, Color.Cyan);
+	internal static readonly Attribute Atr_White_BrightCyan = Attribute.Make(Color.White, Color.BrightCyan);
+	internal static readonly Attribute Atr_BrightCyan_DarkGray = Attribute.Make(Color.BrightCyan, Color.DarkGray);
+	internal static readonly Attribute Atr_Cyan_White          = Attribute.Make(Color.Cyan, Color.White);
+	internal static readonly Attribute Atr_Blue_White          = Attribute.Make(Color.Blue, Color.White);
+	internal static readonly Attribute Atr_BrightBlue_White    = Attribute.Make(Color.BrightBlue, Color.White);
+	internal static readonly Attribute Atr_BrightBlue_Gray = Attribute.Make(Color.BrightBlue, Color.Gray);
+	internal static readonly Attribute Atr_BrightRed_Black     = Attribute.Make(Color.BrightRed, Color.Black);
+	internal static readonly Attribute Atr_BrightGreen_Black   = Attribute.Make(Color.BrightGreen, Color.Black);
+	internal static readonly Attribute Atr_Black_White         = Attribute.Make(Color.Black, Color.White);
+	internal static readonly Attribute Atr_Gray_Black          = Attribute.Make(Color.Gray, Color.Black);
+	internal static readonly Attribute Atr_DarkGray_Blue       = Attribute.Make(Color.DarkGray, Color.Blue);
+	internal static readonly Attribute Atr_White_DarkGray      = Attribute.Make(Color.White, Color.DarkGray);
+	internal static readonly Attribute Atr_DarkGray_Black      = Attribute.Make(Color.DarkGray, Color.Black);
+	private static readonly  Attribute Atr_BrightBlue_Black    = Attribute.Make(Color.BrightBlue, Color.Black);
+	private static readonly  Attribute Atr_Blue_Black          = Attribute.Make(Color.Blue, Color.Black);
+	private static readonly  Attribute Atr_Brown_Black         = Attribute.Make(Color.Brown, Color.Black);
+	private static readonly  Attribute Atr_DarkGray_White      = Attribute.Make(Color.DarkGray, Color.White);
 
 	#endregion
 
 	#region Color schemes
 
 	internal static readonly ColorScheme Cs_Btn1x = new()
 	{
-		Normal    = Atr_Cyan_Black,
-		Focus     = Atr_BrightGreen_Black,
-		Disabled  = Atr_BrightYellow_Black,
-		HotNormal = Atr_Cyan_Black,
-		HotFocus  = Atr_BrightGreen_Black
+		Normal    = Atr_White_Cyan,
+		Disabled  = Atr_DarkGray_Blue,
+		HotNormal = Atr_White_Cyan,
+		HotFocus  = Atr_White_BrightCyan,
+		Focus = Atr_White_BrightCyan,
 	};
 
 	internal static readonly ColorScheme Cs_Btn1 = new()
 	{
-		Normal    = Atr_BrightBlue_Black,
-		Disabled  = Atr_DarkGray_Black,
-		HotNormal = Atr_BrightBlue_Black,
-		HotFocus  = Atr_Blue_Black,
-		Focus     = Atr_Blue_Black
+		Normal    = Atr_Blue_White,
+		Disabled  = Atr_DarkGray_White,
+		HotNormal = Atr_Blue_White,
+		HotFocus  = Atr_BrightBlue_Gray,
+		Focus     = Atr_BrightBlue_Gray
 	};
+
 	internal static readonly ColorScheme Cs_Btn2 = new()
 	{
-		Normal    = Atr_Brown_Black,
-		Disabled  = Atr_DarkGray_Black,
-		HotNormal = Atr_Brown_Black,
-		HotFocus  = Atr_Blue_Black,
-		Focus     = Atr_Blue_Black
+		Normal    = Atr_Blue_White,
+		Disabled  = Atr_DarkGray_White,
+		HotNormal = Atr_Blue_White,
+		HotFocus  = Atr_BrightBlue_Gray,
+		Focus     = Atr_BrightBlue_Gray
 	};
+
 	internal static readonly ColorScheme Cs_Elem2 = new()
 	{
-		Normal   = Atr_Cyan_Black,
+		Normal   = Atr_White_Cyan,
 		Disabled = Atr_DarkGray_Black
 	};