Skip to content

Commit 2f2fdaa

Browse files
NotroDevNotroDev
authored
Merge pull request #125 from SkEditorTeam/dev/dev
v2.8.2
2 parents 656da60 + e2e59c4 commit 2f2fdaa

21 files changed

+402
-156
lines changed

‎Installer/Folders.wxs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2-
<Fragment>
3-
<StandardDirectory Id="ProgramFiles6432Folder">
4-
<Directory Id="INSTALLFOLDER" Name="!(bind.Property.ProductName)">
5-
<Directory Id="LanguagesFolder" Name="Languages"/>
6-
</Directory>
7-
</StandardDirectory>
8-
</Fragment>
9-
</Wix>
2+
<Fragment>
3+
<StandardDirectory Id="ProgramFiles6432Folder">
4+
<Directory Id="INSTALLFOLDER" Name="!(bind.Property.ProductName)" />
5+
</StandardDirectory>
6+
</Fragment>
7+
</Wix>

‎Installer/LanguagesComponents.wxs

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎Installer/Package.wxs

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
1-
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
2-
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
3-
<Package Name="SkEditor" Manufacturer="Notro" Version="2.8.1" UpgradeCode="14564974-da58-4917-8a0d-590043f589c2">
4-
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
1+
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
2+
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
3+
<Package Name="SkEditor"
4+
Manufacturer="Notro"
5+
Version="2.8.2"
6+
UpgradeCode="14564974-da58-4917-8a0d-590043f589c2">
57
<MediaTemplate EmbedCab="yes" />
68

79
<Feature Id="Main">
810
<ComponentGroupRef Id="SkEditorComponents" />
9-
<ComponentGroupRef Id="LanguagesComponents" />
1011
</Feature>
1112

1213
<ui:WixUI
13-
Id="SkEditorInstaller_InstallDir"
14-
InstallDirectory="INSTALLFOLDER"/>
15-
14+
Id="SkEditorInstaller_InstallDir"
15+
InstallDirectory="INSTALLFOLDER" />
16+
1617
<UIRef Id="WixUI_ErrorProgressText" />
1718

18-
<WixVariable
19-
Id="WixUIDialogBmp"
20-
Value="Assets/background.png"/>
21-
22-
<WixVariable
23-
Id="WixUIBannerBmp"
24-
Value="Assets/top.png"/>
25-
26-
<WixVariable
27-
Id="WixUIExclamationIco"
28-
Value="Assets/Warning.ico"/>
29-
30-
<WixVariable
31-
Id="WixUIInfoIco"
32-
Value="Assets/Info.ico"/>
19+
<WixVariable Id="WixUIDialogBmp"
20+
Value="Assets/background.png" />
21+
22+
<WixVariable Id="WixUIBannerBmp"
23+
Value="Assets/top.png" />
24+
25+
<WixVariable Id="WixUIExclamationIco"
26+
Value="Assets/Warning.ico" />
27+
28+
<WixVariable Id="WixUIInfoIco"
29+
Value="Assets/Info.ico" />
3330
</Package>
34-
</Wix>
31+
</Wix>

‎Installer/SkEditorComponents.wxs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
22
<Fragment>
33
<ComponentGroup Id="SkEditorComponents" Directory="INSTALLFOLDER">
4+
<Files Include="..\SkEditor\bin\Release\publish\win\**">
5+
<Exclude Files="..\SkEditor\bin\Release\publish\win\SkEditor.exe" />
6+
</Files>
7+
48
<Component>
59
<File Source="..\SkEditor\bin\Release\publish\win\SkEditor.exe"/>
610
<Shortcut Name="SkEditor" Directory="DesktopFolder" Advertise="yes" Icon="SkEditorIcon.exe" />
711
<Shortcut Name="SkEditor" Directory="ProgramMenuFolder" Advertise="yes" Icon="SkEditorIcon.exe" />
812
</Component>
9-
<Component>
10-
<File Source="..\SkEditor\bin\Release\publish\win\av_libglesv2.dll" />
11-
</Component>
12-
<Component>
13-
<File Source="..\SkEditor\bin\Release\publish\win\libHarfBuzzSharp.dll" />
14-
</Component>
15-
<Component>
16-
<File Source="..\SkEditor\bin\Release\publish\win\libSkiaSharp.dll" />
17-
</Component>
1813
</ComponentGroup>
1914

2015
<Icon Id="SkEditorIcon.exe" SourceFile="Assets/SkEditor.ico"/>
2116
<Property Id="ARPPRODUCTICON" Value="SkEditorIcon.exe" />
2217
</Fragment>
23-
</Wix>
18+
</Wix>

