Fix enum/ListView issue in #39

Author: Decimation

SmartImage 3/Mode/Shell/Assets/UI.cs

@@ -111,8 +111,8 @@ public static TEnum GetEnum<TEnum>(this IListDataSource lv, TEnum t = default) w
 
 		return t2;
 	}
-	
-	internal static void OnEngineSelected(ListView lv, ref SearchEngineOptions e)
+
+	internal static void OnEngineSelected(ListView lv, ListViewItemEventArgs lvie, ref SearchEngineOptions e)
 	{
 		var l = lv.Source.ToList<SearchEngineOptions>().ToArray();
 
@@ -132,9 +132,18 @@ internal static void OnEngineSelected(ListView lv, ref SearchEngineOptions e)
 		}
 
 		ret:
-		lv.FromEnum(e);
+		Debug.WriteLine($"1 {e}");
+		var v = ((SearchEngineOptions) lvie.Value);
+		if (lv.Source.IsMarked(lvie.Item)) {
+			e |= v;
+		}
+		else {
+			e &= ~v;
+		}
 
-		Debug.WriteLine($"{e}");
+		Debug.WriteLine($"2 {e}");
+		lv.FromEnum(e);
+		Debug.WriteLine($"3 {e}");
 	}
 
 	/*internal static void OnEngineSelected(ListViewItemEventArgs args, ref SearchEngineOptions e, ListView lv)

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

@@ -145,7 +145,7 @@ void ReloadDialog()
 		{
 			SearchEngineOptions e = Config.SearchEngines;
 			// UI.OnEngineSelected(args1, ref e, lvSearchEngines);
-			UI.OnEngineSelected(lvSearchEngines, ref e);
+			UI.OnEngineSelected(lvSearchEngines, args1, ref e);
 			Debug.WriteLine($"Setting {e}");
 			Config.SearchEngines = e;
 			ReloadDialog();
@@ -155,15 +155,15 @@ void ReloadDialog()
 		{
 			SearchEngineOptions e = Config.PriorityEngines;
 			// UI.OnEngineSelected(args1, ref e, lvPriorityEngines);
-			UI.OnEngineSelected(lvPriorityEngines, ref e);
+			UI.OnEngineSelected(lvPriorityEngines, args1, ref e);
 			Debug.WriteLine($"Setting {e}");
 			Config.PriorityEngines = e;
 			ReloadDialog();
 		};
 
 		// Debug.WriteLine($"{GetItems<SearchEngineOptions>(lvSearchEngines.Source).QuickJoin()}");
-		// lvSearchEngines.FromEnum2(Config.SearchEngines);
-		// lvPriorityEngines.FromEnum2(Config.PriorityEngines);
+		lvSearchEngines.FromEnum(Config.SearchEngines);
+		lvPriorityEngines.FromEnum(Config.PriorityEngines);
 
 		// var e=lvSearchEngines.Source.GetEnum2(default(SearchEngineOptions));
 

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

@@ -27,6 +27,8 @@ private async Task RunMain()
 		await run;
 
 		sw.Stop();
+		Lbl_Status.Text = $"{ResultCount} | {sw.Elapsed.TotalSeconds:F3} sec {UI.OK}";
+
 		Application.MainLoop.RemoveIdle(m_runIdleTok);
 	}
 

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

@@ -76,6 +76,7 @@ private void Restart_Clicked(bool force = false)
 		Btn_Restart.Enabled = false;
 		Btn_Cancel.Enabled  = false;
 		Btn_Run.Enabled     = true;
+		Btn_Delete.Enabled     = false;
 
 		m_token.Dispose();
 		m_token = new();