Merge pull request #144 from XanatosX/develop

Prepare Release for Version 1.3.0

.gitattributes

@@ -1 +1,2 @@
 *.ico filter=lfs diff=lfs merge=lfs -text
+**/Assets/*.png filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -458,4 +458,6 @@ $RECYCLE.BIN/
 
 ## Custom
 ### Packages
-nupkg/*
+nupkg/*
+
+**/*.Designer.cs

README.md

@@ -59,7 +59,11 @@ Click [here][downloadPage] to get to the download section of this project on Git
 
 ## Found a bug or got a question?
 
-Please head over to the  [issue page][issuePage].
+Please head over to the [issue page][issuePage].
+
+## Want to contribute?
+
+Either search for Tickets marked with help wanted or improve the translation on [crowdin]
 
 ## Plugins
 
@@ -98,6 +102,7 @@ Technically the plugin will run with the user rights you did start the applicati
 [image-main-view-light]: https://i.imgur.com/lqmlo5U.png
 [downloadPage]: https://bitbucket.org/XanatosX/modulartoolmanager/downloads/
 [issuePage]: https://bitbucket.org/XanatosX/modulartoolmanager/issues
+[crowdin]: https://crowdin.com/project/modular-tool-manager
 [screenshot-1-dark]: https://imgur.com/mr3Folx.png
 [screenshot-1-light]: https://i.imgur.com/Fxgu18M.png
 [screenshot-2-dark]: https://i.imgur.com/LhMGcEx.png

crowdin.yml

@@ -0,0 +1,5 @@
+files:
+  - source: src/ModularToolManager/Properties/Resources.resx
+    translation: /src/ModularToolManager/Properties/%file_name%.%two_letters_code%.%file_extension%
+  - source: src/DefaultPlugins/Translations/en-EN.json
+    translation: /src/DefaultPlugins/Translations/%locale%.%file_extension%

src/DefaultPlugins/ScriptExecutionPlugin.cs

@@ -1,7 +1,6 @@
 using DefaultPlugins.Information;
 using DefaultPlugins.ProcessStartStrategies;
 using ModularToolManagerPlugin.Attributes;
-using ModularToolManagerPlugin.Enums;
 using ModularToolManagerPlugin.Models;
 using ModularToolManagerPlugin.Plugin;
 using ModularToolManagerPlugin.Services;
@@ -10,7 +9,7 @@
 namespace DefaultPlugins;
 
 /// <summary>
