Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
12 changes: 0 additions & 12 deletions ZXBSInstaller.Log/ZXBSInstaller.Log.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,9 @@
</ItemGroup>

<ItemGroup>
<Content Include="InstallerResources\zxbasic.scr.0.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="InstallerResources\zxbasic.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="InstallerResources\zxbasic.scr.3.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="InstallerResources\zxbasic.scr.2.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="InstallerResources\zxbasic.scr.1.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="InstallerResources\zxbsinstaller.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down
24 changes: 0 additions & 24 deletions ZXBSInstaller/Controls/ConfigControl.axaml

This file was deleted.

89 changes: 0 additions & 89 deletions ZXBSInstaller/Controls/ConfigControl.axaml.cs

This file was deleted.

73 changes: 46 additions & 27 deletions ZXBSInstaller/Controls/MainControl.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,57 @@
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:controls="clr-namespace:ZXBSInstaller.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="600"
x:Class="ZXBSInstaller.Controls.MainControl">
<Grid Grid.RowDefinitions="Auto,*">
<TextBlock Text="Select external tool to check" Margin="0,0,0,4"/>
<Grid Grid.ColumnDefinitions="240,4,*" Grid.Row="1">
<Grid Grid.RowDefinitions="*,4,Auto">
<!-- Tools list-->
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
<ListBox x:Name="lstTools" />
</ScrollViewer>
<StackPanel Orientation="Horizontal" Grid.Row="2" >
<Button x:Name="btnConfig" Content="Options" Click="btnConfig_Click"/>
</StackPanel>
</Grid>
<Grid Grid.ColumnDefinitions="*,1,250" Grid.RowDefinitions="Auto,1,*,1,Auto">
<Label x:Name="lblTools" FontSize="20">Tools and components</Label>
<Label x:Name="lblSummary" Grid.Column="2" FontSize="20">Summary</Label>

<Grid Grid.Row="1" Grid.ColumnSpan="3" Background="Gray"></Grid>

<ScrollViewer x:Name="mainTools" Grid.Row="2" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<WrapPanel x:Name="pnlTools"></WrapPanel>
</ScrollViewer>

<ScrollViewer x:Name="mainVersions" Grid.Row="2" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" IsVisible="False">
<StackPanel x:Name="pnlVersions" Orientation="Vertical"></StackPanel>
</ScrollViewer>


<Grid Grid.Row="2" Grid.Column="1" Background="Gray"></Grid>

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

<!-- Progress Status -->
<Grid x:Name="pnlStatus" Grid.ColumnSpan="3" Margin="0" IsVisible="False">
<Grid Background="Black" Opacity="0.8"></Grid>
<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" />
</StackPanel>
<Grid Grid.Row="3" Grid.ColumnSpan="3" Background="Gray"></Grid>

<Grid Grid.Row="4" Margin="8">
<Grid Grid.ColumnDefinitions="*,Auto" Grid.RowDefinitions="Auto,Auto,Auto,Auto">
<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="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>

<!-- Progress Status -->
<Grid x:Name="pnlStatus" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="0" IsVisible="False">
<Grid Background="Black" Opacity="0.8"></Grid>
<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" />
</StackPanel>
</Grid>

<!-- Modals -->
<Grid x:Name="pnlModalOverlay" Grid.ColumnSpan="3" Margin="0" IsVisible="False">
<Grid Background="Black" Opacity="0.8"></Grid>
<Grid x:Name="pnlModalContainer" />
<!-- Modals -->
<Grid x:Name="pnlModalOverlay" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="0" IsVisible="False">
<Grid Background="Black" Opacity="0.8"></Grid>
<Grid x:Name="pnlModalContainer">
</Grid>
</Grid>
</Grid>
Expand Down
Loading
Loading