Merge pull request #125 from SkEditorTeam/dev/dev

v2.8.2
SkEditorTeam · Dec 7, 2024 · 2f2fdaa · 2f2fdaa
2 parents 656da60 + e2e59c4
commit 2f2fdaa
Show file tree

Hide file tree

Showing 21 changed files with 402 additions and 156 deletions.
diff --git a/Installer/Folders.wxs b/Installer/Folders.wxs
@@ -1,9 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-	<Fragment>
-		<StandardDirectory Id="ProgramFiles6432Folder">
-			<Directory Id="INSTALLFOLDER" Name="!(bind.Property.ProductName)">
-				<Directory Id="LanguagesFolder" Name="Languages"/>
-			</Directory>
-		</StandardDirectory>
-	</Fragment>
-</Wix>
+    <Fragment>
+        <StandardDirectory Id="ProgramFiles6432Folder">
+            <Directory Id="INSTALLFOLDER" Name="!(bind.Property.ProductName)" />
+        </StandardDirectory>
+    </Fragment>
+</Wix>
diff --git a/Installer/LanguagesComponents.wxs b/Installer/LanguagesComponents.wxs
diff --git a/Installer/Package.wxs b/Installer/Package.wxs
@@ -1,34 +1,31 @@
-<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.1" UpgradeCode="14564974-da58-4917-8a0d-590043f589c2">
-		<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+<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.2"
+             UpgradeCode="14564974-da58-4917-8a0d-590043f589c2">
 		<MediaTemplate EmbedCab="yes" />
 
 		<Feature Id="Main">
 			<ComponentGroupRef Id="SkEditorComponents" />
-			<ComponentGroupRef Id="LanguagesComponents" />
 		</Feature>
 
 		<ui:WixUI
-			Id="SkEditorInstaller_InstallDir"
-			InstallDirectory="INSTALLFOLDER"/>
-		
+            Id="SkEditorInstaller_InstallDir"
+            InstallDirectory="INSTALLFOLDER" />
+
 		<UIRef Id="WixUI_ErrorProgressText" />
 
-		<WixVariable
-			  Id="WixUIDialogBmp"
-			  Value="Assets/background.png"/>
-
-		<WixVariable
-			  Id="WixUIBannerBmp"
-			  Value="Assets/top.png"/>
-
-		<WixVariable
-			  Id="WixUIExclamationIco"
-			  Value="Assets/Warning.ico"/>
-
-		<WixVariable
-			  Id="WixUIInfoIco"
-			  Value="Assets/Info.ico"/>
+		<WixVariable Id="WixUIDialogBmp"
+                     Value="Assets/background.png" />
+
+		<WixVariable Id="WixUIBannerBmp"
+                     Value="Assets/top.png" />
+
+		<WixVariable Id="WixUIExclamationIco"
+                     Value="Assets/Warning.ico" />
+
+		<WixVariable Id="WixUIInfoIco"
+                     Value="Assets/Info.ico" />
 	</Package>
-</Wix>
+</Wix>
diff --git a/Installer/SkEditorComponents.wxs b/Installer/SkEditorComponents.wxs
@@ -1,23 +1,18 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 	<Fragment>
 		<ComponentGroup Id="SkEditorComponents" Directory="INSTALLFOLDER">
+			<Files Include="..\SkEditor\bin\Release\publish\win\**">
+				<Exclude Files="..\SkEditor\bin\Release\publish\win\SkEditor.exe" />
+			</Files>
+
 			<Component>
 				<File Source="..\SkEditor\bin\Release\publish\win\SkEditor.exe"/>
 				<Shortcut Name="SkEditor" Directory="DesktopFolder" Advertise="yes" Icon="SkEditorIcon.exe" />
 				<Shortcut Name="SkEditor" Directory="ProgramMenuFolder" Advertise="yes" Icon="SkEditorIcon.exe" />
 			</Component>
