Input field UX/UI

Author: Decimation

SmartImage 3/Mode/Shell/ShellMode.Function.cs

@@ -32,6 +32,8 @@ private async Task RunMain()
 
 	private void Clear()
 	{
+		Tf_Input.ReadOnly = false;
+
 		Tf_Input.DeleteAll();
 		Tf_Input.ClearHistoryChanges();
 
@@ -57,5 +59,8 @@ private void Clear()
 		Tf_Input.SetFocus();
 		Tf_Input.EnsureFocus();
 		Btn_Cancel.Enabled = false;
+
+		m_queue.Clear();
+
 	}
 }

SmartImage 3/Mode/Shell/ShellMode.Handlers.cs

@@ -85,7 +85,8 @@ private void Restart_Clicked()
 	/// </summary>
 	private async void Run_Clicked()
 	{
-		Btn_Run.Enabled = false;
+		Btn_Run.Enabled    = false;
+		// Btn_Delete.Enabled = false;
 
 		var text = Tf_Input.Text;
 
@@ -146,12 +147,16 @@ private void InputInfo_Clicked()
 
 	private static void Clear_Clicked()
 	{
+		Tf_Input.ReadOnly = false;
 		Tf_Input.DeleteAll();
 		UI.SetLabelStatus(Lbl_InputOk, null);
 		Lbl_InputOk.SetNeedsDisplay();
 		Lbl_InputInfo.Text  = ustring.Empty;
 		Lbl_InputInfo2.Text = ustring.Empty;
 		Lbl_Status2.Text    = ustring.Empty;
+
+		Tf_Input.SetFocus();
+		// Btn_Delete.Enabled = false;
 	}
 
 	private void Cancel_Clicked()

SmartImage 3/Mode/Shell/ShellMode.cs

@@ -199,13 +199,20 @@ public sealed partial class ShellMode : IDisposable, IMode
 
 	};
 
-	private static readonly Button Btn_Queue = new("Queue")
+	private static readonly CheckBox Cb_Queue = new()
 	{
 		X = Pos.X(Btn_Run),
 		Y = Pos.Bottom(Btn_Run),
 
+	};
+
+	private static readonly Button Btn_Queue = new("Queue")
+	{
+		X = Pos.Right(Cb_Queue),
+		Y = Pos.Y(Cb_Queue),
+
 		Height      = Dim.Height(Btn_Run),
-		ColorScheme = UI.Cs_Lbl1
+		ColorScheme = UI.Cs_Btn1
 
 	};
 
@@ -260,6 +267,8 @@ public sealed partial class ShellMode : IDisposable, IMode
 
 	internal ManualResetEvent IsReady { get; set; }
 
+	private readonly ConcurrentQueue<ustring> m_queue;
+
 	#endregion
 
 	#endregion
@@ -273,6 +282,7 @@ public ShellMode(string[] args)
 		Query   = SearchQuery.Null;
 		Client  = new SearchClient(new SearchConfig());
 		IsReady = new ManualResetEvent(false);
+		m_queue = new();
 
 		m_results = new();
 
@@ -295,7 +305,7 @@ public ShellMode(string[] args)
 		m_cbCallbackTok = Application.MainLoop.AddTimeout(TimeoutTimeSpan, ClipboardCallback);
 
 		m_clipboard = new List<ustring>();
-
+		
 		Mb_Menu.Menus = new MenuBarItem[]
 		{
 			new("_About", null, AboutDialog),
@@ -373,17 +383,32 @@ public ShellMode(string[] args)
 
 			if (!string.IsNullOrWhiteSpace(file)) {
 				Query.Dispose();
+				Debug.WriteLine($"{IsQueryReady()}");
 				FileSystem.DeleteFile(file, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
 				Debug.WriteLine($"deleted {file}");
 				Clear();
 			}
 
 		};
+		
+		Cb_Queue.Toggled += b =>
+		{
+			Btn_Queue.Enabled = !b;
+		};
+
+		Btn_Queue.Clicked += () =>
+		{
+			if (IsQueryReady()) {
+				
+			}
+		};
+		
+		Btn_Queue.Enabled = false;
 
 		Win.Add(Lbl_Input, Tf_Input, Btn_Run, Lbl_InputOk,
 		        Btn_Clear, Tv_Results, Pbr_Status, Lbl_InputInfo, Lbl_QueryUpload,
 		        Btn_Restart, Btn_Config, Lbl_InputInfo2, Btn_Cancel, Lbl_Status, Btn_Browse,
-		        Lbl_Status2, /*Btn_Queue,*/ Btn_Delete
+		        Lbl_Status2, Btn_Queue, Btn_Delete, Cb_Queue
 		);
 
 		Top.Add(Win);
@@ -610,6 +635,9 @@ private async Task<bool> SetQuery(ustring text)
 		IsReady.Set();
 		Btn_Run.Enabled     = false;
 		Pbr_Status.Fraction = 0;
+		// Btn_Delete.Enabled = true;
+
+		Tf_Input.ReadOnly    = true;
 
 		return true;
 	}
