boriel-basic · Duefectu · May 13, 2025 · May 13, 2025
diff --git a/README.md b/README.md
@@ -21,9 +21,13 @@ Have fun!
   - SirRickster
 - 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
   - <a href="https://github.com/KDE/krita?ref=svgrepo.com" target="_blank">Kde</a> in GPL License
+  - <a href="https://www.figma.com/@thinkcly?ref=svgrepo.com" target="_blank">Konstantin Filatov</a> in CC Attribution
+  - <a href="https://dribbble.com/Mohamed_Raouf?ref=svgrepo.com" target="_blank">Mohamed Raouf</a> in CC Attribution License
+  - <a href="https://github.com/phosphor-icons/phosphor-icons?ref=svgrepo.com" target="_blank">Phosphor</a> in MIT License
   - <a href="https://www.zondicons.com/?ref=svgrepo.com" target="_blank">Steve Schoger</a> in PD License
   - <a href="https://www.figma.com/@thewolfkit?ref=svgrepo.com" target="_blank">Thewolfkit</a> in CC Attribution License
   - <a href="https://www.wishforge.games/?ref=svgrepo.com" target="_blank">Wishforge.games</a> in CC Attribution License
+  - <a href="https://github.com/yamatsum/nonicons?ref=svgrepo.com" target="_blank">Yamatsum</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://dribbble.com/Mohamed_Raouf?ref=svgrepo.com" target="_blank">Mohamed Raouf</a> in CC Attribution License
diff --git 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
@@ -88,9 +88,28 @@
         <MenuItem Header="Restore layout" Name="mnuRestoreLayout" Icon="{SvgImage /Svg/White/clock-rotate-left-solid.svg}"></MenuItem>
       </MenuItem>
       <MenuItem Header="Help">
-        <MenuItem Header="ZX Basic Studio repository" Name="mnuRepo" Icon="{SvgImage /Svg/White/github.svg}"></MenuItem>
+        <MenuItem Header="Documentation" Icon="{SvgImage /Svg/White/book.svg}">
+          <MenuItem Header="Boriel Basic Compiler" Name="mnuDocumentation_Boriel" Icon="{SvgImage /Svg/White/ZX.svg}"></MenuItem>
+          <MenuItem Header="Boriel Basic for ZX Spectrum Book (English)" Name="mnuDocumentation_Book" Icon="{SvgImage /Svg/White/book.svg}"></MenuItem>
+          <MenuItem Header="Libro Boriel Basic para ZX Spectrum (Spanish)" Name="mnuDocumentation_Libro" Icon="{SvgImage /Svg/White/book.svg}"></MenuItem>
+        </MenuItem>
+
+        <MenuItem Header="Downloads" Icon="{SvgImage /Svg/White/download.svg}">
+          <MenuItem Header="ZX Basic Studio" Name="mnuDownload_ZXBS" Icon="{SvgImage /Svg/White/ZXBS.svg}"></MenuItem>
+          <MenuItem Header="Boriel Basic Compiler" Name="mnuDownload_Boriel" Icon="{SvgImage /Svg/White/ZX.svg}"></MenuItem>
+        </MenuItem>
+        <MenuItem Header="Repositories" Icon="{SvgImage /Svg/White/github.svg}">
+          <MenuItem Header="ZX Basic Studio" Name="mnuGitHub_ZXBS" Icon="{SvgImage /Svg/White/ZXBS.svg}"></MenuItem>
+          <MenuItem Header="Boriel Basic Compiler" Name="mnuGitHub_Boriel" Icon="{SvgImage /Svg/White/ZX.svg}"></MenuItem>
+        </MenuItem>
+        <MenuItem Header="Social" Icon="{SvgImage /Svg/White/chat.svg}">
+          <MenuItem Header="Telegram Spanish" Name="mnuSocial_TelegramES" Icon="{SvgImage /Svg/White/telegram.svg}"></MenuItem>
+          <MenuItem Header="Telegram English" Name="mnuSocial_TelegramEN" Icon="{SvgImage /Svg/White/telegram.svg}"></MenuItem>
+          <MenuItem Header="Boriel Basic Forum" Name="mnuSocial_Forum" Icon="{SvgImage /Svg/White/chat.svg}"></MenuItem>
+          <MenuItem Header="Boriel on Next Discord Server" Name="mnuSocial_Discord" Icon="{SvgImage /Svg/White/discord.svg}"></MenuItem>
+        </MenuItem>
         <Separator></Separator>
-        <MenuItem Header="ZX Basic help" Name="mnuZXHelp" Icon="{SvgImage /Svg/White/circle-question-solid.svg}"></MenuItem>
+        <MenuItem Header="Report a bug or suggestion" Name="mnuReportBug" Icon="{SvgImage /Svg/White/error.svg}"></MenuItem>
         <Separator></Separator>
         <MenuItem Header="About..." Name="mnuAbout" Icon="{SvgImage /Svg/White/circle-info-solid.svg}"></MenuItem>
       </MenuItem>

diff --git 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
diff --git a/ZXBStudio/Svg/White/ZXBS.svg b/ZXBStudio/Svg/White/ZXBS.svg
diff --git a/ZXBStudio/Svg/White/book.svg b/ZXBStudio/Svg/White/book.svg
diff --git a/ZXBStudio/Svg/White/chat.svg b/ZXBStudio/Svg/White/chat.svg
diff --git a/ZXBStudio/Svg/White/circle-info-solid.svg b/ZXBStudio/Svg/White/circle-info-solid.svg
diff --git a/ZXBStudio/Svg/White/discord.svg b/ZXBStudio/Svg/White/discord.svg