-			<Component>
-				<File Source="..\SkEditor\bin\Release\publish\win\av_libglesv2.dll" />
-			</Component>
-			<Component>
-				<File Source="..\SkEditor\bin\Release\publish\win\libHarfBuzzSharp.dll" />
-			</Component>
-			<Component>
-				<File Source="..\SkEditor\bin\Release\publish\win\libSkiaSharp.dll" />
-			</Component>
 		</ComponentGroup>
 
 		<Icon Id="SkEditorIcon.exe" SourceFile="Assets/SkEditor.ico"/>
 		<Property Id="ARPPRODUCTICON" Value="SkEditorIcon.exe" />
 	</Fragment>
-</Wix>
+</Wix>
diff --git a/Installer/SkEditorInstaller.wixproj b/Installer/SkEditorInstaller.wixproj
@@ -1,10 +1,10 @@
-<Project Sdk="WixToolset.Sdk/4.0.3">
+<Project Sdk="WixToolset.Sdk/5.0.2">
   <ItemGroup>
     <Content Include="Assets\Info.ico" />
     <Content Include="Assets\Warning.ico" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.6" />
-    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.3" />
+    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0.1" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/SkEditor/App.axaml.cs b/SkEditor/App.axaml.cs
@@ -29,6 +29,8 @@ public override async void OnFrameworkInitializationCompleted()
     {
         base.OnFrameworkInitializationCompleted();
 
+        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+
         Log.Logger = new LoggerConfiguration()
             .MinimumLevel.Debug()
             .WriteTo.File(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),

diff --git a/SkEditor/Controls/SideBarControl.axaml.cs b/SkEditor/Controls/SideBarControl.axaml.cs
@@ -1,3 +1,4 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media;
 using CommunityToolkit.Mvvm.Input;
@@ -76,6 +77,8 @@ private Button CreatePanelButton(SidebarPanel panel)
                     SkEditorAPI.Windows.GetMainWindow().CoreGrid.ColumnDefinitions[1].MaxWidth = 0;
                     SkEditorAPI.Windows.GetMainWindow().CoreGrid.ColumnDefinitions[1].MinWidth = 0;
 
+                    SkEditorAPI.Windows.GetMainWindow().SideBar.Margin = new Thickness(0, 0, 0, 0);
+
                     return;
                 }
 
@@ -97,6 +100,8 @@ private Button CreatePanelButton(SidebarPanel panel)
 
                 SkEditorAPI.Windows.GetMainWindow().CoreGrid.ColumnDefinitions[1].MinWidth = _currentPanel.DesiredWidth;
                 SkEditorAPI.Windows.GetMainWindow().CoreGrid.ColumnDefinitions[1].MaxWidth = int.MaxValue;
+
+                SkEditorAPI.Windows.GetMainWindow().SideBar.Margin = new Thickness(0, 0, 10, 0);
             })
         };
 

diff --git a/SkEditor/Controls/Sidebar/ExplorerSidebarPanel.axaml b/SkEditor/Controls/Sidebar/ExplorerSidebarPanel.axaml
@@ -5,8 +5,7 @@
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:ar="clr-namespace:SkEditor.Utilities.Projects"
              xmlns:elements="clr-namespace:SkEditor.Utilities.Projects.Elements"
-             x:Class="SkEditor.Controls.Sidebar.ExplorerSidebarPanel"
-			 Margin="10,0,0,0">
+             x:Class="SkEditor.Controls.Sidebar.ExplorerSidebarPanel">
 
     <UserControl.Styles>
         <Style Selector="Button.barButton">
@@ -81,7 +80,7 @@
                                     <MenuItem Header="{DynamicResource MenuHeaderRename}" Command="{Binding RenameCommand}">
                                         <MenuItem.Icon><ui:SymbolIcon Symbol="Rename" FontSize="20"></ui:SymbolIcon></MenuItem.Icon>
                                     </MenuItem>
-                                    <MenuItem Header="{DynamicResource MenuHeaderDelete}" Command="{Binding DeleteCommand}">
+                                    <MenuItem Header="{DynamicResource MenuHeaderDeleteFromDisk}" Command="{Binding DeleteCommand}">
                                         <MenuItem.Icon><ui:SymbolIcon Symbol="Delete" FontSize="20"></ui:SymbolIcon></MenuItem.Icon>
                                     </MenuItem>
                                 </MenuFlyout>

