Changeset 115 for trunk/Forms/UFormMain.pas

Timestamp:

Oct 13, 2020, 8:05:14 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Build with Lazarus 2.0.10.
• Modified: CoolTranslator package replaced by Translator in Common package.
• Modified: About dialog moved to Common package.

File:

• trunk/Forms/UFormMain.pas (modified) (4 diffs)

trunk/Forms/UFormMain.pas

@@ -146 +146 @@
     procedure ProjectOpen(FileName: string);
     procedure UpdateToolBarHints;
+    procedure DockForm(Form: TForm; DockSite: TWinControl);
     procedure DockInit;
     procedure LastOpenedListChange(Sender: TObject);
@@ -170 +171 @@
   UCore, UFormCPU, UFormOptions, UFormMessages, UFormTargets, UFormOutput, UFormInput,
   UFormMemory, UFormSourceCode, UFormTargetCode, UTargetInterpretter, UFormLog,
-  UBFTarget, UFormAbout;
+  UBFTarget;
 
 resourcestring
@@ -267 +268 @@
 end;
 
+procedure TFormMain.DockForm(Form: TForm; DockSite: TWinControl);
+begin
+  Form.ManualDock(DockSite, nil, alClient);
+  Form.Align := alClient;
+  Form.Show;
+end;
+
 procedure TFormMain.DockInit;
 begin
-  FormSourceCode.ManualDock(TabSheetSource, nil, alClient);
-  FormSourceCode.Align := alClient;
-  FormSourceCode.Show;
-  FormTargetCode.ManualDock(TabSheetTarget, nil, alClient);
-  FormTargetCode.Align := alClient;
-  FormTargetCode.Show;
-  FormCPU.ManualDock(PanelCPU, nil, alClient);
-  FormCPU.Align := alClient;
-  FormCPU.Show;
-  FormInput.ManualDock(PanelInput, nil, alClient);
-  FormInput.Align := alClient;
-  FormInput.Show;
-  FormOutput.ManualDock(PanelOutput, nil, alClient);
-  FormOutput.Align := alClient;
-  FormOutput.Show;
-  FormMemory.ManualDock(PanelMemory, nil, alClient);
-  FormMemory.Align := alClient;
-  FormMemory.Show;
-  FormMessages.ManualDock(TabSheetMessages, nil, alClient);
-  FormMessages.Align := alClient;
-  FormMessages.Show;
+  DockForm(FormSourceCode, TabSheetSource);
+  DockForm(FormTargetCode, TabSheetTarget);
+  DockForm(FormCPU, PanelCPU);
+  DockForm(FormInput, PanelInput);
+  DockForm(FormOutput, PanelOutput);
+  DockForm(FormMemory, PanelMemory);
+  DockForm(FormMessages, TabSheetMessages);
   PageControlRight.Width := FormMain.Width div 3;
   PageControlBottom.Height := FormMain.Height div 5;
@@ -534 +528 @@
 procedure TFormMain.AAboutExecute(Sender: TObject);
 begin
-  FormAbout := TFormAbout.Create(nil);
-  try
-    FormAbout.ApplicationInfo := Core.ApplicationInfo;
-    FormAbout.CoolTranslator := Core.CoolTranslator1;
-    Core.ScaleDPI1.ScaleControl(FormAbout, Core.ScaleDPI1.DesignDPI);
-    FormAbout.ShowModal;
-  finally
-    FreeAndNil(FormAbout);
-  end;
+  Core.AboutDialog.Show;
 end;