Merge pull request #49 from boriel-basic/features/installer

Duefectu · web-flow · commit e7df187ed7c4 · 2026-02-18T19:59:08.000+01:00
v0.0.1-beta7

Bugfixed: Tool images are not displayed on Mac.
New "Run ZX Basic Studio" button.
New "Refresh" button.
Added icons to main buttons.
Added tools path to summary area.
diff --git a/MsBox.Avalonia/MsBox.Avalonia.csproj b/MsBox.Avalonia/MsBox.Avalonia.csproj
@@ -26,8 +26,8 @@
         <AvaloniaResource Include="Assets\*" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.3.11" />
-        <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
+        <PackageReference Include="Avalonia" Version="11.3.12" />
+        <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
         <PackageReference Include="DialogHost.Avalonia" Version="0.10.4" />
         <PackageReference Include="Markdown.Avalonia.Tight" Version="11.0.2" />
     </ItemGroup>
diff --git a/README.md b/README.md
@@ -33,3 +33,5 @@ Have fun!
   - <a href="https://www.wishforge.games/?ref=svgrepo.com" target="_blank">Wishforge.games</a> in CC Attribution License
   - <a href="https://github.com/yamatsum/nonicons?ref=svgrepo.com" target="_blank">Yamatsum</a> in MIT License
   - <a href="https://github.com/32pixelsCo/zest-icons/blob/master/packages/zest-free/LICENSE.md?ref=svgrepo.com" target="_blank">Zest</a> in MIT License
+  - <a href="https://github.com/neuicons/neu?ref=svgrepo.com" target="_blank">Neuicons</a> in MIT License via
+  - <a href="https://dazzleui.gumroad.com/l/dazzleiconsfree?ref=svgrepo.com" target="_blank">Dazzle Ui</a> in CC Attribution License
diff --git a/ZXBSInstaller.Log/ServiceLayer.cs b/ZXBSInstaller.Log/ServiceLayer.cs
@@ -1152,5 +1152,35 @@ private static void SetZXBSConfig()
 
         #endregion
 
+
+        public static bool RunZXBasicStudio()
+        {
+            try
+            {
+                var fileName = Path.Combine(GeneralConfig.BasePath, "zxbs", "ZXBasicStudio.exe");
+                if (!File.Exists(fileName))
+                {
+                    fileName = Path.Combine(GeneralConfig.BasePath, "zxbs", "ZXBasicStudio");
+                }
+                if (!File.Exists(fileName))
+                {
+                    ServiceLayer.ShowMessage("ZX Basic Studio executable not found. Please check the installation.");
+                    return false;
+                }
+                ProcessStartInfo psi = new ProcessStartInfo
+                {
+                    FileName = fileName,
+                };
+                using Process process = new Process { StartInfo = psi };
+                process.Start();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ServiceLayer.ShowMessage("Error launching ZX Basic Studio. Please check the installation.");
+                return false;
+            }
+        }
+
     }
 }
diff --git a/ZXBSInstaller.Log/ZXBSInstaller.Log.csproj b/ZXBSInstaller.Log/ZXBSInstaller.Log.csproj
@@ -6,20 +6,4 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="InstallerResources\zxbs.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="InstallerResources\zxbasic.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="InstallerResources\zxbsinstaller.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="InstallerResources\zxbs.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
 </Project>
