Beta 1.4

Author: Juan Segura

ZXBStudio/Dialogs/ZXAboutDialog.axaml

@@ -10,16 +10,17 @@
         Title="About..." CanResize="False"
         WindowStartupLocation="CenterScreen"
         Topmost="True">
-  <Grid RowDefinitions="2.7*,1*,0.5*,0.5*,0.5*,0.5*,1.5*,1.6*,*,0.4*,0.4*,0.4*,*">
+  <Grid RowDefinitions="Auto,Auto,Auto,*,*,Auto,Auto,Auto,Auto,*,Auto,Auto,*,32">
     <Image Margin="10" Width="128" Height="128" VerticalAlignment="Top" Source="avares://ZXBasicStudio/Assets/IconAbout.png"></Image>
     <TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="36" FontWeight="Black">ZX Basic Studio</TextBlock>
     <TextBlock Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24">Beta release</TextBlock>
-    <TextBlock Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16" Name="txtBuild">Build 1.3.5.6</TextBlock>
-    <TextBlock Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16" Name="txtDate">2023-10-29</TextBlock>
-    <TextBlock Grid.Row="6" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" TextAlignment="Center" TextWrapping="Wrap" FontWeight="DemiBold">The ZX Basic Studio development team</TextBlock>
-    <TextBlock Grid.Row="7" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="18" TextWrapping="Wrap">El Dr. Gusman, Duefectu, AdolFITO, Hash6Iron, SirRickster</TextBlock>
-    <TextBlock Grid.Row="8" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="16" TextWrapping="Wrap">Many thanks to Boriel for the ZX Basic compiler and his support to this project.</TextBlock>
-    <TextBlock Grid.Row="10" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="12" TextWrapping="Wrap">(C) 2023, El Dr. Gusman</TextBlock>
-    <Button Name="btnClose" Grid.Row="12">Close</Button>
+    <TextBlock Grid.Row="3" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="16" Name="txtBuild">Build 1.3.5.6</TextBlock>
+    <TextBlock Grid.Row="4" VerticalAlignment="Top" HorizontalAlignment="Center" FontSize="16" Name="txtDate">2023-10-29</TextBlock>
+    <TextBlock Grid.Row="6" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16" TextAlignment="Center" TextWrapping="Wrap" FontWeight="DemiBold">The ZX Basic Studio development team</TextBlock>
+    <TextBlock Grid.Row="7" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="18" TextWrapping="Wrap">El Dr. Gusman, Boriel, Duefectu, AdolFITO, Hash6Iron, SirRickster</TextBlock>
+    <TextBlock Grid.Row="9" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="16" TextWrapping="Wrap">Many thanks to Boriel for the ZX Basic compiler and his support to this project.</TextBlock>
+    <TextBlock Grid.Row="11" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="12" TextWrapping="Wrap">(C) 2023, El Dr. Gusman</TextBlock>
+    <TextBlock Grid.Row="12" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="12" TextWrapping="Wrap">(C) 2025, Boriel &amp; DuefectuCorp</TextBlock>
+    <Button Name="btnClose" Grid.Row="14">Close</Button>
   </Grid>
 </Window>

ZXBStudio/DocumentEditors/ZXTextEditor/Controls/ZXBasicEditor.cs

@@ -475,6 +475,16 @@ static ZXBasicEditor()
         public ZXBasicEditor() : base() { }
         public ZXBasicEditor(string DocumentPath) : base(DocumentPath, ZXBasicDocument.Id) { }
 
+
+        /// <summary>
+        /// Gestion de autocompletar
+        /// </summary>
+        /// <param name="Document"></param>
+        /// <param name="Line"></param>
+        /// <param name="Column"></param>
+        /// <param name="RequestedChar"></param>
+        /// <param name="ByRequest"></param>
+        /// <returns></returns>
         protected override IEnumerable<ICompletionData>? ShouldComplete(IDocument Document, int Line, int Column, char? RequestedChar, bool ByRequest)
         {
             var line = Document.GetLineByNumber(Line);
@@ -524,26 +534,33 @@ public ZXBasicEditor(string DocumentPath) : base(DocumentPath, ZXBasicDocument.I
             }
 
             if (context == ContextType.Comment)
+            {
                 return null;
+            }
 
             string trimmed = preText.Trim();
 
-            if(context == ContextType.Assembler)
+            if (context == ContextType.Assembler)
             {
                 if (!char.IsLetter(RequestedChar ?? ' ') || regCommentAsm.IsMatch(trimmed))
+                {
                     return null;
 
+                }
                 if (string.IsNullOrWhiteSpace(trimmed))
+                {
                     PrioritizeAssemblerKeywords();
+                }
                 else
+                {
                     PrioritizeAssemblerRegisters();
-
+                }
                 return assembler;
             }
 
 
-            //if (string.IsNullOrWhiteSpace(preText))
-            if(trimmed.Length > 1)
+            if (string.IsNullOrWhiteSpace(preText))
+            //if(trimmed.Length > 1)
             {
                 if (RequestedChar == '#')
                     return directives;

ZXBStudio/ZXBasicStudio.csproj

@@ -11,7 +11,7 @@
     <Platforms>AnyCPU;x64</Platforms>
     <ApplicationIcon>zxbs.ico</ApplicationIcon>
     <Title>ZX Basic Studio</Title>
-    <AssemblyVersion>1.4.*</AssemblyVersion>
+    <AssemblyVersion>1.5.*</AssemblyVersion>
     <Deterministic>False</Deterministic>
     <Version></Version>
   </PropertyGroup>