diff --git a/README.md b/README.md index c735f2f..45a238c 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,13 @@ Have fun! - SirRickster - Icons from [SVG REPO](https://www.svgrepo.com/): - Blivesta in MIT License + - Dazzle Ui in CC Attribution License - Kde in GPL License + - Konstantin Filatov in CC Attribution + - Mohamed Raouf in CC Attribution License + - Phosphor in MIT License - Steve Schoger in PD License - Thewolfkit in CC Attribution License - Wishforge.games in CC Attribution License + - Yamatsum in MIT License - Zest in MIT License - - Mohamed Raouf in CC Attribution License diff --git a/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs b/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs index 520885e..4970903 100644 --- a/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs +++ b/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs @@ -12,8 +12,8 @@ public ZXAboutDialog() { InitializeComponent(); - txtBuild.Text = "1.6.0-beta2"; - txtDate.Text = "2025-05-02"; + txtBuild.Text = "1.6.0-beta3"; + txtDate.Text = "2025-05-13"; btnClose.Click += BtnClose_Click; diff --git a/ZXBStudio/MainWindow.axaml b/ZXBStudio/MainWindow.axaml index c291296..e56c76f 100644 --- a/ZXBStudio/MainWindow.axaml +++ b/ZXBStudio/MainWindow.axaml @@ -88,9 +88,28 @@ - + + + + + + + + + + + + + + + + + + + + - + diff --git a/ZXBStudio/MainWindow.axaml.cs b/ZXBStudio/MainWindow.axaml.cs index 668fd82..31345cc 100644 --- a/ZXBStudio/MainWindow.axaml.cs +++ b/ZXBStudio/MainWindow.axaml.cs @@ -165,8 +165,20 @@ public MainWindow() mnuAllToolsView.Click += ToolsLayout; mnuDebugView.Click += DebugLayout; mnuPlayView.Click += PlayLayout; - mnuRepo.Click += OpenRepository; - mnuZXHelp.Click += OpenZXHelp; + + mnuDocumentation_Book.Click += MnuDocumentation_Book_Click; + mnuDocumentation_Boriel.Click += MnuDocumentation_Boriel_Click; + mnuDocumentation_Libro.Click += MnuDocumentation_Libro_Click; + mnuDownload_Boriel.Click += MnuDownload_Boriel_Click; + mnuDownload_ZXBS.Click += MnuDownload_ZXBS_Click; + mnuGitHub_Boriel.Click += MnuGitHub_Boriel_Click; + mnuGitHub_ZXBS.Click += MnuGitHub_ZXBS_Click; + mnuSocial_Forum.Click += MnuSocial_Forum_Click; + mnuSocial_TelegramEN.Click += MnuSocial_TelegramEN_Click; + mnuSocial_TelegramES.Click += MnuSocial_TelegramES_Click; + mnuSocial_Discord.Click += MnuSocial_Discord_Click; + mnuReportBug.Click += MnuReportBug_Click; + mnuAbout.Click += OpenAbout; #endregion @@ -290,6 +302,7 @@ public MainWindow() ZXLayoutPersister.RestoreLayout(grdMain, dockLeft, dockRight, dockBottom, new[] { _playerDock }); } + private void OpenAbout(object? sender, RoutedEventArgs e) { ZXAboutDialog zXAboutDialog = new ZXAboutDialog(); @@ -660,7 +673,7 @@ private async void OpenLastProject(object? sender, Avalonia.Interactivity.Routed if (!FileInfo.ProjectLoaded && string.IsNullOrEmpty(ZXOptions.Current.LastProjectPath) == false) { - + ZXProjectManager.OpenProject(ZXOptions.Current.LastProjectPath); Cleanup(); @@ -673,7 +686,7 @@ private async void OpenLastProject(object? sender, Avalonia.Interactivity.Routed FileInfo.FileSystemObjectSelected = false; EmulatorInfo.CanRun = true; EmulatorInfo.CanDebug = true; - + } } @@ -1481,7 +1494,7 @@ private async void BuildAndRun(object? sender, Avalonia.Interactivity.RoutedEven process.StartInfo.WorkingDirectory = project.ProjectPath; process.StartInfo.UseShellExecute = true; process.StartInfo.CreateNoWindow = false; - outLog.Writer.WriteLine(process.StartInfo.FileName+" "+process.StartInfo.Arguments); + outLog.Writer.WriteLine(process.StartInfo.FileName + " " + process.StartInfo.Arguments); process.Start(); process.WaitForExit(); } @@ -1507,10 +1520,11 @@ private async void BuildAndRun(object? sender, Avalonia.Interactivity.RoutedEven errorMsg = "There is no valid emulator configured for Next. Please configure an emulator (CSpect or ZEsarUX) from the Tools -> Options menu."; break; } - } catch(Exception ex) + } + catch (Exception ex) { errorMsg = "Error executing emulator"; - } + } } Dispatcher.UIThread.InvokeAsync(async () => @@ -2361,6 +2375,85 @@ private async void Next_PaletteBuilder(object? sender, Avalonia.Interactivity.Ro } #endregion + + + + #region Help menu + + + private void MnuSocial_Discord_Click(object? sender, RoutedEventArgs e) + { + OpenUrl("https://discord.com/channels/556228195767156758/745427274123444224"); + } + + + private void MnuSocial_TelegramES_Click(object? sender, RoutedEventArgs e) + { + + OpenUrl("https://t.me/+dSbWL8z8ol1lMjA0"); + } + + + private void MnuSocial_TelegramEN_Click(object? sender, RoutedEventArgs e) + { + OpenUrl("https://t.me/+ag4E7W05dvRkZmZk"); + } + + + private void MnuSocial_Forum_Click(object? sender, RoutedEventArgs e) + { + OpenUrl("https://www.boriel.com/forum/index.php"); + } + + + private void MnuGitHub_ZXBS_Click(object? sender, RoutedEventArgs e) + { + OpenUrl("https://github.com/boriel-basic/ZXBasicStudio"); + } + + + private void MnuGitHub_Boriel_Click(object? sender, RoutedEventArgs e) + { + OpenUrl("https://github.com/boriel-basic/zxbasic"); + } + + + private void MnuDownload_ZXBS_Click(object? sender, RoutedEventArgs e) + { + OpenUrl("https://github.com/boriel-basic/ZXBasicStudio/releases"); + } + + + private void MnuDownload_Boriel_Click(object? sender, RoutedEventArgs e) + { + OpenUrl("https://zxbasic.readthedocs.io/en/latest/archive/"); + } + + + private void MnuDocumentation_Libro_Click(object? sender, RoutedEventArgs e) + { + OpenUrl("https://www.amazon.es/Boriel-Basic-para-ZX-Spectrum/dp/B0CQD65FXZ"); + } + + private void MnuDocumentation_Boriel_Click(object? sender, RoutedEventArgs e) + { + OpenUrl("https://zxbasic.readthedocs.io/en/latest/"); + } + + private void MnuDocumentation_Book_Click(object? sender, RoutedEventArgs e) + { + OpenUrl("https://www.amazon.co.uk/dp/B0DBF4BHXY"); + } + + + private void MnuReportBug_Click(object? sender, RoutedEventArgs e) + { + OpenUrl("https://github.com/boriel-basic/ZXBasicStudio/issues"); + } + + + #endregion + } public enum PreferredSourceType diff --git a/ZXBStudio/Svg/White/ZX.svg b/ZXBStudio/Svg/White/ZX.svg new file mode 100644 index 0000000..cca758a --- /dev/null +++ b/ZXBStudio/Svg/White/ZX.svg @@ -0,0 +1,10 @@ + + + + Layer 1 + + + ZX + ZX + + \ No newline at end of file diff --git a/ZXBStudio/Svg/White/ZXBS.svg b/ZXBStudio/Svg/White/ZXBS.svg new file mode 100644 index 0000000..258063e --- /dev/null +++ b/ZXBStudio/Svg/White/ZXBS.svg @@ -0,0 +1,10 @@ + + + + Layer 1 + + + ZX + O + + \ No newline at end of file diff --git a/ZXBStudio/Svg/White/book.svg b/ZXBStudio/Svg/White/book.svg new file mode 100644 index 0000000..ae8d75a --- /dev/null +++ b/ZXBStudio/Svg/White/book.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/ZXBStudio/Svg/White/chat.svg b/ZXBStudio/Svg/White/chat.svg new file mode 100644 index 0000000..f6bb894 --- /dev/null +++ b/ZXBStudio/Svg/White/chat.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/ZXBStudio/Svg/White/circle-info-solid.svg b/ZXBStudio/Svg/White/circle-info-solid.svg index 1b20578..f28ab52 100644 --- a/ZXBStudio/Svg/White/circle-info-solid.svg +++ b/ZXBStudio/Svg/White/circle-info-solid.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/ZXBStudio/Svg/White/discord.svg b/ZXBStudio/Svg/White/discord.svg new file mode 100644 index 0000000..4921883 --- /dev/null +++ b/ZXBStudio/Svg/White/discord.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ZXBStudio/Svg/White/download.svg b/ZXBStudio/Svg/White/download.svg new file mode 100644 index 0000000..cd322a5 --- /dev/null +++ b/ZXBStudio/Svg/White/download.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/ZXBStudio/Svg/White/error.svg b/ZXBStudio/Svg/White/error.svg new file mode 100644 index 0000000..cfb7f01 --- /dev/null +++ b/ZXBStudio/Svg/White/error.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ZXBStudio/Svg/White/telegram.svg b/ZXBStudio/Svg/White/telegram.svg new file mode 100644 index 0000000..e59337f --- /dev/null +++ b/ZXBStudio/Svg/White/telegram.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/ZXBStudio/ZXBasicStudio.csproj b/ZXBStudio/ZXBasicStudio.csproj index 2f96d43..2c38e46 100644 --- a/ZXBStudio/ZXBasicStudio.csproj +++ b/ZXBStudio/ZXBasicStudio.csproj @@ -209,6 +209,7 @@ + @@ -216,6 +217,7 @@ + @@ -227,9 +229,12 @@ + + + @@ -268,11 +273,14 @@ + + + @@ -351,6 +359,11 @@ + + + + + @@ -522,11 +535,14 @@ + + +