ZXBSInstaller update for NEXT ROM on MAME

README.md

@@ -46,23 +46,21 @@ This solution contains several projects that work together to provide the ZX Bas
 
 ## Credits
 - Icons from [SVG REPO](https://www.svgrepo.com/):
+  - <a href="https://www.svgrepo.com" target="_blank">SVG Repo</a> CC0 License
+  - <a href="https://www.figma.com/community/file/1071678557813409125?ref=svgrepo.com" target="_blank">Ananthanath A X Kalaiism</a> in PD License
   - <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://www.figma.com/@thinkcly?ref=svgrepo.com" target="_blank">Konstantin Filatov</a> in CC Attribution License
+  - <a href="https://github.com/krystonschwarze/coolicons?ref=svgrepo.com" target="_blank">Krystonschwarze</a> in CC Attribution License
   - <a href="https://dribbble.com/Mohamed_Raouf?ref=svgrepo.com" target="_blank">Mohamed Raouf</a> in CC Attribution License
+  - <a href="https://github.com/neuicons/neu?ref=svgrepo.com" target="_blank">Neuicons</a> in MIT License via
   - <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://github.com/siemens/ix-icons?ref=svgrepo.com" target="_blank">Siemens</a> in MIT License
   - <a href="https://www.figma.com/@thewolfkit?ref=svgrepo.com" target="_blank">Thewolfkit</a> in CC Attribution License
   - <a href="https://github.com/UXAspects/UXAspects?ref=svgrepo.com" target="_blank">Uxaspects</a> in Apache License
   - <a href="https://github.com/uxwb/icons?ref=svgrepo.com" target="_blank">Uxwb</a> in GPL 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://github.com/neuicons/neu?ref=svgrepo.com" target="_blank">Neuicons</a> in MIT License via
-  - <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/siemens/ix-icons?ref=svgrepo.com" target="_blank">Siemens</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://www.figma.com/community/file/1071678557813409125?ref=svgrepo.com" target="_blank">Ananthanath A X Kalaiism</a> in PD License
-  - <a href="https://github.com/siemens/ix-icons?ref=svgrepo.com" target="_blank">Siemens</a> in MIT License
-  - <a href="https://www.svgrepo.com" target="_blank">SVG Repo</a> CC0 License

ZXBSInstaller.Log/ServiceLayer.cs

@@ -1905,7 +1905,8 @@ private static ExternalTools_Version[] GetTBBLueMAMEVersions()
             // All versions
             var v = new ExternalTools_Version()
             {
-                DownloadUrl = "https://github.com/Threetwosevensixseven/NexCreator/raw/master/bootroms/tbblue.zip",
+                //DownloadUrl = "https://github.com/Threetwosevensixseven/NexCreator/raw/master/bootroms/tbblue.zip",
+                DownloadUrl = "https://www.specnext.com/forum/download/file.php?id=1164",
                 OperatingSystem = OperatingSystems.All,
                 Version = "3.02.03",
             };

ZXBSInstaller/ZXBSInstaller.csproj

@@ -6,7 +6,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <ApplicationIcon>zxbs.ico</ApplicationIcon>
-    <Version>1.0.2.0</Version>
+    <Version>1.0.3</Version>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Assets\cancel.svg" />

ZXBStudio/DocumentEditors/ZXGraphics/FontGDUExportDialog.axaml.cs

@@ -175,7 +175,7 @@ private void CreateExample_BIN()
             {
                 case FileTypes.Font:
                     sb.AppendLine("' Example of use of custom font type");
-                    sb.AppendLine("POKE (uinteger 23606, @MyFont-256)");
+                    sb.AppendLine("POKE (uinteger 23606, @MyFont(0,0)-256)");
                     sb.AppendLine("PRINT \"Hello World!\"");
                     sb.AppendLine("STOP");
                     sb.AppendLine("");
@@ -189,7 +189,7 @@ private void CreateExample_BIN()
                     break;
                 case FileTypes.UDG:
                     sb.AppendLine("' Example of use of UDG/GDU");
-                    sb.AppendLine("POKE (uinteger 23675, @MyUDG)");
+                    sb.AppendLine("POKE (uinteger 23675, @MyUDG(0,0))");
                     sb.AppendLine("PRINT \"UDG/GDU Table\"");
                     sb.AppendLine("FOR n=0 TO 20");
                     sb.AppendLine("     PRINT (144+n);\" - \";CHR(n+65);\": \";CHR(144+n)");
@@ -245,13 +245,13 @@ private void CreateExample_ASM()
             sb.AppendLine("' Example of use of the asm format");
             if (fileType.FileType == FileTypes.Font)
             {
-                sb.AppendLine(string.Format("POKE (uinteger 23606, @{0}-256)", txtLabelName.Text));
+                sb.AppendLine(string.Format("POKE (uinteger 23606, @{0}(0,0)-256)", txtLabelName.Text));
                 sb.AppendLine("PRINT \"Hello World!\"");
                 sb.AppendLine("STOP");
             }
             else
             {
-                sb.AppendLine(string.Format("POKE (uinteger 23675, @{0})", txtLabelName.Text));
+                sb.AppendLine(string.Format("POKE (uinteger 23675, @{0}(0,0))", txtLabelName.Text));
                 sb.AppendLine("PRINT \"UDG/GDU Table\"");
                 sb.AppendLine("FOR n=0 TO 20");
                 sb.AppendLine("     PRINT (144+n);\" - \";CHR(n+65);\": \";CHR(144+n)");
@@ -275,15 +275,15 @@ private void CreateExample_DIM()
             switch (fileType.FileType)
             {
                 case FileTypes.UDG:
-                    sb.AppendLine(string.Format("POKE (uinteger 23675, @{0})", txtLabelName.Text));
+                    sb.AppendLine(string.Format("POKE (uinteger 23675, @{0}(0))", txtLabelName.Text));
                     sb.AppendLine("PRINT \"UDG/GDU Table\"");
                     sb.AppendLine("FOR n=0 TO 20");
                     sb.AppendLine("     PRINT (144+n);\" - \";CHR(n+65);\": \";CHR(144+n)");
                     sb.AppendLine("NEXT n");
                     sb.AppendLine("STOP");
                     break;
                 case FileTypes.Font:
-                    sb.AppendLine(string.Format("POKE (uinteger 23606, @{0}-256)", txtLabelName.Text));
+                    sb.AppendLine(string.Format("POKE (uinteger 23606, @{0}(0,0)-256)", txtLabelName.Text));
                     sb.AppendLine("PRINT \"Hello World!\"");
                     sb.AppendLine("STOP");
                     break;

ZXBStudio/DocumentEditors/ZXGraphics/ImageViewImportControl.cs

@@ -9,12 +9,15 @@
 using SixLabors.ImageSharp.PixelFormats;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Runtime.Intrinsics.X86;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using ZXBasicStudio.DocumentEditors.NextDows.log;
+using ZXBasicStudio.DocumentEditors.ZXGraphics.neg;
 
 namespace ZXBasicStudio.DocumentEditors.ZXGraphics
 {
@@ -136,20 +139,12 @@ public ImageViewImportControl()
 
         public async void LoadImage(IStorageFile file)
         {
-            try
-            {
-                await using (var stream = await file.OpenReadAsync())
-                {
-                    imageData = SixLabors.ImageSharp.Image.Load<Rgba32>(stream);
-                }
-                this.InvalidateVisual();
-            }
-            catch (Exception ex)
-            {
-            }
+            imageData = ZXGraphics.log.ServiceLayer.LoadImage(file);
+            this.InvalidateVisual();            
         }
 
 
+
         public void Refresh()
         {
             this.InvalidateVisual();
@@ -200,7 +195,7 @@ public override void Render(DrawingContext context)
                             }
                             else
                             {
-                                context.FillRectangle(brushWhite, r0);                             
+                                context.FillRectangle(brushWhite, r0);
                             }
                             pair = !pair;
                         }
@@ -268,21 +263,21 @@ public override void Render(DrawingContext context)
                     int x2 = SpriteWidth * _Zoom;
                     int y2 = SpriteHeight * _Zoom;
 
-                    var r0 = new Rect(x2, 0, 400-x2, 400);
+                    var r0 = new Rect(x2, 0, 400 - x2, 400);
                     context.FillRectangle(brushMask, r0);
-                    var r1 = new Rect(0, y2, x2, 400-y2);
+                    var r1 = new Rect(0, y2, x2, 400 - y2);
                     context.FillRectangle(brushMask, r1);
 
                     context.DrawRectangle(penRed, new Rect(-1, -1, x2, y2));
-                }              
+                }
             }
             catch (Exception ex)
             {
 
             }
         }
 