@@ -680,5 +708,6 @@ public void Dispose()
 		Client.Dispose();
 		Query.Dispose();
 		m_token.Dispose();
+		m_queue.Clear();
 	}
 }

SmartImage 3/Program.cs

@@ -18,6 +18,8 @@
 using SmartImage.Mode.Shell;
 using SmartImage.Utilities;
 using Command = System.CommandLine.Command;
+using Microsoft.Extensions.Logging;
+using SmartImage.Lib.Utilities;
 
 #pragma warning disable CS0168
 
@@ -52,6 +54,8 @@ public static void Init()
 
 	}
 
+	private static readonly ILogger Logger = LogUtil.Factory.CreateLogger(nameof(SearchClient));
+
 	public static async Task<int> Main(string[] args)
 	{
 		// Console.OutputEncoding = Encoding.Unicode;
@@ -73,9 +77,15 @@ public static async Task<int> Main(string[] args)
 		 */
 #endif
 
+		bool c = Global.IsCompatible;
+
+		if (!c) {
+			Logger.LogCritical("{Lib} incompatible!", Global.LIB_NAME);
+		}
+
 		bool cli = args is { } && args.Any();
 
-		if (cli&& args.Contains(R2.Arg_NoUI)) {
+		if (cli && args.Contains(R2.Arg_NoUI)) {
 			var main = new CliMode();
 
 			var rc = new RootCommand()
@@ -94,12 +104,11 @@ public static async Task<int> Main(string[] args)
 
 			};
 
-			foreach (Option option in options)
-			{
+			foreach (Option option in options) {
 				rc.AddOption(option);
 			}
 
-			rc.SetHandler(main.RunAsync, (Option<string>)options[0]);
+			rc.SetHandler(main.RunAsync, (Option<string>) options[0]);
 
 			var i = await rc.InvokeAsync(args);
 

SmartImage.Lib 3/SearchClient.cs

@@ -90,72 +90,10 @@ static SearchClient()
 	/// <param name="query">Search query</param>
 	/// <param name="token">Cancellation token passed to <see cref="BaseSearchEngine.GetResultAsync"/></param>
 	/// <param name="p"><see cref="IProgress{T}"/></param>
-	public async Task<SearchResult[]> RunSearchAsync(SearchQuery[] query, CancellationToken? token = null,
-	                                                 [CBN] IProgress<int> p = null)
-	{
-		if (!ConfigApplied) {
-			await ApplyConfigAsync();
-		}
-
-		token ??= CancellationToken.None;
-		var tasks = query.SelectMany(e => GetSearchTasks(e, token.Value)).ToList();
-		
-		var results = new SearchResult[tasks.Count];
-		int i       = 0;
-
-		while (tasks.Any()) {
-			if (token.Value.IsCancellationRequested) {
-
-				Logger.LogWarning("Cancellation requested");
-				IsComplete = true;
-
-				return results;
-			}
-
-			var task = await Task.WhenAny(tasks);
-
-			var result = await task;
-
-			OnResult?.Invoke(this, result);
-			p?.Report(i);
-
-			if (Config.PriorityEngines.HasFlag(result.Engine.EngineOption)) {
-
-				OpenResult(result);
-			}
-
-			results[i] = result;
-			i++;
-			// results.Add(result);
-			tasks.Remove(task);
-		}
-
-		OnComplete?.Invoke(this, results);
-
-		IsComplete = true;
-
-		if (Config.PriorityEngines == SearchEngineOptions.Auto) {
-
-			// var sri    = results.SelectMany(r => r.Results).ToArray();
-			// var result = Optimize(sri).FirstOrDefault() ?? sri.FirstOrDefault();
-			//todo
-			OpenResult(results.FirstOrDefault());
-
-		}
-
-		return results;
-	}
-
-	/// <summary>
-	/// Runs a search of <paramref name="query"/>.
-	/// </summary>
-	/// <param name="query">Search query</param>
-	/// <param name="token">Cancellation token passed to <see cref="BaseSearchEngine.GetResultAsync"/></param>
-	/// <param name="p"><see cref="IProgress{T}"/></param>
-	public Task<SearchResult[]> RunSearchAsync(SearchQuery query, CancellationToken? token = null,
+	public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, CancellationToken? token = null,
 	                                           [CBN] IProgress<int> p = null)
 	{
-		/*if (!ConfigApplied) {
+		if (!ConfigApplied) {
 			await ApplyConfigAsync();
 		}
 
@@ -206,9 +144,7 @@ public Task<SearchResult[]> RunSearchAsync(SearchQuery query, CancellationToken?
 
 		}
 
-		return results;*/
-
-		return RunSearchAsync(new SearchQuery[] { query }, token, p);
+		return results;
 	}
 
 	private void OpenResult(SearchResult result)