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

v1.0.0 stable

Author: Duefectu

README.md

@@ -11,14 +11,21 @@ Documentation will come in the near future, take a look at the book [Boriel Basi
 
 Have fun!
 
-## Credits
+## ZX Basic Studio Team
 - Development team:
   - El Dr. Gusman
   - Boriel
   - Duefectu
   - AdolFITO 
   - HashIron
   - SirRickster
+- Testers:
+  - AbenZaX
+  - Pedro Tomás (Pere)
+  - Jose Daniel Fernandez Santos (Fenix)
+  - Yoruguaman
+
+## Credits
 - Icons from [SVG REPO](https://www.svgrepo.com/):
   - <a href="https://github.com/blivesta/flexicon?ref=svgrepo.com" target="_blank">Blivesta</a> in MIT License
 	- <a href="https://dazzleui.gumroad.com/l/dazzleiconsfree?ref=svgrepo.com" target="_blank">Dazzle Ui</a> in CC Attribution License
@@ -35,3 +42,8 @@ Have fun!
   - <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
+  - <a href="https://github.com/siemens/ix-icons?ref=svgrepo.com" target="_blank">Siemens</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://www.figma.com/community/file/1071678557813409125?ref=svgrepo.com" target="_blank">Ananthanath A X Kalaiism</a> in PD License
+
+

ZXBSInstaller.Log/ServiceLayer.cs

@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
@@ -15,6 +16,7 @@ public override void OnFrameworkInitializationCompleted()
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
+                desktop.ShutdownMode = ShutdownMode.OnMainWindowClose;
                 desktop.MainWindow = new MainWindow();
             }
 

ZXBSInstaller/App.axaml.cs

@@ -33,7 +33,7 @@
 				<Label x:Name="lblBasePath">Installation path</Label>
 				<TextBox x:Name="txtBasePath" Grid.Row="1" Margin="0,4,4,0"></TextBox>
 				<Button x:Name="btnSelectPath" Grid.Column="2" Grid.Row="1" Click="btnSelectPath_Click">...</Button>
-				<CheckBox x:Name="chkOnlyStableVersions" Grid.Row="2" Margin="0,4,0,0" Content="Show only stable versions (no beta)"/>
+				<CheckBox x:Name="chkOnlyStableVersions" Grid.Row="2" Margin="0,4,0,0" Content="Show only stable versions (no beta if possible)"/>
 				<CheckBox x:Name="chkSetZXBSOptions" Grid.Row="3" Margin="0,4,0,0" Content="Update ZX Basic Studio Options"/>
 			</Grid>
 		</Grid>
@@ -49,7 +49,7 @@
 				<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"/>
+						<TextBlock Text="Refresh"/>
 					</StackPanel>
 				</Button>
 			</StackPanel>
@@ -69,14 +69,36 @@
 			<StackPanel Orientation="Vertical" VerticalAlignment="Center">
 				<TextBlock x:Name="txtStatus" FontSize="14" HorizontalAlignment="Center" Margin="8" Foreground="Yellow" Text="Working..."/>
 				<ProgressBar x:Name="progressBar" Height="24" Width="300" VerticalAlignment="Center" Minimum="0" Maximum="100" Value="0" />
+				<Button x:Name="btnCancel" Width="150" Margin="16" Click="btnCancel_Click" HorizontalAlignment="Center">
+					<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+						<svg:Svg Path="/Assets/cancel.svg" Width="20" Margin="0,0,4,0"></svg:Svg>
+						<TextBlock Text="Cancel"/>
+					</StackPanel>
+				</Button>
 			</StackPanel>
 		</Grid>
 
 		<!-- Modals -->
-		<Grid x:Name="pnlModalOverlay" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="0" IsVisible="False">
+		<Grid x:Name="pnlModal" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="0" IsVisible="False">
 			<Grid  Background="Black" Opacity="0.8"></Grid>
-			<Grid x:Name="pnlModalContainer">
-			</Grid>
+			<Border Background="Black" Width="600" Height="300" BorderBrush="White" BorderThickness="1"
+					Padding="16" CornerRadius="8" HorizontalAlignment="Center" VerticalAlignment="Center">
+				<Grid Grid.RowDefinitions="Auto,*,Auto">
+					<Grid>
+						<TextBlock x:Name="txtModalTitle" FontSize="20" Margin="0,0,0,8" Foreground="Yellow" Text="ZXBSInstaller"/>
+					</Grid>
+					<ScrollViewer Grid.Row="1" Margin="4">
+						<TextBlock x:Name="txtModalMessage" FontSize="16" Margin="0,0,0,16" TextWrapping="Wrap" Text=""/>
+					</ScrollViewer>
+					<Button x:Name="btnModalClose" Grid.Row="2" Width="100" HorizontalAlignment="Right" Click="btnModalClose_Click">
+						<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+							<svg:Svg Path="/Assets/cancel.svg" Width="20" Margin="0,0,4,0"></svg:Svg>
+							<TextBlock Text="Cancel"/>
+						</StackPanel>
+					</Button>
+				</Grid>
+			</Border>
 		</Grid>
+
 	</Grid>
 </UserControl>