diff --git a/ZXBSInstaller/Assets/install.svg b/ZXBSInstaller/Assets/install.svg
@@ -0,0 +1,7 @@
+<svg fill="#ffff00" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
+  <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
+  <g id="SVGRepo_iconCarrier">
+    <path d="M22,3H2A1,1,0,0,0,1,4V20c0,.013.007.023.007.036A1.008,1.008,0,0,0,2,21H22a1.013,1.013,0,0,0,.993-.964c0-.013.007-.023.007-.036V4A1,1,0,0,0,22,3ZM21,5V17.586l-2.293-2.293A1,1,0,0,0,18,15H6a1,1,0,0,0-.707.293L3,17.586V5ZM4.414,19l2-2H17.586l2,2ZM8,13a3,3,0,1,0-3-3A3,3,0,0,0,8,13ZM8,9a1,1,0,1,1-1,1A1,1,0,0,1,8,9Zm8,4a3,3,0,1,0-3-3A3,3,0,0,0,16,13Zm0-4a1,1,0,1,1-1,1A1,1,0,0,1,16,9Z"></path>
+  </g>
+</svg>
diff --git a/ZXBSInstaller/Assets/play.svg b/ZXBSInstaller/Assets/play.svg
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
+  <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
+  <g id="SVGRepo_iconCarrier">
+    <path d="M16.6582 9.28638C18.098 10.1862 18.8178 10.6361 19.0647 11.2122C19.2803 11.7152 19.2803 12.2847 19.0647 12.7878C18.8178 13.3638 18.098 13.8137 16.6582 14.7136L9.896 18.94C8.29805 19.9387 7.49907 20.4381 6.83973 20.385C6.26501 20.3388 5.73818 20.0469 5.3944 19.584C5 19.053 5 18.1108 5 16.2264V7.77357C5 5.88919 5 4.94701 5.3944 4.41598C5.73818 3.9531 6.26501 3.66111 6.83973 3.6149C7.49907 3.5619 8.29805 4.06126 9.896 5.05998L16.6582 9.28638Z" stroke="#00ff00" stroke-width="2" stroke-linejoin="round"></path>
+  </g>
+</svg>
diff --git a/ZXBSInstaller/Assets/refresh.svg b/ZXBSInstaller/Assets/refresh.svg
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
+  <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
+  <g id="SVGRepo_iconCarrier">
+    <path d="M21 12C21 16.9706 16.9706 21 12 21C9.69494 21 7.59227 20.1334 6 18.7083L3 16M3 12C3 7.02944 7.02944 3 12 3C14.3051 3 16.4077 3.86656 18 5.29168L21 8M3 21V16M3 16H8M21 3V8M21 8H16" stroke="#00ffff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+  </g>
+</svg>
diff --git a/ZXBSInstaller/Assets/zxbasic.png b/ZXBSInstaller/Assets/zxbasic.png
diff --git a/ZXBSInstaller/Assets/zxbs.png b/ZXBSInstaller/Assets/zxbs.png
diff --git a/ZXBSInstaller/Assets/zxbsinstaller.png b/ZXBSInstaller/Assets/zxbsinstaller.png
diff --git a/ZXBSInstaller/Controls/MainControl.axaml b/ZXBSInstaller/Controls/MainControl.axaml
@@ -2,6 +2,7 @@
 			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 xmlns:svg="using:Avalonia.Svg.Skia"
 			 mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="600"
 			 x:Class="ZXBSInstaller.Controls.MainControl">
 	<Grid Grid.ColumnDefinitions="*,1,250" Grid.RowDefinitions="Auto,1,*,1,Auto">
@@ -36,10 +37,32 @@
 				<CheckBox x:Name="chkSetZXBSOptions" Grid.Row="3" Margin="0,4,0,0" Content="Update ZX Basic Studio Options"/>
 			</Grid>
 		</Grid>