diff --git a/SkEditor/Controls/Sidebar/ParserSidebarPanel.axaml b/SkEditor/Controls/Sidebar/ParserSidebarPanel.axaml
@@ -3,8 +3,7 @@
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:parser="clr-namespace:SkEditor.Utilities.Parser"
              xmlns:viewModels="clr-namespace:SkEditor.Utilities.Parser.ViewModels"
-             x:Class="SkEditor.Controls.Sidebar.ParserSidebarPanel"
-			 Margin="10,0,0,0">
+             x:Class="SkEditor.Controls.Sidebar.ParserSidebarPanel">
 
     <UserControl.Styles>
         <Style Selector="Button.barButton">

diff --git a/SkEditor/Languages/English.xaml b/SkEditor/Languages/English.xaml
@@ -66,6 +66,7 @@
 	<system:String x:Key="MenuHeaderRefreshSyntax">Refresh syntax</system:String>
 
 	<!-- Project Menu -->
+	<system:String x:Key="MenuHeaderDeleteFromDisk">Delete from Disk</system:String>
 	<system:String x:Key="MenuHeaderOpenInExplorer">Open in explorer</system:String>
 	<system:String x:Key="MenuHeaderCopyPath">Copy relative path</system:String>
 	<system:String x:Key="MenuHeaderCopyAbsolutePath">Copy absolute path</system:String>

diff --git a/SkEditor/Languages/Polish.xaml b/SkEditor/Languages/Polish.xaml
@@ -66,6 +66,7 @@
 	<system:String x:Key="MenuHeaderRefreshSyntax">Odśwież składnię</system:String>
 
 	<!-- Project Menu -->
+	<system:String x:Key="MenuHeaderDeleteFromDisk">Usuń z dysku</system:String>
 	<system:String x:Key="MenuHeaderOpenInExplorer">Otwórz w eksploratorze</system:String>
 	<system:String x:Key="MenuHeaderCopyPath">Skopiuj ścieżkę względną</system:String>
 	<system:String x:Key="MenuHeaderCopyAbsolutePath">Skopiuj ścieżkę bezwzględną</system:String>

diff --git a/SkEditor/Program.cs b/SkEditor/Program.cs
@@ -2,45 +2,44 @@
 using Avalonia.Data;
 using System;
 
-namespace SkEditor.Desktop
+namespace SkEditor;
+
+class Program
 {
-    class Program
+    // Initialization code. Don't use any Avalonia, third-party APIs or any
+    // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
+    // yet and stuff might break.
+    [STAThread]
+    public static void Main(string[] args)
     {
-        // Initialization code. Don't use any Avalonia, third-party APIs or any
-        // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
-        // yet and stuff might break.
-        [STAThread]
-        public static void Main(string[] args)
-        {
-            GC.KeepAlive(typeof(RelativeSource));
-            CheckTest(args);
+        GC.KeepAlive(typeof(RelativeSource));
+        CheckTest(args);
 
-            BuildAvaloniaApp()
-                    .StartWithClassicDesktopLifetime(args);
-        }
+        BuildAvaloniaApp()
+                .StartWithClassicDesktopLifetime(args);
+    }
 
-        private static void CheckTest(string[] args)
+    private static void CheckTest(string[] args)
+    {
+        if (args.Length > 0 && args[0] == "--test")
         {
-            if (args.Length > 0 && args[0] == "--test")
+            try
             {
-                try
-                {
-                    Console.WriteLine("Test passed");
-                }
-                catch (Exception e)
-                {
-                    Console.Error.WriteLine($"Test failed: {e.Message}");
-                    Environment.Exit(1);
-                }
-                return;
+                Console.WriteLine("Test passed");
             }
+            catch (Exception e)
+            {
+                Console.Error.WriteLine($"Test failed: {e.Message}");
+                Environment.Exit(1);
+            }
+            return;
         }
-
-        // Avalonia configuration, don't remove; also used by visual designer.
-        public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>()
-                .UsePlatformDetect()
-                .LogToTrace()
-                .WithInterFont();
     }
+
+    // Avalonia configuration, don't remove; also used by visual designer.
+    public static AppBuilder BuildAvaloniaApp()
+        => AppBuilder.Configure<App>()
+            .UsePlatformDetect()
+            .LogToTrace()
+            .WithInterFont();
 }