-/// Plugin to run scripts on windows maschines
+/// Plugin to run scripts on windows machines
 /// </summary>
 public sealed class ScriptExecutionPlugin : AbstractFunctionPlugin
 {
@@ -22,7 +21,7 @@ public sealed class ScriptExecutionPlugin : AbstractFunctionPlugin
     /// <summary>
     /// The factory to use for creating starter objects
     /// </summary>
-    private DefaultScriptStarterFactory starterFactory;
+    private readonly DefaultScriptStarterFactory starterFactory;
 
     /// <summary>
     /// Fallback text if a translation is missing

src/DefaultPlugins/Translations/de-DE.json

@@ -1,50 +1,14 @@
-[
-  {
-    "key": "script-displayname",
-    "value": "Skript ausführung"
-  },
-  {
-    "key": "script-description",
-    "value": "Diese Plugin erlaubt Ihnen Skript-Dateien mit dem Modular Tool Manager auszuführen"
-  },
-  {
-    "key": "binary-displayname",
-    "value": "Ausführbare Datei starten"
-  },
-  {
-    "key": "binary-description",
-    "value": "Diese Plugin erlaubt es Ihnen Binäre Dateien mit dem Modular Tool Manager auszuführen"
-  },
-  {
-    "key": "batch",
-    "value": "Batch-Skript"
-  },
-  {
-    "key": "cmd",
-    "value": "CMD-Skript"
-  },
-  {
-    "key": "powershell",
-    "value": "PowerShell-Skript"
-  },
-  {
-    "key": "executable",
-    "value": "Ausführbare-Datei"
-  },
-  {
-    "key": "error_cant_find_script_file",
-    "value": "Konnte das auszuführende Skript '{0}' nicht finden"
-  },
-  {
-    "key": "error_cant_find_binary_file",
-    "value": "Konnte ausführbare datei '{0}' nicht finden"
-  },
-  {
-    "key": "hide",
-    "value": "Terminal verstecken"
-  },
-  {
-    "key": "adminRequired",
-    "value": "Als Administrator ausführen"
-  }
-]
+{
+  "script-displayname": "Skriptausführung",
+  "script-description": "Dieses Plugin erlaubt es Ihnen Skript-Dateien mit dem Modular Tool Manager auszuführen",
+  "binary-displayname": "Ausführbare Datei starten",
+  "binary-description": "Dieses Plugin erlaubt es Ihnen binäre Dateien mit dem Modular Tool Manager auszuführen",
+  "batch": "Batch-Skript",
+  "cmd": "CMD-Skript",
+  "powershell": "PowerShell-Skript",
+  "executable": "Ausführbare-Datei",
+  "error_cant_find_script_file": "Konnte das auszuführende Skript '{0}' nicht finden",
+  "error_cant_find_binary_file": "Konnte ausführbare Datei '{0}' nicht finden",
+  "hide": "Terminal verstecken",
+  "adminRequired": "Als Administrator ausführen"
+}

src/DefaultPlugins/Translations/en-EN.json

@@ -1,50 +1,14 @@
-[
-  {
-    "key": "script-displayname",
-    "value": "Script execution"
-  },
-  {
-    "key": "script-description",
-    "value": "This plugin will allow you to run scrip files with the modular tool manager"
-  },
-  {
-    "key": "binary-displayname",
-    "value": "Start executable binary file"
-  },
-  {
-    "key": "binary-description",
-    "value": "This plugin will allow you to run binary executable with the modular tool manager"
-  },
-  {
-    "key": "batch",
-    "value": "Batch-Script"
-  },
-  {
-    "key": "cmd",
-    "value": "CMD-Script"
-  },
-  {
-    "key": "powershell",
-    "value": "PowerShell-Script"
-  },
-  {
-    "key": "executable",
-    "value": "Executable-File"
-  },
-  {
-    "key": "error_cant_find_script_file",
-    "value": "Could not find script '{0}' to execute"
-  },
-  {
-    "key": "error_cant_find_binary_file",
-    "value": "Could not find binary file '{0}' to run"
-  },
-  {
-    "key": "hide",
-    "value": "Hide command line"
-  },
-  {
-    "key": "adminRequired",
-    "value": "Run as Administrator"
-  }
-]
+{
+  "script-displayname": "Script execution",
+  "script-description": "This plugin will allow you to run scrip files with the modular tool manager",
+  "binary-displayname": "Start executable binary file",
+  "binary-description": "This plugin will allow you to run binary executable with the modular tool manager",
+  "batch": "Batch-Script",
+  "cmd": "CMD-Script",
+  "powershell": "PowerShell-Script",
+  "executable": "Executable-File",
+  "error_cant_find_script_file": "Could not find script '{0}' to execute",
+  "error_cant_find_binary_file": "Could not find binary file '{0}' to run",
+  "hide": "Hide command line",
+  "adminRequired": "Run as Administrator"
+}

src/ModularToolManager/App.axaml

@@ -9,6 +9,7 @@
 		<FluentTheme/>
 		<StyleInclude Source="avares://ModularToolManager/Resources/Icons.axaml"/>
 		<StyleInclude Source="avares://ModularToolManager/Resources/LinkButtonStyle.axaml"/>
+		<StyleInclude Source="avares://ModularToolManager/Resources/ImageButtonStyle.axaml"/>
 	</Application.Styles>
 
 	<!-- Custom control styles -->

src/ModularToolManager/App.axaml.cs

@@ -4,9 +4,10 @@
 using Avalonia.Markup.Xaml;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.DependencyInjection;
-using ModularToolManager.DependencyInjection;
 using ModularToolManager.Models.Messages;
+using ModularToolManager.Services;
 using ModularToolManager.Services.Settings;
+using ModularToolManager.Strategies;
 using ModularToolManager.ViewModels;
 using ModularToolManager.Views;
 using ModularToolManagerModel.Services.IO;
@@ -37,12 +38,13 @@ private IServiceCollection BuildServiceCollection()
     {
         IServiceCollection collection = new ServiceCollection();
         return collection.AddServices()
-                                      .AddViewModels()
-                                      .AddViews()
-                                      .AddLogging(config =>
-                                      {
-                                          config.AddSerilog(CreateLoggerConfig(collection));
-                                      });
+                         .AddViewModels()
+                         .AddViews()
+                         .AddStrategies()
+                         .AddLogging(config =>
+                         {
+                            config.AddSerilog(CreateLoggerConfig(collection));
+                         });
     }
 
     /// <summary>
@@ -77,7 +79,7 @@ private Serilog.ILogger CreateLoggerConfig(IServiceCollection collection)
     public override void OnFrameworkInitializationCompleted()
     {
         var provider = BuildServiceCollection().BuildServiceProvider();
-        WeakReferenceMessenger.Default.Register<RefreshMainWindow>(this, (_, e) =>
+        WeakReferenceMessenger.Default.Register<RefreshMainWindow>(this, (_, _) =>
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {

src/ModularToolManager/Converters/Serialization/ColorConverter.cs

@@ -69,7 +69,6 @@ public override Color Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe
                     case CurrentColorMode.Blue:
                         blue = number;
                         break;
-                    default: break;
                 }
             }
         }

src/ModularToolManager/Converters/Serialization/CultureInfoJsonConverter.cs

@@ -21,10 +21,11 @@ internal class CultureInfoJsonConverter : JsonConverter<CultureInfo>
         CultureInfo? culture = null;
         try
         {
-            culture = CultureInfo.GetCultureInfo(isoThreeCode ?? String.Empty);
+            culture = CultureInfo.GetCultureInfo(isoThreeCode ?? string.Empty);
         }
         catch (Exception)
         {
+            // Culture not detected, returning null!
         }
         return culture;
     }