Changeset 92 for trunk/Forms

Timestamp:

Jul 20, 2018, 9:48:47 AM (6 years ago)

Author:

chronos

Message:

• Modified: Create FormTargetOptions in runtime.

Location:

trunk/Forms

Files:

• UFormMain.pas (modified) (1 diff)
• UFormTargetOptions.lfm (modified) (6 diffs)
• UFormTargetOptions.pas (modified) (3 diffs)
• UFormTargets.lfm (modified) (3 diffs)
• UFormTargets.pas (modified) (4 diffs)

trunk/Forms/UFormMain.pas

@@ -433 +433 @@
 procedure TFormMain.AViewCompilersExecute(Sender: TObject);
 begin
-  FormCompilers.Show;
+  FormTargets.Show;
 end;
 

trunk/Forms/UFormTargetOptions.lfm

@@ -1 +1 @@
 object FormTargetOptions: TFormTargetOptions
   Left = 429
-  Height = 240
+  Height = 206
   Top = 228
-  Width = 369
+  Width = 422
   Caption = 'Target options'
-  ClientHeight = 240
-  ClientWidth = 369
-  LCLVersion = '1.1'
+  ClientHeight = 206
+  ClientWidth = 422
+  DesignTimePPI = 120
+  OnClose = FormClose
+  OnCreate = FormCreate
+  OnShow = FormShow
+  LCLVersion = '1.8.2.0'
   object Edit1: TEdit
     Left = 8
-    Height = 21
-    Top = 24
-    Width = 272
+    Height = 28
+    Top = 32
+    Width = 325
     Anchors = [akTop, akLeft, akRight]
     TabOrder = 0
@@ -18 +22 @@
   object Label1: TLabel
     Left = 8
-    Height = 14
+    Height = 20
     Top = 7
-    Width = 86
+    Width = 122
     Caption = 'Compiler location:'
     ParentColor = False
   end
   object ButtonCompiler: TButton
-    Left = 288
-    Height = 25
-    Top = 24
+    Left = 341
+    Height = 31
+    Top = 35
     Width = 75
     Anchors = [akTop, akRight]
@@ -35 +39 @@
   end
   object ButtonExecute: TButton
-    Left = 288
-    Height = 25
-    Top = 80
+    Left = 341
+    Height = 31
+    Top = 96
     Width = 75
     Anchors = [akTop, akRight]
@@ -46 +50 @@
   object Edit2: TEdit
     Left = 8
-    Height = 21
-    Top = 81
-    Width = 272
+    Height = 28
+    Top = 96
+    Width = 325
     Anchors = [akTop, akLeft, akRight]
     TabOrder = 3
@@ -54 +58 @@
   object Label2: TLabel
     Left = 8
-    Height = 14
-    Top = 64
-    Width = 88
+    Height = 20
+    Top = 72
+    Width = 118
     Caption = 'Executor location:'
     ParentColor = False
   end
   object ButtonOk: TButton
-    Left = 288
-    Height = 25
-    Top = 208
-    Width = 75
+    Left = 319
+    Height = 31
+    Top = 163
+    Width = 91
     Anchors = [akRight, akBottom]
     Caption = 'Ok'
@@ -71 +75 @@
   end
   object ButtonCancel: TButton
-    Left = 200
-    Height = 25
-    Top = 208
-    Width = 75
+    Left = 207
+    Height = 31
+    Top = 163
+    Width = 91
     Anchors = [akRight, akBottom]
     Caption = 'Cancel'

trunk/Forms/UFormTargetOptions.pas