-#endregion
+        #endregion
 
 
         #region Mouse

ZXBStudio/DocumentEditors/ZXGraphics/SelectExportTypeControl.axaml.cs

@@ -46,6 +46,38 @@ public SelectExportTypeControl()
         }
 
 
+        public bool InitializeTile()
+        {
+            ExportTypesList = new List<ExportTypeDescrioptionItem>();
+            ExportTypesList.Add(new ExportTypeDescrioptionItem()
+            {
+                Description = "Boriel Basic's PutChars embeded library.",
+                ExportType = ExportTypes.PutChars,
+                Image = "/Svg/Seal.svg",
+                Name = "PutChars"
+            });           
+            lstOptions.ItemsSource = ExportTypesList;
+            lstOptions.SelectionChanged += LstOptions_SelectionChanged;
+            return true;
+        }
+
+
+        public bool InitializeMap()
+        {
+            ExportTypesList = new List<ExportTypeDescrioptionItem>();
+            ExportTypesList.Add(new ExportTypeDescrioptionItem()
+            {
+                Description = "Raw array of bytes, one byte for tile",
+                ExportType = ExportTypes.Array,
+                Image = "/Svg/boxes-stacked-solid.svg",
+                Name = "Array"
+            });
+            lstOptions.ItemsSource = ExportTypesList;
+            lstOptions.SelectionChanged += LstOptions_SelectionChanged;
+            return true;
+        }
+
+
         public bool InitializeSprite()
         {
             ExportTypesList = new List<ExportTypeDescrioptionItem>();