Merge pull request #118 from SkEditorTeam/dev/dev

v2.8.1
SkEditorTeam · Aug 19, 2024 · dfdc4dd · dfdc4dd
2 parents 1f8822a + 5831287
commit dfdc4dd
Show file tree

Hide file tree

Showing 26 changed files with 191 additions and 472 deletions.
diff --git a/Installer/Package.wxs b/Installer/Package.wxs
@@ -1,6 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
 	 xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-	<Package Name="SkEditor" Manufacturer="Notro" Version="2.8.0" UpgradeCode="14564974-da58-4917-8a0d-590043f589c2">
+	<Package Name="SkEditor" Manufacturer="Notro" Version="2.8.1" UpgradeCode="14564974-da58-4917-8a0d-590043f589c2">
 		<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 		<MediaTemplate EmbedCab="yes" />
 

diff --git a/SkEditor/API/ApiVault.cs b/SkEditor/API/ApiVault.cs
diff --git a/SkEditor/API/ISkEditorAPI.cs b/SkEditor/API/ISkEditorAPI.cs
diff --git a/SkEditor/API/Utilities/IWindows.cs b/SkEditor/API/Utilities/IWindows.cs
@@ -33,12 +33,13 @@ public interface IWindows
     /// <param name="icon">The dialog's icon. Can be null.</param>
     /// <param name="cancelButtonText">The text of the cancel button. If null, no cancel button will be shown.</param>
     /// <param name="primaryButtonText">The text of the primary button. Default is "Okay", <b>cannot be null</b></param>
+    /// <param name="translate">Whether to try translate the title</param>
     /// <returns>The result of the dialog.</returns>
     Task<ContentDialogResult> ShowDialog(string title,
         string message,
         object? icon = null,
         string? cancelButtonText = null,
-        string primaryButtonText = "Okay");
+        string primaryButtonText = "Okay", bool translate = true);
 
     /// <summary>
     /// Show a message dialog to the user.

diff --git a/SkEditor/App.axaml.cs b/SkEditor/App.axaml.cs
@@ -82,7 +82,6 @@ public override async void OnFrameworkInitializationCompleted()
                 try
                 {
                     SkEditorAPI.Core.SetStartupArguments(desktop.Args ?? []);
-                    _ = new SkEditor();
 
                     MainWindow mainWindow = new();
                     desktop.MainWindow = mainWindow;

diff --git a/SkEditor/Controls/Addons/AddonEntryControl.axaml.cs b/SkEditor/Controls/Addons/AddonEntryControl.axaml.cs
@@ -97,7 +97,7 @@ public void LoadVisuals(AddonMeta addonMeta)
                 Symbol = Symbol.Warning,
                 Foreground = new SolidColorBrush(addonMeta.HasCriticalErrors ? ErrorColor : WarningColor),
                 FontSize = 36,
-                IsFilled = true
+                IconVariant = IconVariant.Filled
             };
             Expander.Header = new TextBlock()
             {

diff --git a/SkEditor/Controls/MainMenuControl.axaml b/SkEditor/Controls/MainMenuControl.axaml
@@ -168,6 +168,11 @@
 					<ui:IconSourceElement IconSource="{StaticResource RefactorIcon}" />
 				</MenuItem.Icon>
 			</MenuItem>
+			<MenuItem Header="{DynamicResource MenuHeaderColorSelector}" Name="MenuItemColorSelector">
+				<MenuItem.Icon>
+					<ui:IconSourceElement IconSource="{StaticResource ColorIcon}" />
+				</MenuItem.Icon>
+			</MenuItem>
 		</MenuItem>
 		<MenuItem Name="AddonsMenuItem" Header="{DynamicResource MenuHeaderAddons}">
 

diff --git a/SkEditor/Controls/MainMenuControl.axaml.cs b/SkEditor/Controls/MainMenuControl.axaml.cs
@@ -58,13 +58,15 @@ private void AssignCommands()
 
         MenuItemRefreshSyntax.Command = new RelayCommand(async () => await SyntaxLoader.RefreshSyntaxAsync());
 
-        MenuItemSettings.Command = new RelayCommand(() => new SettingsWindow().ShowDialog(SkEditorAPI.Windows.GetMainWindow()));
+        MenuItemDocs.Command = new RelayCommand(AddDocsTab);
         MenuItemGenerateGui.Command = new RelayCommand(() => ShowDialogIfEditorIsOpen(new GuiGenerator()));
         MenuItemGenerateCommand.Command = new RelayCommand(() => ShowDialogIfEditorIsOpen(new CommandGenerator()));
         MenuItemRefactor.Command = new RelayCommand(() => ShowDialogIfEditorIsOpen(new RefactorWindow()));
+        MenuItemColorSelector.Command = new RelayCommand(() => new ColorSelectionWindow().ShowDialog(SkEditorAPI.Windows.GetMainWindow()));
+
         MenuItemMarketplace.Command = new RelayCommand(() => new MarketplaceWindow().ShowDialog(SkEditorAPI.Windows.GetMainWindow()));
 
-        MenuItemDocs.Command = new RelayCommand(AddDocsTab);
+        MenuItemSettings.Command = new RelayCommand(() => new SettingsWindow().ShowDialog(SkEditorAPI.Windows.GetMainWindow()));
     }
 
     private static void ShowDialogIfEditorIsOpen(AppWindow window)