‎Installer/SkEditorInstaller.wixproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<Project Sdk="WixToolset.Sdk/4.0.3">
1+
<Project Sdk="WixToolset.Sdk/5.0.2">
22
<ItemGroup>
33
<Content Include="Assets\Info.ico" />
44
<Content Include="Assets\Warning.ico" />
55
</ItemGroup>
66
<ItemGroup>
7-
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.6" />
8-
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.3" />
7+
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0.1" />
8+
<PackageReference Include="WixToolset.UI.wixext" Version="5.0.2" />
99
</ItemGroup>
1010
</Project>

‎SkEditor/App.axaml.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public override async void OnFrameworkInitializationCompleted()
2929
{
3030
base.OnFrameworkInitializationCompleted();
3131

32+
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
33+
3234
Log.Logger = new LoggerConfiguration()
3335
.MinimumLevel.Debug()
3436
.WriteTo.File(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),

‎SkEditor/Controls/SideBarControl.axaml.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using Avalonia;
12
using Avalonia.Controls;
23
using Avalonia.Media;
34
using CommunityToolkit.Mvvm.Input;
@@ -76,6 +77,8 @@ private Button CreatePanelButton(SidebarPanel panel)
7677
SkEditorAPI.Windows.GetMainWindow().CoreGrid.ColumnDefinitions[1].MaxWidth = 0;
7778
SkEditorAPI.Windows.GetMainWindow().CoreGrid.ColumnDefinitions[1].MinWidth = 0;
7879

80+
SkEditorAPI.Windows.GetMainWindow().SideBar.Margin = new Thickness(0, 0, 0, 0);
81+
7982
return;
8083
}
8184

@@ -97,6 +100,8 @@ private Button CreatePanelButton(SidebarPanel panel)
97100

98101
SkEditorAPI.Windows.GetMainWindow().CoreGrid.ColumnDefinitions[1].MinWidth = _currentPanel.DesiredWidth;
99102
SkEditorAPI.Windows.GetMainWindow().CoreGrid.ColumnDefinitions[1].MaxWidth = int.MaxValue;
103+
104+
SkEditorAPI.Windows.GetMainWindow().SideBar.Margin = new Thickness(0, 0, 10, 0);
100105
})
101106
};
102107

‎SkEditor/Controls/Sidebar/ExplorerSidebarPanel.axaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
xmlns:ui="using:FluentAvalonia.UI.Controls"
66
xmlns:ar="clr-namespace:SkEditor.Utilities.Projects"
77
xmlns:elements="clr-namespace:SkEditor.Utilities.Projects.Elements"
8-
x:Class="SkEditor.Controls.Sidebar.ExplorerSidebarPanel"
9-
Margin="10,0,0,0">
8+
x:Class="SkEditor.Controls.Sidebar.ExplorerSidebarPanel">
109

1110
<UserControl.Styles>
1211
<Style Selector="Button.barButton">
@@ -81,7 +80,7 @@
8180
<MenuItem Header="{DynamicResource MenuHeaderRename}" Command="{Binding RenameCommand}">
8281
<MenuItem.Icon><ui:SymbolIcon Symbol="Rename" FontSize="20"></ui:SymbolIcon></MenuItem.Icon>
8382
</MenuItem>
84-
<MenuItem Header="{DynamicResource MenuHeaderDelete}" Command="{Binding DeleteCommand}">
83+
<MenuItem Header="{DynamicResource MenuHeaderDeleteFromDisk}" Command="{Binding DeleteCommand}">
8584
<MenuItem.Icon><ui:SymbolIcon Symbol="Delete" FontSize="20"></ui:SymbolIcon></MenuItem.Icon>
8685
</MenuItem>
8786
</MenuFlyout>

‎SkEditor/Controls/Sidebar/ParserSidebarPanel.axaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
xmlns:ui="using:FluentAvalonia.UI.Controls"
44
xmlns:parser="clr-namespace:SkEditor.Utilities.Parser"
55
xmlns:viewModels="clr-namespace:SkEditor.Utilities.Parser.ViewModels"
6-
x:Class="SkEditor.Controls.Sidebar.ParserSidebarPanel"
7-
Margin="10,0,0,0">
6+
x:Class="SkEditor.Controls.Sidebar.ParserSidebarPanel">
87

98
<UserControl.Styles>
109
<Style Selector="Button.barButton">

‎SkEditor/Languages/English.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<system:String x:Key="MenuHeaderRefreshSyntax">Refresh syntax</system:String>
6767

6868
<!-- Project Menu -->
69+
<system:String x:Key="MenuHeaderDeleteFromDisk">Delete from Disk</system:String>
6970
<system:String x:Key="MenuHeaderOpenInExplorer">Open in explorer</system:String>
7071
<system:String x:Key="MenuHeaderCopyPath">Copy relative path</system:String>
7172
<system:String x:Key="MenuHeaderCopyAbsolutePath">Copy absolute path</system:String>

0 commit comments

Comments
 (0)