@@ -25 +25 @@
     procedure ButtonCompilerClick(Sender: TObject);
     procedure ButtonExecuteClick(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure FormCreate(Sender: TObject);
+    procedure FormShow(Sender: TObject);
   private
     { private declarations }
@@ -35 +38 @@
   FormTargetOptions: TFormTargetOptions;
 
+
 implementation
 
 {$R *.lfm}
+
+uses
+  UCore;
 
 { TFormTargetOptions }
@@ -51 +58 @@
   OpenDialog1.FileName := Edit2.Text;
   if OpenDialog1.Execute then Edit2.Text := OpenDialog1.FileName;
+end;
+
+procedure TFormTargetOptions.FormClose(Sender: TObject;
+  var CloseAction: TCloseAction);
+begin
+  Core.PersistentForm1.Save(Self);
+end;
+
+procedure TFormTargetOptions.FormCreate(Sender: TObject);
+begin
+  Core.CoolTranslator1.TranslateComponentRecursive(Self);
+end;
+
+procedure TFormTargetOptions.FormShow(Sender: TObject);
+begin
+  Core.PersistentForm1.Load(Self);
 end;
 

trunk/Forms/UFormTargets.lfm

@@ -1 @@
-object FormCompilers: TFormCompilers
+object FormTargets: TFormTargets
   Left = 292
   Height = 344
@@ -7 +7 @@
   ClientHeight = 344
   ClientWidth = 574
+  DesignTimePPI = 120
   OnShow = FormShow
-  LCLVersion = '1.1'
+  LCLVersion = '1.8.2.0'
   object ListView1: TListView
     Left = 8
@@ -35 +36 @@
     OnData = ListView1Data
     OnDblClick = ListView1DblClick
+    OnKeyPress = ListView1KeyPress
   end
 end

trunk/Forms/UFormTargets.pas

@@ -10 +10 @@
 type
 
-  { TFormCompilers }
+  { TFormTargets }
 
-  TFormCompilers = class(TForm)
+  TFormTargets = class(TForm)
     ListView1: TListView;
     procedure FormShow(Sender: TObject);
     procedure ListView1Data(Sender: TObject; Item: TListItem);
     procedure ListView1DblClick(Sender: TObject);
+    procedure ListView1KeyPress(Sender: TObject; var Key: char);
   private
     { private declarations }
@@ -24 +25 @@
 
 var
-  FormCompilers: TFormCompilers;
+  FormTargets: TFormTargets;
 
 implementation
@@ -33 +34 @@
   UCore, UTarget, UFormTargetOptions;
 
-{ TFormCompilers }
+{ TFormTargets }
 
-procedure TFormCompilers.FormShow(Sender: TObject);
+procedure TFormTargets.FormShow(Sender: TObject);
 begin
   ReloadList;
 end;
 
-procedure TFormCompilers.ListView1Data(Sender: TObject; Item: TListItem);
+procedure TFormTargets.ListView1Data(Sender: TObject; Item: TListItem);
 begin
   if (Item.Index >= 0) and (Item.Index < Core.Targets.Count) then
@@ -51 +52 @@
 end;
 
-procedure TFormCompilers.ListView1DblClick(Sender: TObject);
+procedure TFormTargets.ListView1DblClick(Sender: TObject);
 begin
-  FormTargetOptions.LoadControls(TTarget(ListView1.Selected.Data));
-  if FormTargetOptions.ShowModal = mrOk then begin
-    FormTargetOptions.SaveControls(TTarget(ListView1.Selected.Data));
-    ReloadList;
+  FormTargetOptions := TFormTargetOptions.Create(nil);
+  try
+    FormTargetOptions.LoadControls(TTarget(ListView1.Selected.Data));
+    if FormTargetOptions.ShowModal = mrOk then begin
+      FormTargetOptions.SaveControls(TTarget(ListView1.Selected.Data));
+      ReloadList;
+    end;
+  finally
+    FormTargetOptions.Free;
   end;
 end;
 
-procedure TFormCompilers.ReloadList;
+procedure TFormTargets.ListView1KeyPress(Sender: TObject; var Key: char);
+begin
+  if Key = #13 then ListView1DblClick(nil);
+end;
+
+procedure TFormTargets.ReloadList;
 begin
   ListView1.Items.Count := Core.Targets.Count;