Changeset 145 for trunk/Forms

Timestamp:

Nov 12, 2017, 1:47:20 PM (7 years ago)

Author:

chronos

Message:

• Modified: Do not create settings form on application start but just if form is opened.
• Fixed: Removed various compilation warnings.

Location:

trunk/Forms

Files:

• UFormCharts.lfm (modified) (2 diffs)
• UFormCharts.pas (modified) (1 diff)
• UFormMain.lfm (modified) (7 diffs)
• UFormMain.pas (modified) (4 diffs)
• UFormSettings.lfm (modified) (8 diffs)
• UFormSettings.pas (modified) (4 diffs)

trunk/Forms/UFormCharts.lfm

@@ -9 +9 @@
   OnClose = FormClose
   OnShow = FormShow
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '1.8.0.4'
   object Chart1: TChart
     Left = 8
@@ -35 +35 @@
   object ComboBox1: TComboBox
     Left = 24
-    Height = 34
+    Height = 36
     Top = 8
     Width = 392

trunk/Forms/UFormCharts.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, TAGraph, TASeries, Forms, Controls, Graphics,
-  Dialogs, StdCtrls, LMessages;
+  Dialogs, StdCtrls;
 
 type

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 775
   Caption = 'xTactics'
-  ClientHeight = 596
+  ClientHeight = 587
   ClientWidth = 775
   Menu = MainMenu1
@@ -13 +13 @@
   OnKeyUp = FormKeyUp
   OnShow = FormShow
-  LCLVersion = '1.6.2.0'
+  LCLVersion = '1.8.0.4'
   WindowState = wsMaximized
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 28
-    Top = 568
+    Height = 30
+    Top = 557
     Width = 775
     Panels = <    
@@ -34 +34 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 568
+    Height = 557
     Top = 0
     Width = 80
@@ -72 +72 @@
     object ToolButton6: TToolButton
       Left = 1
-      Top = 194
+      Top = 170
       Action = AZoomIn
     end
     object ToolButton7: TToolButton
       Left = 1
-      Top = 226
+      Top = 202
       Action = AZoomOut
     end
     object ToolButton8: TToolButton
       Left = 1
-      Top = 258
+      Top = 234
       Action = AZoomAll
     end
     object ToolButton9: TToolButton
       Left = 1
-      Height = 32
       Top = 162
       Width = 32
@@ -94 +93 @@
     object ToolButton10: TToolButton
       Left = 1
-      Height = 32
-      Top = 290
+      Top = 266
       Width = 32
       Style = tbsSeparator
@@ -101 +99 @@
     object ToolButton11: TToolButton
       Left = 1
-      Top = 322
+      Top = 274
       Action = Core.AGameLoad
     end
     object ToolButton12: TToolButton
       Left = 1
-      Top = 354
+      Top = 306
       Action = Core.AGameSave
     end
     object ToolButton13: TToolButton
       Left = 1
-      Top = 386
+      Top = 338
       Action = Core.AExit
     end
@@ -117 +115 @@
   object PaintBox1: TPaintBox
     Left = 80
-    Height = 568
+    Height = 557
     Top = 0
     Width = 695

trunk/Forms/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UGame, LCLType, Menus, ActnList, ComCtrls, types, dateutils, XMLConf;
+  UGame, LCLType, Menus, ActnList, ComCtrls, types, dateutils, XMLConf, DOM;
 
 const
@@ -193 +193 @@
 begin
   with Config do begin
-    AToolBarBigIcons.Checked := GetValue(Path + '/LargeIcons', False);
-    AToolBarVisible.Checked := GetValue(Path + '/ToolBarVisible', True);
-    AStatusBarVisible.Checked := GetValue(Path + '/StatusBarVisible', False);
+    AToolBarBigIcons.Checked := GetValue(DOMString(Path + '/LargeIcons'), False);
+    AToolBarVisible.Checked := GetValue(DOMString(Path + '/ToolBarVisible'), True);
+    AStatusBarVisible.Checked := GetValue(DOMString(Path + '/StatusBarVisible'), False);
   end;
 end;
@@ -202 +202 @@
 begin
   with Config do begin
