Changeset 91 for trunk/Forms/UFormOptions.pas

Timestamp:

Jul 20, 2018, 9:41:37 AM (6 years ago)

Author:

chronos

Message:

• Added: Allow to enable individual code optimization from settings dialog.
• Added: Actions to format or shrink target BF code.

Location:

trunk/Forms

Files:

• . (modified) (1 prop)
• UFormOptions.pas (modified) (8 diffs)

trunk/Forms/UFormOptions.pas

@@ -11 +11 @@
 type
 
-  { TOptionsForm }
+  { TFormOptions }
 
-  TOptionsForm = class(TForm)
+  TFormOptions = class(TForm)
     ButtonOk: TButton;
     ButtonCancel: TButton;
     CheckBox1: TCheckBox;
+    CheckBoxOptimizeAddSub: TCheckBox;
     CheckBoxDPIAuto: TCheckBox;
+    CheckBoxOptimizeMerge: TCheckBox;
+    CheckBoxOptimizeRelativeIndexes: TCheckBox;
+    CheckBoxOptimizeCopyMultiply: TCheckBox;
     ComboBoxLanguage: TComboBox;
-    ComboBoxOptimizatipn: TComboBox;
+    ComboBoxOptimization: TComboBox;
     Label1: TLabel;
     Label2: TLabel;
@@ -32 +36 @@
     procedure ButtonOkClick(Sender: TObject);
     procedure CheckBoxDPIAutoChange(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
   private
@@ -42 +48 @@
 
 var
-  OptionsForm: TOptionsForm;
+  FormOptions: TFormOptions;
 
 implementation
@@ -51 +57 @@
   UCore, ULanguages;
 
-{ TOptionsForm }
+{ TFormOptions }
 
-procedure TOptionsForm.FormShow(Sender: TObject);
+procedure TFormOptions.FormShow(Sender: TObject);
 begin
+  Core.PersistentForm1.Load(Self);
+
   Core.CoolTranslator1.LanguageListToStrings(ComboBoxLanguage.Items);
   ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
@@ -61 +69 @@
 end;
 
-procedure TOptionsForm.UpdateInterface;
+procedure TFormOptions.UpdateInterface;
 begin
   SpinEditDPIX.Enabled := not CheckBoxDPIAuto.Checked;
@@ -71 +79 @@
     SpinEditDPIY.Value := ScreenInfo.PixelsPerInchY;
   end;
+  CheckBoxOptimizeAddSub.Enabled := ComboBoxOptimization.ItemIndex > 0;
+  CheckBoxOptimizeMerge.Enabled := ComboBoxOptimization.ItemIndex > 0;
+  CheckBoxOptimizeRelativeIndexes.Enabled := ComboBoxOptimization.ItemIndex > 0;
+  CheckBoxOptimizeCopyMultiply.Enabled := ComboBoxOptimization.ItemIndex > 0;
 end;
 
-procedure TOptionsForm.Load;
+procedure TFormOptions.Load;
 begin
+  CheckBoxOptimizeAddSub.Checked := Core.Optimizations.AddSub;
+  CheckBoxOptimizeMerge.Checked := Core.Optimizations.Merge;
+  CheckBoxOptimizeRelativeIndexes.Checked := Core.Optimizations.RelativeIndexes;
+  CheckBoxOptimizeCopyMultiply.Checked := Core.Optimizations.CopyMultiply;
   SpinEditDPIX.Value := Core.ScaleDPI1.DPI.X;
   SpinEditDPIY.Value := Core.ScaleDPI1.DPI.Y;
   CheckBoxDPIAuto.Checked := Core.ScaleDPI1.AutoDetect;
-  ComboBoxOptimizatipn.ItemIndex := Integer(Core.OptimizationLevel);
+  ComboBoxOptimization.ItemIndex := Integer(Core.OptimizationLevel);
   SpinEditCellSize.Value := Core.CellSize;
   SpinEditMemorySize.Value := Core.MemorySize;
@@ -84 +100 @@
 end;
 
-procedure TOptionsForm.Save;
+procedure TFormOptions.Save;
 begin
   Core.ScaleDPI1.DPI := Point(SpinEditDPIX.Value, SpinEditDPIY.Value);
   Core.ScaleDPI1.AutoDetect := CheckBoxDPIAuto.Checked;
-  Core.OptimizationLevel := TCompilerOptimization(ComboBoxOptimizatipn.ItemIndex);
+  Core.OptimizationLevel := TCompilerOptimization(ComboBoxOptimization.ItemIndex);
   Core.CellSize := SpinEditCellSize.Value;
   Core.MemorySize := SpinEditMemorySize.Value;
+  Core.Optimizations.AddSub := CheckBoxOptimizeAddSub.Checked;
+  Core.Optimizations.Merge := CheckBoxOptimizeMerge.Checked;
+  Core.Optimizations.RelativeIndexes := CheckBoxOptimizeRelativeIndexes.Checked;
+  Core.Optimizations.CopyMultiply := CheckBoxOptimizeCopyMultiply.Checked;
 end;
 
-procedure TOptionsForm.ButtonOkClick(Sender: TObject);
+procedure TFormOptions.ButtonOkClick(Sender: TObject);
 begin
   if ComboBoxLanguage.ItemIndex <> -1 then
@@ -100 +120 @@
 end;
 
-procedure TOptionsForm.CheckBoxDPIAutoChange(Sender: TObject);
+procedure TFormOptions.CheckBoxDPIAutoChange(Sender: TObject);
 begin
   UpdateInterface;
 end;
 
+procedure TFormOptions.FormClose(Sender: TObject; var CloseAction: TCloseAction
+  );
+begin
+  Core.PersistentForm1.Save(Self);
+end;
+
+procedure TFormOptions.FormCreate(Sender: TObject);
+begin
+  Core.CoolTranslator1.TranslateComponentRecursive(Self);
+end;
+
 end.