diff --git a/SkEditor/Languages/English.xaml b/SkEditor/Languages/English.xaml
@@ -15,6 +15,7 @@
 	<system:String x:Key="WindowTitleMarketplace">Marketplace</system:String>
 	<system:String x:Key="WindowTitleElementRename">Rename</system:String>
 	<system:String x:Key="WindowTitleElementCreate">Create</system:String>
+	<system:String x:Key="WindowTitleColorSelector">Color selector</system:String>
 
 	<!-- Menu Headers -->
 	<system:String x:Key="MenuHeaderFile">File</system:String>
@@ -58,6 +59,7 @@
 	<system:String x:Key="MenuHeaderGenerateGUI">GUI</system:String>
 	<system:String x:Key="MenuHeaderGenerateCommand">Command</system:String>
 	<system:String x:Key="MenuHeaderRefactor">Refactor</system:String>
+	<system:String x:Key="MenuHeaderColorSelector">Color selector</system:String>
 
 	<!-- Other Menu -->
 	<system:String x:Key="MenuHeaderMarketplace">Marketplace</system:String>
@@ -193,6 +195,9 @@
 	<system:String x:Key="RefactorWindowSpacesToTabs">Convert spaces to tabs</system:String>
 	<system:String x:Key="RefactorWindowRefactorBoxName">Renaming '{0}' into...</system:String>
 
+	<!-- Color Selector -->
+	<system:String x:Key="ColorSelectorWindowHexResult">Result in hex</system:String>
+
 
 	<!-- Projects -->
 	<system:String x:Key="ProjectExplorerTitle">Explorer</system:String>

diff --git a/SkEditor/Languages/Polish.xaml b/SkEditor/Languages/Polish.xaml
@@ -15,6 +15,7 @@
 	<system:String x:Key="WindowTitleMarketplace">Rynek</system:String>
 	<system:String x:Key="WindowTitleElementRename">Zmień nazwę</system:String>
 	<system:String x:Key="WindowTitleElementCreate">Stwórz</system:String>
+	<system:String x:Key="WindowTitleColorSelector">Selektor kolorów</system:String>
 
 	<!-- Menu Headers -->
 	<system:String x:Key="MenuHeaderFile">Plik</system:String>
@@ -58,7 +59,8 @@
 	<system:String x:Key="MenuHeaderGenerateGUI">GUI</system:String>
 	<system:String x:Key="MenuHeaderGenerateCommand">Komenda</system:String>
 	<system:String x:Key="MenuHeaderRefactor">Refaktoryzacja</system:String>
-
+	<system:String x:Key="MenuHeaderColorSelector">Selektor kolorów</system:String>
+
 	<!-- Other Menu -->
 	<system:String x:Key="MenuHeaderMarketplace">Rynek</system:String>
 	<system:String x:Key="MenuHeaderRefreshSyntax">Odśwież składnię</system:String>
@@ -192,6 +194,9 @@
 	<system:String x:Key="RefactorWindowTabsToSpaces">Zamień taby na spacje</system:String>
 	<system:String x:Key="RefactorWindowSpacesToTabs">Zamień spacje na taby</system:String>
 	<system:String x:Key="RefactorWindowRefactorBoxName">Zmiana nazwy '{0}' na...</system:String>
+
+	<!-- Color Selector -->
+	<system:String x:Key="ColorSelectorWindowHexResult">Rezultat w HEX</system:String>
 
 
 	<!-- Projects -->