Skip to content

Commit c190cdc

Browse files
author
Juan Segura
committed
v1.0.0-beta13
Varios cambios en la ficha de herramientas - Añadida más información - Añadido botón abrir sitio - Modificado el diseño de los botones
1 parent 48a352b commit c190cdc

File tree

9 files changed

+73
-13
lines changed

9 files changed

+73
-13
lines changed

‎README.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,19 @@ Documentation will come in the near future, take a look at the book [Boriel Basi
1111

1212
Have fun!
1313

14-
## Credits
14+
## ZX Basic Studio Team
1515
- Development team:
1616
- El Dr. Gusman
1717
- Boriel
1818
- Duefectu
1919
- AdolFITO
2020
- HashIron
2121
- SirRickster
22+
- Testers:
23+
- AbenZaX
24+
- Pedro Tomás (Pere)
25+
26+
## Credits
2227
- Icons from [SVG REPO](https://www.svgrepo.com/):
2328
- <a href="https://github.com/blivesta/flexicon?ref=svgrepo.com" target="_blank">Blivesta</a> in MIT License
2429
- <a href="https://dazzleui.gumroad.com/l/dazzleiconsfree?ref=svgrepo.com" target="_blank">Dazzle Ui</a> in CC Attribution License
@@ -36,3 +41,7 @@ Have fun!
3641
- <a href="https://github.com/neuicons/neu?ref=svgrepo.com" target="_blank">Neuicons</a> in MIT License via
3742
- <a href="https://dazzleui.gumroad.com/l/dazzleiconsfree?ref=svgrepo.com" target="_blank">Dazzle Ui</a> in CC Attribution License
3843
- <a href="https://github.com/siemens/ix-icons?ref=svgrepo.com" target="_blank">Siemens</a> in MIT License
44+
- <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
45+
- <a href="https://www.figma.com/community/file/1071678557813409125?ref=svgrepo.com" target="_blank">Ananthanath A X Kalaiism</a> in PD License
46+
47+

‎ZXBSInstaller.Log/ServiceLayer.cs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -776,10 +776,15 @@ private static string[] GetAllLinks(string url, string pattern)
776776
int retries = 5;
777777
while (retries-- > 0)
778778
{
779-
using (HttpClient client = new HttpClient(handler))
779+
try
780780
{
781-
html = client.GetStringAsync(url).GetAwaiter().GetResult();
781+
using (HttpClient client = new HttpClient(handler))
782+
{
783+
client.Timeout = TimeSpan.FromSeconds(20);
784+
html = client.GetStringAsync(url).GetAwaiter().GetResult();
785+
}
782786
}
787+
catch { }
783788
if (!string.IsNullOrEmpty(html))
784789
{
785790
break;
@@ -1084,6 +1089,11 @@ public static void DownloadAndInstallTool(ExternalTool tool, ExternalTools_Versi
10841089
return;
10851090
}
10861091

1092+
if(tool.Id == "zxbsinstaller")
1093+
{
1094+
ShowStatusPanel($"After installing or updating ZXBSInstaller, run this program from {tool.LocalPath}.");
1095+
}
1096+
10871097
ShowStatusPanel($"Downloading {tool.Name} version {version.Version}...");
10881098

10891099
// Download path

‎ZXBSInstaller/Assets/history.svg‎

Lines changed: 7 additions & 0 deletions
Loading

‎ZXBSInstaller/Assets/internet.svg‎

Lines changed: 7 additions & 0 deletions
Loading

‎ZXBSInstaller/Controls/ToolItemControl.axaml‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,39 @@
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-
Width="360" Height="150"
5+
xmlns:svg="using:Avalonia.Svg.Skia"
6+
Width="360" Height="180"
67
x:Class="ZXBSInstaller.Controls.ToolItemControl"
78
FontSize="12">
89
<Grid Margin="8" Background="#242424">
910
<Grid Grid.ColumnDefinitions="Auto,4,*,4,Auto" Grid.RowDefinitions="Auto,*,Auto,Auto" Margin="4">
1011
<Image x:Name="imgIcon" Grid.RowSpan="3" Width="64" Stretch="Uniform" VerticalAlignment="Top" />
1112
<TextBlock x:Name="txtName" Grid.Column="2" VerticalAlignment="Top" TextWrapping="Wrap" FontSize="14" FontWeight="Bold">Name</TextBlock>
12-
<TextBlock x:Name="txtDescription" Grid.Column="2" Grid.Row="1" VerticalAlignment="Top" TextWrapping="Wrap">Description</TextBlock>
13-
<CheckBox x:Name="chkSelect" Grid.Column="4" VerticalAlignment="Top" IsCheckedChanged="chkSelect_IsCheckedChanged"/>
13+
<ScrollViewer Grid.Column="2" Grid.Row="1">
14+
<StackPanel Orientation="Vertical" Grid.Column="2" Grid.Row="1">
15+
<TextBlock x:Name="txtAuthor" TextWrapping="Wrap" Foreground="LightGray"></TextBlock>
16+
<TextBlock x:Name="txtLicense" TextWrapping="Wrap" Foreground="LightGray"></TextBlock>
17+
<TextBlock x:Name="txtDescription" Grid.Column="2" Grid.Row="1" VerticalAlignment="Top" TextWrapping="Wrap">Description</TextBlock>
18+
</StackPanel>
19+
</ScrollViewer>
20+
<CheckBox x:Name="chkSelect" Grid.Column="4" Grid.RowSpan="2" VerticalAlignment="Top" IsCheckedChanged="chkSelect_IsCheckedChanged"/>
1421

1522
<StackPanel Orientation="Vertical" Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="2" VerticalAlignment="Top" Margin="0,0,50,0">
16-
<TextBlock x:Name="txtPath" TextWrapping="Wrap" IsVisible="False">Path</TextBlock>
23+
<TextBlock x:Name="txtPath" TextWrapping="Wrap" Foreground="LightGray">Path</TextBlock>
1724
<TextBlock x:Name="txtActual">Installed version:</TextBlock>
1825
<TextBlock x:Name="txtLatest">Latest version:</TextBlock>
1926
</StackPanel>
2027

21-
<Button x:Name="btnAllVersions" Grid.ColumnSpan="5" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Bottom" Click="btnAllVersions_Click">Versions</Button>
28+
<StackPanel Orientation="Horizontal" Grid.ColumnSpan="5" Grid.Row="2" HorizontalAlignment="Right">
29+
<Button x:Name="btnViewSite" ToolTip.Tip="Visit the project page" Margin="0,0,4,0"
30+
HorizontalAlignment="Right" VerticalAlignment="Bottom" Click="btnViewSite_Click">
31+
<svg:Svg Path="/Assets/internet.svg" Width="20" Margin="00"></svg:Svg>
32+
</Button>
33+
<Button x:Name="btnAllVersions" ToolTip.Tip="View all available versions"
34+
HorizontalAlignment="Right" VerticalAlignment="Bottom" Click="btnAllVersions_Click">
35+
<svg:Svg Path="/Assets/history.svg" Width="20" Margin="00"></svg:Svg>
36+
</Button>
37+
</StackPanel>
2238
</Grid>
2339
</Grid>
2440
</UserControl>

‎ZXBSInstaller/Controls/ToolItemControl.axaml.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Avalonia.Markup.Xaml;
44
using Avalonia.Media;
55
using System;
6+
using ZXBSInstaller.Log;
67
using ZXBSInstaller.Log.Neg;
78

89
namespace ZXBSInstaller.Controls;
@@ -50,7 +51,8 @@ public ToolItemControl(ExternalTool tool, Action<string, string> callBackCommand
5051
txtName.Text = tool.Name;
5152
txtDescription.Text = tool.Description;
5253
txtPath.Text = "Path: " + tool.LocalPath;
53-
54+
txtLicense.Text = "Licence: " + tool.LicenseType;
55+
txtAuthor.Text = "Author(s): " + tool.Author;
5456
// Set chkSelect status
5557
IsSelected = tool.UpdateNeeded;
5658
tool.IsSelected = IsSelected;
@@ -109,4 +111,9 @@ private void btnAllVersions_Click(object? sender, Avalonia.Interactivity.RoutedE
109111
{
110112
Command(ExternalTool.Id, "VERSIONS");
111113
}
114+
115+
private void btnViewSite_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
116+
{
117+
ServiceLayer.OpenUrlInBrowser(ExternalTool.SiteUrl);
118+
}
112119
}

‎ZXBSInstaller/ExternalTools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"Enabled": true,
2525
"Name": "Boriel ZX Basic Compiler",
2626
"Author": "Boriel",
27-
"Description": "ZXBCompiler is a ZX Spectrum BASIC cross compiler that translates ZX Spectrum BASIC code into optimized machine code, enabling faster execution and enhanced performance on ZX Spectrum systems. This tool is required to run and debug programs.",
27+
"Description": "ZXBCompiler is a BORIEL BASIC cross compiler tool. It's a required tool.'",
2828
"SupportedOperatingSystems": [
2929
1,
3030
2,
@@ -44,7 +44,7 @@
4444
"Enabled": true,
4545
"Name": "ZX Basic Studio",
4646
"Author": "Dr.Gusman, Boriel, Duefectu, AdolFITO, Hash6Iron and SirRickster",
47-
"Description": "IDE (Integrated Development Environment) with Boriel Basic code editor, Assembler, UDGs, fonts, sprites, .tap editor, debugger, emulator, etc. This tool is optional but highly recommended.",
47+
"Description": "IDE (Integrated Development Environment) with code editor, Assembler, UDGs, fonts, sprites, .tap editor, debugger, emulator, etc.",
4848
"SupportedOperatingSystems": [
4949
1,
5050
2,

‎ZXBSInstaller/ZXBSInstaller.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,23 @@
66
<ApplicationManifest>app.manifest</ApplicationManifest>
77
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
88
<ApplicationIcon>zxbs.ico</ApplicationIcon>
9-
<Version>1.0.0.12</Version>
9+
<Version>1.0.0.13</Version>
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<None Remove="Assets\cancel.svg" />
13+
<None Remove="Assets\history.svg" />
1314
<None Remove="Assets\install.svg" />
15+
<None Remove="Assets\internet.svg" />
1416
<None Remove="Assets\play.svg" />
1517
<None Remove="Assets\refresh.svg" />
1618
<None Remove="ExternalTools.json" />
1719
<None Remove="version.txt" />
1820
</ItemGroup>
1921
<ItemGroup>
2022
<AvaloniaResource Include="Assets\cancel.svg" />
23+
<AvaloniaResource Include="Assets\history.svg" />
2124
<AvaloniaResource Include="Assets\install.svg" />
25+
<AvaloniaResource Include="Assets\internet.svg" />
2226
<AvaloniaResource Include="Assets\play.svg" />
2327
<AvaloniaResource Include="Assets\refresh.svg" />
2428
<AvaloniaResource Include="zxbs.ico" />

‎ZXBSInstaller/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0.12
1+
1.0.0.13

0 commit comments

Comments
 (0)