Skip to content

Commit bf344ab

Browse files
DuefectuDuefectu
authored
Merge pull request #38 from boriel-basic/features/installer
Features/installer
2 parents 497c300 + 9791882 commit bf344ab

25 files changed

Lines changed: 327 additions & 1088 deletions

‎ZXBSInstaller.Log/InstallerResources/zxbasic.scr.0.png‎

-2.11 KB
Binary file not shown.

‎ZXBSInstaller.Log/InstallerResources/zxbasic.scr.1.png‎

-469 KB
Binary file not shown.

‎ZXBSInstaller.Log/InstallerResources/zxbasic.scr.2.png‎

-15.3 KB
Binary file not shown.

‎ZXBSInstaller.Log/InstallerResources/zxbasic.scr.3.png‎

-67.2 KB
Binary file not shown.

‎ZXBSInstaller.Log/ZXBSInstaller.Log.csproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,9 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<Content Include="InstallerResources\zxbasic.scr.0.png">
15-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
16-
</Content>
1714
<Content Include="InstallerResources\zxbasic.png">
1815
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1916
</Content>
20-
<Content Include="InstallerResources\zxbasic.scr.3.png">
21-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
22-
</Content>
23-
<Content Include="InstallerResources\zxbasic.scr.2.png">
24-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
25-
</Content>
26-
<Content Include="InstallerResources\zxbasic.scr.1.png">
27-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
28-
</Content>
2917
<Content Include="InstallerResources\zxbsinstaller.png">
3018
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3119
</Content>

‎ZXBSInstaller/Controls/ConfigControl.axaml‎

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

‎ZXBSInstaller/Controls/ConfigControl.axaml.cs‎

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

‎ZXBSInstaller/Controls/MainControl.axaml‎

Lines changed: 46 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,57 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5-
xmlns:controls="clr-namespace:ZXBSInstaller.Controls"
6-
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
5+
mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="600"
76
x:Class="ZXBSInstaller.Controls.MainControl">
8-
<Grid Grid.RowDefinitions="Auto,*">
9-
<TextBlock Text="Select external tool to check" Margin="0,0,0,4"/>
10-
<Grid Grid.ColumnDefinitions="240,4,*" Grid.Row="1">
11-
<Grid Grid.RowDefinitions="*,4,Auto">
12-
<!-- Tools list-->
13-
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
14-
<ListBox x:Name="lstTools" />
15-
</ScrollViewer>
16-
<StackPanel Orientation="Horizontal" Grid.Row="2" >
17-
<Button x:Name="btnConfig" Content="Options" Click="btnConfig_Click"/>
18-
</StackPanel>
19-
</Grid>
7+
<Grid Grid.ColumnDefinitions="*,1,250" Grid.RowDefinitions="Auto,1,*,1,Auto">
8+
<Label x:Name="lblTools" FontSize="20">Tools and components</Label>
9+
<Label x:Name="lblSummary" Grid.Column="2" FontSize="20">Summary</Label>
10+
11+
<Grid Grid.Row="1" Grid.ColumnSpan="3" Background="Gray"></Grid>
12+
13+
<ScrollViewer x:Name="mainTools" Grid.Row="2" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
14+
<WrapPanel x:Name="pnlTools"></WrapPanel>
15+
</ScrollViewer>
16+
17+
<ScrollViewer x:Name="mainVersions" Grid.Row="2" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" IsVisible="False">
18+
<StackPanel x:Name="pnlVersions" Orientation="Vertical"></StackPanel>
19+
</ScrollViewer>
20+
21+
22+
<Grid Grid.Row="2" Grid.Column="1" Background="Gray"></Grid>
2023

21-
<!-- Working Area -->
22-
<Grid x:Name="pnlWorking" Grid.Column="2" Margin="0"></Grid>
24+
<ScrollViewer Grid.Column="2" Grid.Row="2" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
25+
<StackPanel x:Name="pnlSummary" Orientation="Vertical" Margin="4"></StackPanel>
26+
</ScrollViewer>
2327

24-
<!-- Progress Status -->
25-
<Grid x:Name="pnlStatus" Grid.ColumnSpan="3" Margin="0" IsVisible="False">
26-
<Grid Background="Black" Opacity="0.8"></Grid>
27-
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
28-
<TextBlock x:Name="txtStatus" FontSize="14" HorizontalAlignment="Center" Margin="8" Foreground="Yellow" Text="Working..."/>
29-
<ProgressBar x:Name="progressBar" Height="24" Width="300" VerticalAlignment="Center" Minimum="0" Maximum="100" Value="0" />
30-
</StackPanel>
28+
<Grid Grid.Row="3" Grid.ColumnSpan="3" Background="Gray"></Grid>
29+
30+
<Grid Grid.Row="4" Margin="8">
31+
<Grid Grid.ColumnDefinitions="*,Auto" Grid.RowDefinitions="Auto,Auto,Auto,Auto">
32+
<Label x:Name="lblBasePath">Installation path</Label>
33+
<TextBox x:Name="txtBasePath" Grid.Row="1" Margin="0,4,4,0"></TextBox>
34+
<Button x:Name="btnSelectPath" Grid.Column="2" Grid.Row="1" Click="btnSelectPath_Click">...</Button>
35+
<CheckBox x:Name="chkOnlyStableVersions" Grid.Row="2" Margin="0,4,0,0" Content="Show only stable versions (no beta)"/>
36+
<CheckBox x:Name="chkSetZXBSOptions" Grid.Row="3" Margin="0,4,0,0" Content="Update ZX Basic Studio Options"/>
3137
</Grid>
38+
</Grid>
39+
<Grid Grid.Column="2" Grid.Row="4" Margin="8" HorizontalAlignment="Right" VerticalAlignment="Bottom">
40+
<Button x:Name="btnInstall" Click="btnInstall_Click">Install selected components</Button>
41+
</Grid>
42+
43+
<!-- Progress Status -->
44+
<Grid x:Name="pnlStatus" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="0" IsVisible="False">
45+
<Grid Background="Black" Opacity="0.8"></Grid>
46+
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
47+
<TextBlock x:Name="txtStatus" FontSize="14" HorizontalAlignment="Center" Margin="8" Foreground="Yellow" Text="Working..."/>
48+
<ProgressBar x:Name="progressBar" Height="24" Width="300" VerticalAlignment="Center" Minimum="0" Maximum="100" Value="0" />
49+
</StackPanel>
50+
</Grid>
3251

33-
<!-- Modals -->
34-
<Grid x:Name="pnlModalOverlay" Grid.ColumnSpan="3" Margin="0" IsVisible="False">
35-
<Grid Background="Black" Opacity="0.8"></Grid>
36-
<Grid x:Name="pnlModalContainer" />
52+
<!-- Modals -->
53+
<Grid x:Name="pnlModalOverlay" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="0" IsVisible="False">
54+
<Grid Background="Black" Opacity="0.8"></Grid>
55+
<Grid x:Name="pnlModalContainer">
3756
</Grid>
3857
</Grid>
3958
</Grid>

0 commit comments

Comments
 (0)