diff --git a/SkEditor/SkEditor.csproj b/SkEditor/SkEditor.csproj
@@ -8,10 +8,10 @@
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<ApplicationIcon>SkEditor.ico</ApplicationIcon>
 		<PublishSingleFile>true</PublishSingleFile>
-		<AssemblyVersion>2.8.1</AssemblyVersion>
-		<FileVersion>2.8.1</FileVersion>
-		<Version>2.8.1</Version>
-		<InformationalVersion>2.8.1</InformationalVersion>
+		<AssemblyVersion>2.8.2</AssemblyVersion>
+		<FileVersion>2.8.2</FileVersion>
+		<Version>2.8.2</Version>
+		<InformationalVersion>2.8.2</InformationalVersion>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
@@ -44,31 +44,31 @@
 
 	<ItemGroup>
 		<PackageReference Include="AsyncImageLoader.Avalonia" Version="3.3.0" />
-		<PackageReference Include="Avalonia" Version="11.1.3" />
-		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.3" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
-		<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.1.3" />
-		<PackageReference Include="Avalonia.Svg.Skia" Version="11.1.0" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
-		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.3" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0" />
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+		<PackageReference Include="Avalonia" Version="11.2.2" />
+		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
+		<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.2.2" />
+		<PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0.2" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2" />
+		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.2" />
+		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0.1" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
 
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
-		<PackageReference Condition="'$(Configuration)' == 'Release'" Include="Avalonia.Controls.DataGrid" Version="11.1.1" />
-		<PackageReference Condition="'$(Configuration)' == 'Release'" Include="Avalonia.Controls.ColorPicker" Version="11.1.1" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.0" />
+		<PackageReference Condition="'$(Configuration)' == 'Release'" Include="Avalonia.Controls.DataGrid" Version="11.2.2" />
+		<PackageReference Condition="'$(Configuration)' == 'Release'" Include="Avalonia.Controls.ColorPicker" Version="11.2.2" />
 		<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
-		<PackageReference Include="FluentIcons.Avalonia.Fluent" Version="1.1.253" />
+		<PackageReference Include="FluentIcons.Avalonia.Fluent" Version="1.1.266" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="NuGet.Protocol" Version="6.11.0" />
+		<PackageReference Include="NuGet.Protocol" Version="6.12.1" />
 		<PackageReference Include="Octokit" Version="13.0.1" />
 		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-		<PackageReference Include="SkAvaloniaEdit" Version="11.0.7" />
+		<PackageReference Include="SkAvaloniaEdit" Version="11.1.0" />
 		<PackageReference Include="SkFluentAvalonia" Version="2.0.5.3" />
 		<PackageReference Include="SpacedGrid-Avalonia" Version="11.0.0" />
-		<PackageReference Include="Svg.Skia" Version="2.0.0" />
-		<PackageReference Include="System.Threading.AccessControl" Version="9.0.0-preview.5.24306.7" />
+		<PackageReference Include="Svg.Skia" Version="2.0.0.4" />
+		<PackageReference Include="System.Threading.AccessControl" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -105,6 +105,10 @@
 		<Compile Update="Controls\EnchantSelector.axaml.cs">
 			<DependentUpon>EnchantSelector.axaml</DependentUpon>
 		</Compile>
+		<Compile Update="Views\TerminalWindow.axaml.cs">
+		  <SubType>Code</SubType>
+		  <DependentUpon>TerminalWindow.axaml</DependentUpon>
+		</Compile>
 		<Compile Update="Views\GoToLineWindow.axaml.cs">
 		  <DependentUpon>GoToLineWindow.axaml</DependentUpon>
 		</Compile>
@@ -173,6 +177,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <AvaloniaXaml Update="Views\TerminalWindow.axaml">
+	    <SubType>Designer</SubType>
+	  </AvaloniaXaml>
 	  <AvaloniaXaml Update="Views\ColorSelectionWindow.axaml">
 	    <SubType>Designer</SubType>
 	  </AvaloniaXaml>