-		<Grid Grid.Column="2" Grid.Row="4" Margin="8" HorizontalAlignment="Right" VerticalAlignment="Bottom">
-			<Button x:Name="btnInstall" Click="btnInstall_Click">Install selected components</Button>
+
+		<Grid Grid.Column="2" Grid.Row="4" Grid.RowDefinitions="*,Auto" Margin="8" HorizontalAlignment="Right">
+			<StackPanel Orientation="Vertical" HorizontalAlignment="Right">
+				<Button x:Name="btnPlayZXBS" Width="200" Click="btnPlayZXBS_Click">
+					<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+						<svg:Svg Path="/Assets/play.svg" Width="20" Margin="0,0,4,0"></svg:Svg>
+						<TextBlock Text="Run ZX Basic Studio"/>
+					</StackPanel>
+				</Button>
+				<Button x:Name="btnRefresh" Width="200" Margin="0,4,0,0" Click="btnRefresh_Click">
+					<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+						<svg:Svg Path="/Assets/refresh.svg" Width="20" Margin="0,0,4,0"></svg:Svg>
+						<TextBlock Text="Refrsh"/>
+					</StackPanel>
+				</Button>
+			</StackPanel>
+
+			<Button x:Name="btnInstall" Grid.Row="1" Width="200" Click="btnInstall_Click">
+				<StackPanel Orientation="Horizontal"  HorizontalAlignment="Center">
+					<svg:Svg Path="/Assets/install.svg" Width="20" Margin="0,0,4,0"></svg:Svg>
+					<TextBlock Text="Install components"/>
+				</StackPanel>
+			</Button>
 		</Grid>
 
+
 		<!-- Progress Status -->
 		<Grid x:Name="pnlStatus" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="0" IsVisible="False">
 			<Grid  Background="Black" Opacity="0.8"></Grid>
diff --git a/ZXBSInstaller/Controls/MainControl.axaml.cs b/ZXBSInstaller/Controls/MainControl.axaml.cs
@@ -1,7 +1,9 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 using MsBox.Avalonia;
@@ -22,7 +24,7 @@ namespace ZXBSInstaller.Controls;
 public partial class MainControl : UserControl
 {
     private List<ToolItemControl> toolItemControls = new List<ToolItemControl>();
-
+    private static Brush Yellow = new SolidColorBrush(Colors.Yellow);
 
     public MainControl()
     {
@@ -103,7 +105,7 @@ private void GetExternalTools()
                     WindowStartupLocation = WindowStartupLocation.CenterOwner
                 });
                 box.ShowAsPopupAsync(this);
-                
+
             }
             else
             {
@@ -152,6 +154,7 @@ private void UpdateSummary()
         {
             pnlSummary.Children.Clear();
             bool allUpToDate = true;
+            // Check for recommended updates/installs
             foreach (var tool in toolItemControls)
             {
                 if (tool.IsSelected)
@@ -177,6 +180,48 @@ private void UpdateSummary()
                 tb.Text = "All tools are up to date.";
                 pnlSummary.Children.Add(tb);
             }
+
+            // Separator
+            {
+                var separator = new Separator()
+                {
+                    Margin = new Thickness(0, 10, 0, 10)
+                };
+                pnlSummary.Children.Add(separator);
+            }
+
+            // Show tools tree
+            {
+                pnlSummary.Children.Add(new TextBlock()
+                {
+                    Text = "Base path:",
+                    Foreground = Yellow
+                });
+                pnlSummary.Children.Add(new TextBlock()
+                {
+                    Text = ServiceLayer.GeneralConfig.BasePath,
+                    Margin = new Thickness(10, 4, 0, 0)
+                });
+            }
+            foreach (var tool in toolItemControls)
+            {
+                var tb = new TextBlock();
+                tb.TextWrapping = Avalonia.Media.TextWrapping.Wrap;
+                if (tool.ExternalTool.InstalledVersion != null)
+                {
+                    pnlSummary.Children.Add(new TextBlock()
+                    {
+                        Text = tool.ExternalTool.Name + ":",
+                        Margin = new Thickness(0, 8, 0, 0),
+                        Foreground = Yellow
+                    });
+                    pnlSummary.Children.Add(new TextBlock()
+                    {
+                        Text = System.IO.Path.Combine(ServiceLayer.GeneralConfig.BasePath, tool.ExternalTool.Id),
+                        Margin = new Thickness(10, 4, 0, 0)
+                    });
+                }
+            }
         });
     }
 
@@ -289,7 +334,7 @@ private void ShowVersions(string id)
                 pnlVersions.Children.Add(btn);
             }
 
