Changeset 249 for trunk/Forms

Timestamp:

Sep 22, 2018, 9:37:16 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Use different interface language if installed as deb Linux package.
• Fixed: Propagate status bar, toolbar visibilit, and toolbar icons size to client form.

Location:

trunk/Forms

Files:

• UFormClient.lfm (modified) (1 diff)
• UFormClient.pas (modified) (6 diffs)
• UFormMain.lfm (modified) (4 diffs)
• UFormMain.pas (modified) (9 diffs)

trunk/Forms/UFormClient.lfm

@@ -124 +124 @@
       Caption = 'Toolbar big icons'
       OnExecute = AToolBarBigIconsExecute
+      OnUpdate = AToolBarBigIconsUpdate
     end
     object AToolBarVisible: TAction
       Caption = 'Toolbar visible'
       OnExecute = AToolBarVisibleExecute
+      OnUpdate = AToolBarVisibleUpdate
     end
     object AStatusBarVisible: TAction
       Caption = 'Statusbar visible'
       OnExecute = AStatusBarVisibleExecute
+      OnUpdate = AStatusBarVisibleUpdate
     end
     object AGameEndTurn: TAction

trunk/Forms/UFormClient.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
   UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM, Math,
-  UGeometry, UGameClient, UGameProtocol, UThreading, UPlayer, UClientGUI;
+  UGeometry, UGameClient, UGameProtocol, UThreading, UPlayer, UClientGUI, UFormMain;
 
 const
@@ -44 +44 @@
     procedure AGameEndTurnExecute(Sender: TObject);
     procedure AStatusBarVisibleExecute(Sender: TObject);
+    procedure AStatusBarVisibleUpdate(Sender: TObject);
     procedure ASurrenderExecute(Sender: TObject);
     procedure AToolBarBigIconsExecute(Sender: TObject);
+    procedure AToolBarBigIconsUpdate(Sender: TObject);
     procedure AToolBarVisibleExecute(Sender: TObject);
+    procedure AToolBarVisibleUpdate(Sender: TObject);
     procedure AZoomAllExecute(Sender: TObject);
     procedure AZoomInExecute(Sender: TObject);
@@ -92 +95 @@
     procedure DoClientDestroy(Sender: TObject);
   public
+    FormMain: TFormMain;
     procedure LoadConfig(Config: TXmlConfig; Path: string);
     procedure SaveConfig(Config: TXmlConfig; Path: string);
@@ -416 +420 @@
 begin
   AToolBarBigIcons.Checked := not AToolBarBigIcons.Checked;
+end;
+
+procedure TFormClient.AToolBarBigIconsUpdate(Sender: TObject);
+begin
   UpdateInterface;
 end;
@@ -422 +430 @@
 begin
   AStatusBarVisible.Checked := not AStatusBarVisible.Checked;
+  UpdateInterface;
+end;
+
+procedure TFormClient.AStatusBarVisibleUpdate(Sender: TObject);
+begin
   UpdateInterface;
 end;
@@ -444 +457 @@
 begin
   AToolBarVisible.Checked := not AToolBarVisible.Checked;
+  UpdateInterface;
+end;
+
+procedure TFormClient.AToolBarVisibleUpdate(Sender: TObject);
+begin
   UpdateInterface;
 end;

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 801
+  Left = 826
   Height = 621
-  Top = 352
+  Top = 419
   Width = 775
   Caption = 'xTactics'
-  ClientHeight = 596
+  ClientHeight = 587
   ClientWidth = 775
-  DesignTimePPI = 120
+  DesignTimePPI = 144
   Menu = MainMenu1
   OnActivate = FormActivate
@@ -79 +79 @@
   object PanelMain: TPanel
     Left = 0
-    Height = 556
+    Height = 547
     Top = 40
     Width = 775
@@ -147 +147 @@
       end
       object MenuItem22: TMenuItem
-        Caption = 'Statusbar visible'
+        Action = AStatusBarVisible
       end
       object MenuItem26: TMenuItem
