Changeset 157 for trunk

Timestamp:

Aug 19, 2024, 10:58:23 AM (3 months ago)

Author:

chronos

Message:

• Added: Allow to hide main toolbar.
• Fixed: Update cursor position in status bar.
• Fixed: Memory leak in target code form.

Location:

trunk

Files:

• Core.pas (modified) (3 diffs)
• Forms/FormMain.lfm (modified) (1 diff)
• Forms/FormMain.lrj (modified) (1 diff)
• Forms/FormMain.pas (modified) (8 diffs)
• Forms/FormTargetCode.lfm (modified) (2 diffs)
• Forms/FormTargetCode.pas (modified) (2 diffs)
• Languages/LazFuck.cs.po (modified) (1 diff)
• Languages/LazFuck.pot (modified) (1 diff)

trunk/Core.pas

@@ -49 +49 @@
     OptionsFormTabIndex: Integer;
     Optimizations: TOptimizations;
+    ShowToolbar: Boolean;
     procedure Init;
     procedure AddItemToLastOpenedList(FileName: string);
@@ -179 +180 @@
       ReadIntegerWithDefault('DPIY', 96));
     ScaleDPI1.AutoDetect := ReadBoolWithDefault('DPIAuto', True);
+    ShowToolbar := ReadBoolWithDefault('ShowToolbar', True);
     OptimizationLevel := TCompilerOptimization(ReadIntegerWithDefault('OptimizationLevel', Integer(coNormal)));
     MemorySize := ReadIntegerWithDefault('MemorySize', 30000);
@@ -212 +214 @@
     WriteBool('OpenProjectOnStart', OpenProjectOnStart);
     WriteBool('DPIAuto', ScaleDPI1.AutoDetect);
+    WriteBool('ShowToolbar', ShowToolbar);
     WriteInteger('DPIX', ScaleDPI1.DPI.X);
     WriteInteger('DPIY', ScaleDPI1.DPI.Y);

trunk/Forms/FormMain.lfm

@@ -331 +331 @@
         Action = AFullScreen
       end
+      object MenuItemViewToolbar: TMenuItem
+        AutoCheck = True
+        Caption = 'Toolbar'
+        OnClick = MenuItemViewToolbarClick
+      end
     end
     object MenuItem9: TMenuItem

trunk/Forms/FormMain.lrj

@@ -11 +11 @@
 {"hash":310020,"name":"tformmain.menuitem24.caption","sourcebytes":[69,100,105,116],"value":"Edit"},
 {"hash":380871,"name":"tformmain.menuitem23.caption","sourcebytes":[86,105,101,119],"value":"View"},
+{"hash":191244498,"name":"tformmain.menuitemviewtoolbar.caption","sourcebytes":[84,111,111,108,98,97,114],"value":"Toolbar"},
 {"hash":22974,"name":"tformmain.menuitem9.caption","sourcebytes":[82,117,110],"value":"Run"},
 {"hash":94932420,"name":"tformmain.menuitemtarget.caption","sourcebytes":[84,97,114,103,101,116],"value":"Target"},

trunk/Forms/FormMain.pas

@@ -71 +71 @@
     MenuItem34: TMenuItem;
     MenuItem35: TMenuItem;
+    MenuItemViewToolbar: TMenuItem;
     MenuItemOpenRecent: TMenuItem;
     MenuItemTarget: TMenuItem;
@@ -153 +154 @@
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
+    procedure MenuItemViewToolbarClick(Sender: TObject);
     procedure TimerRefreshTimer(Sender: TObject);
   private
@@ -172 +174 @@
     procedure LastOpenedListChange(Sender: TObject);
     procedure CurrentTargetChangeExecute(Sender: TObject);
+    procedure UpdateStatusBarExecute(Sender: TObject);
+    procedure UpdateInterfaceExecute(Sender: TObject);
   public
     procedure MessagesChanged(Sender: TObject);
@@ -213 +217 @@
   try
     if Core.Core.LastOpenedList.Items.Count = 0 then
-      Core.Core.LastOpenedList.Items.Add(CombinePaths(Core.Core.DataDir, ExamplesDir + DirectorySeparator + 'Sierpinski.b'));
+      Core.Core.LastOpenedList.Items.Add(CombinePaths(Core.Core.DataDir, ExamplesDir +
+      DirectorySeparator + 'Sierpinski.b'));
 
     if Core.Core.OpenProjectOnStart and (Core.Core.LastOpenedList.Items.Count > 0) and
@@ -230 +235 @@
 end;
 
+procedure TFormMain.MenuItemViewToolbarClick(Sender: TObject);
+begin
+  Core.Core.ShowToolbar := MenuItemViewToolbar.Checked;
+  UpdateInterface;
+end;
+
 procedure TFormMain.TimerRefreshTimer(Sender: TObject);
 begin
@@ -321 +332 @@
 begin
   UpdateTargetList;
+  UpdateInterface;
+end;
+
+procedure TFormMain.UpdateStatusBarExecute(Sender: TObject);
+begin
+  UpdateStatusBar;
+end;
+
+procedure TFormMain.UpdateInterfaceExecute(Sender: TObject);
+begin
   UpdateInterface;
 end;
@@ -357 +378 @@
     AShowTargetPosition.Enabled := CurrentTarget.Compiled;
     AFullScreen.Checked := FullScreen;
+    MenuItemViewToolbar.Checked := Core.Core.ShowToolbar;
+    ToolBarMain.Visible := Core.Core.ShowToolbar;
   end;
   UpdateStatusBar;
@@ -387 +410 @@
 begin
   FormSourceCode := TFormSourceCode.Create(nil);
+  FormSourceCode.OnUpdateStatusBar := UpdateStatusBarExecute;
+  FormSourceCode.OnUpdateInterface := UpdateInterfaceExecute;
   FormCPU := TFormCPU.Create(nil);
   FormInput := TFormInput.Create(nil);

trunk/Forms/FormTargetCode.lfm

@@ -8 +8 @@
   ClientWidth = 734
   DesignTimePPI = 144
+  OnDestroy = FormDestroy
   LCLVersion = '3.4.0.0'
   inline SynEditTarget: TSynEdit
@@ -509 +510 @@
   object PopupMenuTarget: TPopupMenu
     Images = Core.ImageListMain
-    Left = 101
-    Top = 120
+    Left = 239
+    Top = 144
     object MenuItem20: TMenuItem
       Action = AFormatCode

trunk/Forms/FormTargetCode.pas

@@ -23 +23 @@
     procedure AFormatCodeExecute(Sender: TObject);
     procedure AShrinkCodeExecute(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
   public
     procedure SetHighlighter(SourceExt: string);
@@ -80 +81 @@
 end;
 
+procedure TFormTargetCode.FormDestroy(Sender: TObject);
+begin
+  if Assigned(SynEditTarget.Highlighter) then
+    SynEditTarget.Highlighter.Free;
+end;
+
 procedure TFormTargetCode.SetHighlighter(SourceExt: string);
 begin

trunk/Languages/LazFuck.cs.po

@@ -496 +496 @@
 msgstr "Cíl"
 
+#: tformmain.menuitemviewtoolbar.caption
+msgid "Toolbar"
+msgstr "NástrojovÜ panel"
+
 #: tformmain.tabsheetdebug.caption
 msgid "Debug"

trunk/Languages/LazFuck.pot

@@ -482 +482 @@
 msgstr ""
 
+#: tformmain.menuitemviewtoolbar.caption
+msgid "Toolbar"
+msgstr ""
+
 #: tformmain.tabsheetdebug.caption
 msgid "Debug"