-            var versionControlHeader = new VersionControl(null, null,Command_Received);
+            var versionControlHeader = new VersionControl(null, null, Command_Received);
             pnlVersions.Children.Add(versionControlHeader);
             foreach (var version in tool.Versions)
             {
@@ -324,4 +369,21 @@ private void Versions_Close(object? sender, RoutedEventArgs e)
             mainVersions.IsVisible = false;
         });
     }
+
+    private void btnPlayZXBS_Click(object? sender, RoutedEventArgs e)
+    {
+        if (ServiceLayer.RunZXBasicStudio())
+        {
+            if (App.Current?.ApplicationLifetime
+                    is IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                desktop.Shutdown();
+            }
+        }
+    }
+
+    private void btnRefresh_Click(object? sender, RoutedEventArgs e)
+    {
+        new Thread(GetExternalTools).Start();
+    }
 }
diff --git a/ZXBSInstaller/Controls/ToolItemControl.axaml.cs b/ZXBSInstaller/Controls/ToolItemControl.axaml.cs
@@ -25,7 +25,7 @@ public ToolItemControl(ExternalTool tool, Action<string, string> callBackCommand
         ExternalTool = tool;
         Command = callBackCommand;
 
-        UITools.ShowImage($"InstallerResources/{ExternalTool.Id}.png", imgIcon);
+        UITools.ShowImage($"{ExternalTool.Id}.png", imgIcon);
         txtName.Text = tool.Name;
         txtDescription.Text = tool.Description;
         txtPath.Text = "Path: " + tool.LocalPath;
diff --git a/ZXBSInstaller/UITools.cs b/ZXBSInstaller/UITools.cs
@@ -1,5 +1,6 @@
 ﻿using Avalonia.Controls;
 using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -15,8 +16,10 @@ public static void ShowImage(string fileName, Image imgControl)
         {
             try
             {
-                using var stream = File.OpenRead(fileName);
-                imgControl.Source = new Bitmap(stream);
+                var uri= new Uri($"avares://ZXBSInstaller/Assets/{fileName}");
+                var asset=AssetLoader.Open(uri);
+                var bitmap=new Bitmap(asset);
+                imgControl.Source = bitmap;
             }
             catch (Exception ex)
             {
diff --git a/ZXBSInstaller/ZXBSInstaller.csproj b/ZXBSInstaller/ZXBSInstaller.csproj
@@ -6,25 +6,43 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <ApplicationIcon>zxbs.ico</ApplicationIcon>
-    <Version>0.0.1.6</Version>
+    <Version>0.0.1.7</Version>
   </PropertyGroup>
   <ItemGroup>
+    <None Remove="Assets\install.svg" />
+    <None Remove="Assets\play.svg" />
+    <None Remove="Assets\refresh.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <AvaloniaResource Include="Assets\install.svg" />
+    <AvaloniaResource Include="Assets\play.svg" />
+    <AvaloniaResource Include="Assets\refresh.svg" />
     <AvaloniaResource Include="zxbs.ico" />
   </ItemGroup>
   <ItemGroup>
+    <AvaloniaResource Include="Assets\zxbasic.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AvaloniaResource>
+    <AvaloniaResource Include="Assets\zxbs.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </AvaloniaResource>
+    <AvaloniaResource Include="Assets\zxbsinstaller.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AvaloniaResource>
     <Content Include="zxbs.ico" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.11" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.11" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.11" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.11" />
+    <PackageReference Include="Avalonia" Version="11.3.12" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.12" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.11">
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.12">
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ZXBStudio/ZXBasicStudio.csproj b/ZXBStudio/ZXBasicStudio.csproj
@@ -563,13 +563,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.11" />
-    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.11" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.11" />
+    <PackageReference Include="Avalonia" Version="11.3.12" />
+    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.11" />
-    <PackageReference Include="Avalonia.Themes.Simple" Version="11.3.11" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.12" />
+    <PackageReference Include="Avalonia.Themes.Simple" Version="11.3.12" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
diff --git a/ZXBasicStudioTest/ZXBasicStudioTest.csproj b/ZXBasicStudioTest/ZXBasicStudioTest.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
+    <PackageReference Include="coverlet.collector" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
