v3.0.0

Author: Decimation

SmartImage 3/Modes/GuiMode.cs

@@ -130,26 +130,31 @@ public sealed class GuiMode : BaseProgramMode
 
 	private static readonly Label Lbl_InputInfo = new()
 	{
-		X      = Pos.Bottom(Tf_Input),
-		Y      = 1,
-		Width  = 15,
-		Height = Dim.Height(Tf_Input)
+		X           = Pos.Bottom(Tf_Input),
+		Y           = 1,
+		Width       = 15,
+		Height      = Dim.Height(Tf_Input),
+		ColorScheme = Styles.Cs_Lbl2
+
 	};
 
 	private static readonly Label Lbl_QueryUpload = new()
 	{
-		X      = Pos.Right(Lbl_InputInfo) + 1,
-		Y      = 1,
-		Width  = 15,
-		Height = Dim.Height(Lbl_InputInfo)
+		X           = Pos.Right(Lbl_InputInfo) + 1,
+		Y           = 1,
+		Width       = 15,
+		Height      = Dim.Height(Lbl_InputInfo),
+		ColorScheme = Styles.Cs_Lbl2
+
 	};
 
 	private static readonly Label Lbl_InputInfo2 = new()
 	{
-		X      = Pos.Right(Lbl_QueryUpload) + 1,
-		Y      = Pos.Y(Lbl_QueryUpload),
-		Width  = 15,
-		Height = Dim.Height(Lbl_QueryUpload)
+		X           = Pos.Right(Lbl_QueryUpload) + 1,
+		Y           = Pos.Y(Lbl_QueryUpload),
+		Width       = 15,
+		Height      = Dim.Height(Lbl_QueryUpload),
+		ColorScheme = Styles.Cs_Lbl1
 	};
 
 	private static readonly DataTable Dt_Results = new()
@@ -178,10 +183,12 @@ public sealed class GuiMode : BaseProgramMode
 
 	private static readonly Label Lbl_Status = new()
 	{
-		X      = Pos.Right(Pbr_Status) + 1,
-		Y      = Pos.Y(Pbr_Status),
-		Width  = 15,
-		Height = Dim.Height(Lbl_InputInfo)
+		X           = Pos.Right(Pbr_Status) + 1,
+		Y           = Pos.Y(Pbr_Status),
+		Width       = 15,
+		Height      = Dim.Height(Lbl_InputInfo),
+		ColorScheme = Styles.Cs_Lbl1
+
 	};
 
 	#endregion
@@ -483,7 +490,7 @@ private bool ClipboardCallback(MainLoop c)
 			    !IsInputValidIndicator() && !m_clipboard.Contains(str)) {
 				SetInputText(str);
 				// Lbl_InputOk.Text   = Values.Clp;
-				Lbl_InputInfo.Text = $"Clipboard data";
+				Lbl_InputInfo.Text = Resources.Inf_Clipboard;
 
 				m_clipboard.Add(str);
 			}
@@ -516,7 +523,7 @@ private void AboutDialog()
 	{
 		var d = new Dialog()
 		{
-			Text = $"{R2.Name} {Integration.Version}\n" +
+			Text = $"{R2.Name} {Integration.Version} by {R2.Author}\n" +
 			       $"Current directory: {Integration.CurrentAppFolder}",
 
 			Title    = R2.Name,
@@ -660,9 +667,7 @@ private void OnConfigDialog()
 
 		var cfgInfo = new FileInfo(SearchConfig.Configuration.FilePath);
 
-		ustring s = $"Config";
-
-		Label lbConfig = new(s)
+		Label lbConfig = new($"Config")
 		{
 			X           = Pos.Right(lbPriorityEngines) + 1,
 			Y           = 0,
@@ -896,7 +901,7 @@ private async void OnRun()
 	private void OnCancel()
 	{
 		Token.Cancel();
-		Lbl_InputInfo2.Text = $"Canceled";
+		Lbl_InputInfo2.Text = Resources.Inf_Cancel;
 		Lbl_InputInfo2.SetNeedsDisplay();
 		Btn_Restart.Enabled = true;
 		Application.MainLoop.RemoveIdle(m_runIdleTok);

SmartImage 3/Resources.Designer.cs

@@ -138,4 +138,10 @@
   <data name="Author" xml:space="preserve">
     <value>Read Stanton</value>
   </data>
+  <data name="Inf_Clipboard" xml:space="preserve">
+    <value>Clipboard data</value>
+  </data>
+  <data name="Inf_Cancel" xml:space="preserve">
+    <value>Canceled</value>
+  </data>
 </root>

SmartImage 3/Resources.resx

@@ -12,8 +12,8 @@
     <PackageProjectUrl>https://github.com/Decimation/SmartImage</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Decimation/SmartImage</RepositoryUrl>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <!-- <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework> -->
+    <!-- <RuntimeIdentifier>win10-x64</RuntimeIdentifier> -->
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <ApplicationIcon>..\Assets\Icon.ico</ApplicationIcon>
     <DefineConstants>JETBRAINS_ANNOTATIONS;TRACE</DefineConstants>

SmartImage 3/SmartImage.csproj

@@ -109,7 +109,20 @@ internal static class Styles
 		Focus     = Styles.Atr_Cyan_Black,
 		HotFocus  = Styles.Atr_Cyan_Black,
 	};
-
+	internal static readonly ColorScheme Cs_Lbl2 = new()
+	{
+		Normal    = Atr_BrightCyan_DarkGray,
+		HotNormal = Atr_BrightCyan_DarkGray,
+		Focus     = Styles.Atr_Cyan_Black,
+		HotFocus  = Styles.Atr_Cyan_Black,
+	};
+	internal static readonly ColorScheme Cs_Lbl3 = new()
+	{
+		Normal    = Styles.Atr_BrightBlue_Gray,
+		HotNormal = Styles.Atr_BrightBlue_Gray,
+		Focus     = Styles.Atr_Cyan_Black,
+		HotFocus  = Styles.Atr_Cyan_Black,
+	};
 	#endregion
 
 	#region Styles

SmartImage 3/UI/Styles.cs

@@ -7,7 +7,8 @@
     <Configurations>Debug;Release;Test</Configurations>
     <DefineConstants>JETBRAINS_ANNOTATIONS;TRACE</DefineConstants>
     <PublishTrimmed>True</PublishTrimmed>
-    <PublishSingleFile>true</PublishSingleFile>
+    <!-- <PublishSingleFile>true</PublishSingleFile> -->
+    <PublishSingleFile Condition="'$(Configuration)' == 'Release|AnyCPU'">true</PublishSingleFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='TestDebug|AnyCPU'">
     <DefineConstants>DEBUG;TRACE;JETBRAINS_ANNOTATIONS;TEST_DEBUG</DefineConstants>