-    SetValue(Path + '/LargeIcons', AToolBarBigIcons.Checked);
-    SetValue(Path + '/ToolBarVisible', AToolBarVisible.Checked);
-    SetValue(Path + '/StatusBarVisible', AStatusBarVisible.Checked);
+    SetValue(DOMString(Path + '/LargeIcons'), AToolBarBigIcons.Checked);
+    SetValue(DOMString(Path + '/ToolBarVisible'), AToolBarVisible.Checked);
+    SetValue(DOMString(Path + '/StatusBarVisible'), AStatusBarVisible.Checked);
   end;
 end;
@@ -289 +289 @@
 
 procedure TFormMain.AZoomOutExecute(Sender: TObject);
-var
-  D: TPoint;
+//var
+//  D: TPoint;
 begin
   with Core.CurrentClient do begin

trunk/Forms/UFormSettings.lfm

@@ -13 +13 @@
   OnShow = FormShow
   Position = poMainFormCenter
-  LCLVersion = '1.4.4.0'
+  LCLVersion = '1.8.0.4'
   object ButtonOk: TButton
     Left = 444
@@ -47 +47 @@
     object TabSheetGeneral: TTabSheet
       Caption = 'General'
-      ClientHeight = 226
-      ClientWidth = 538
+      ClientHeight = 220
+      ClientWidth = 540
       object Label2: TLabel
         Left = 27
-        Height = 25
+        Height = 26
         Top = 78
-        Width = 139
+        Width = 150
         Caption = 'Animation speed:'
         ParentColor = False
@@ -59 +59 @@
       object SpinEditAnimSpeed: TSpinEdit
         Left = 232
-        Height = 33
+        Height = 36
         Top = 72
         Width = 122
@@ -66 +66 @@
       object Label3: TLabel
         Left = 368
-        Height = 25
+        Height = 26
         Top = 82
         Width = 15
@@ -72 +72 @@
         ParentColor = False
       end
-      object CheckBox1: TCheckBox
+      object CheckBoxAutoSaveTurn: TCheckBox
         Left = 8
         Height = 27
         Top = 112
-        Width = 584
+        Width = 586
         Anchors = [akTop, akLeft, akRight]
         AutoSize = False
@@ -84 +84 @@
       object Label1: TLabel
         Left = 20
-        Height = 25
+        Height = 26
         Top = 26
-        Width = 81
+        Width = 88
         Caption = 'Language:'
         ParentColor = False
@@ -92 +92 @@
       object ComboBoxLanguage: TComboBox
         Left = 178
-        Height = 33
+        Height = 40
         Top = 24
         Width = 196
-        ItemHeight = 25
+        ItemHeight = 0
         Style = csDropDownList
         TabOrder = 2
@@ -102 +102 @@
     object TabSheetDebug: TTabSheet
       Caption = 'Debug'
-      ClientHeight = 226
-      ClientWidth = 538
+      ClientHeight = 220
+      ClientWidth = 540
       object CheckBoxDevelMode: TCheckBox
         Left = 16

trunk/Forms/UFormSettings.pas

@@ -16 +16 @@
     ButtonOk: TButton;
     ButtonCancel: TButton;
-    CheckBox1: TCheckBox;
+    CheckBoxAutoSaveTurn: TCheckBox;
     CheckBox2: TCheckBox;
     CheckBoxDevelMode: TCheckBox;
@@ -62 +62 @@
 begin
   PageControl1.TabIndex := 0;
+  Core.CoolTranslator1.TranslateComponentRecursive(Self);
 end;
 
@@ -83 +84 @@
   SpinEditX.Value := Core.ScaleDPI1.DPI.X;
   SpinEditY.Value := Core.ScaleDPI1.DPI.Y;
+  CheckBoxAutoSaveTurn.Checked := Core.AutoSaveEnabled;
 end;
 
@@ -93 +95 @@
   Core.ScaleDPI1.AutoDetect := CheckBox2.Checked;
   Core.ScaleDPI1.DPI := Point(SpinEditX.Value, SpinEditY.Value);
+  Core.AutoSaveEnabled := CheckBoxAutoSaveTurn.Checked;
 end;