@@ -208 +208 @@
       OnExecute = AToolBarVisibleExecute
     end
+    object AStatusBarVisible: TAction
+      Caption = 'Status bar visible'
+      OnExecute = AStatusBarVisibleExecute
+    end
   end
   object PopupMenuToolbar: TPopupMenu

trunk/Forms/UFormMain.pas

@@ -18 +18 @@
 
   TFormMain = class(TForm)
+    AStatusBarVisible: TAction;
     AToolBarVisible: TAction;
     AToolBarBigIcons: TAction;
@@ -67 +68 @@
     ToolButton5: TToolButton;
     ToolButton9: TToolButton;
+    procedure AStatusBarVisibleExecute(Sender: TObject);
     procedure AToolBarBigIconsExecute(Sender: TObject);
     procedure AToolBarVisibleExecute(Sender: TObject);
@@ -80 +82 @@
     FormActivated: Boolean;
     procedure ApplicationStart(Ptr: IntPtr);
+    procedure UpdateClientForms;
   public
     procedure LoadConfig(Config: TXmlConfig; Path: string);
@@ -121 +124 @@
     AToolBarBigIcons.Checked := GetValue(DOMString(Path + '/LargeIcons'), False);
     AToolBarVisible.Checked := GetValue(DOMString(Path + '/ToolBarVisible'), True);
+    AStatusBarVisible.Checked := GetValue(DOMString(Path + '/StatusBarVisible'), False);
   end;
 end;
@@ -129 +133 @@
     SetValue(DOMString(Path + '/LargeIcons'), AToolBarBigIcons.Checked);
     SetValue(DOMString(Path + '/ToolBarVisible'), AToolBarVisible.Checked);
+    SetValue(DOMString(Path + '/StatusBarVisible'), AStatusBarVisible.Checked);
   end;
 end;
@@ -164 +169 @@
 end;
 
+procedure TFormMain.AStatusBarVisibleExecute(Sender: TObject);
+begin
+  AStatusBarVisible.Checked := not AStatusBarVisible.Checked;
+  UpdateClientForms;
+end;
+
 procedure TFormMain.AToolBarBigIconsExecute(Sender: TObject);
 begin
   AToolBarBigIcons.Checked := not AToolBarBigIcons.Checked;
   ReloadView;
+  UpdateClientForms;
 end;
 
@@ -174 +186 @@
   AToolBarVisible.Checked := not AToolBarVisible.Checked;
   ReloadView;
+  UpdateClientForms;
 end;
 
@@ -206 +219 @@
 begin
   Core.ReopenGameOnInit;
+end;
+
+procedure TFormMain.UpdateClientForms;
+var
+  I: Integer;
+begin
+  FormClient.AToolBarBigIcons.Checked := AToolBarBigIcons.Checked;
+  FormClient.AToolBarBigIcons.Update;
+  FormClient.AToolBarVisible.Checked := AToolBarVisible.Checked;
+  FormClient.AToolBarVisible.Update;
+  FormClient.AStatusBarVisible.Checked := AStatusBarVisible.Checked;
+  FormClient.AStatusBarVisible.Update;
+  for I := 0 to Core.FormClients.Count - 1 do begin
+    Core.FormClients[I].AToolBarBigIcons.Checked := AToolBarBigIcons.Checked;
+    Core.FormClients[I].AToolBarBigIcons.Update;
+    Core.FormClients[I].AToolBarVisible.Checked := AToolBarVisible.Checked;
+    Core.FormClients[I].AToolBarVisible.Update;
+    Core.FormClients[I].AStatusBarVisible.Checked := AStatusBarVisible.Checked;
+    Core.FormClients[I].AStatusBarVisible.Update;
+  end;
 end;
 
@@ -218 +251 @@
   ReloadView;
   FormClient.Show;
+  UpdateClientForms;
   Application.QueueAsyncCall(ApplicationStart, 0);
 end;