Changeset 46 for trunk/Forms

Timestamp:

Aug 16, 2014, 11:02:07 PM (10 years ago)

Author:

chronos

Message:

• Added: Support for switching large icons in toolbar.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (6 diffs)
• UFormMain.lrt (modified) (2 diffs)
• UFormMain.pas (modified) (12 diffs)

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 775
   Caption = 'xTactics'
-  ClientHeight = 595
+  ClientHeight = 592
   ClientWidth = 775
   Menu = MainMenu1
@@ -17 +17 @@
   object PaintBox1: TPaintBox
     Left = 0
-    Height = 537
+    Height = 531
     Top = 32
     Width = 775
@@ -32 +32 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 26
-    Top = 569
+    Height = 29
+    Top = 563
     Width = 775
     Panels = <    
@@ -55 +55 @@
     Images = Core.ImageListSmall
     ParentShowHint = False
+    PopupMenu = PopupMenuToolbar
     ShowHint = True
     TabOrder = 1
@@ -125 +126 @@
         Action = AZoomOut
       end
+      object MenuItem19: TMenuItem
+        Caption = '-'
+      end
+      object MenuItem20: TMenuItem
+        Action = AToolBarBigIcons
+      end
     end
     object MenuItem8: TMenuItem
@@ -164 +171 @@
       ShortCut = 16449
     end
+    object AToolBarBigIcons: TAction
+      Caption = 'Toolbar big icons'
+      OnExecute = AToolBarBigIconsExecute
+    end
+  end
+  object PopupMenuToolbar: TPopupMenu
+    left = 452
+    top = 98
+    object MenuItem18: TMenuItem
+      Action = AToolBarBigIcons
+    end
   end
 end

trunk/Forms/UFormMain.lrt

@@ -3 +3 @@
 TFORMMAIN.MENUITEM5.CAPTION=-
 TFORMMAIN.MENUITEM10.CAPTION=View
+TFORMMAIN.MENUITEM19.CAPTION=-
 TFORMMAIN.MENUITEM8.CAPTION=Tools
 TFORMMAIN.MENUITEM16.CAPTION=Help
@@ -8 +9 @@
 TFORMMAIN.AZOOMOUT.CAPTION=Zoom out
 TFORMMAIN.AZOOMALL.CAPTION=Zoom all
+TFORMMAIN.ATOOLBARBIGICONS.CAPTION=Toolbar big icons

trunk/Forms/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UGame, LCLType, Menus, ActnList, ComCtrls, types, dateutils;
+  UGame, LCLType, Menus, ActnList, ComCtrls, types, dateutils, XMLConf;
 
 const
@@ -17 +17 @@
 
   TFormMain = class(TForm)
+    AToolBarBigIcons: TAction;
     AZoomIn: TAction;
     AZoomAll: TAction;
@@ -31 +32 @@
     MenuItem16: TMenuItem;
     MenuItem17: TMenuItem;
+    MenuItem18: TMenuItem;
+    MenuItem19: TMenuItem;
     MenuItem2: TMenuItem;
+    MenuItem20: TMenuItem;
     MenuItem3: TMenuItem;
     MenuItem4: TMenuItem;
@@ -40 +44 @@
     MenuItem9: TMenuItem;
     PaintBox1: TPaintBox;
+    PopupMenuToolbar: TPopupMenu;
     StatusBar1: TStatusBar;
     Timer1: TTimer;
@@ -48 +53 @@
     ToolButton4: TToolButton;
     ToolButton5: TToolButton;
+    procedure AToolBarBigIconsExecute(Sender: TObject);
     procedure AZoomAllExecute(Sender: TObject);
     procedure AZoomInExecute(Sender: TObject);
@@ -56 +62 @@
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
+    procedure MenuItem19Click(Sender: TObject);
     procedure PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
@@ -77 +84 @@
     RedrawPending: Boolean;
   public
+    procedure LoadConfig(Config: TXmlConfig; Path: string);
+    procedure SaveConfig(Config: TXmlConfig; Path: string);
+    procedure ReloadView;
     procedure Redraw;
   end;
@@ -86 +96 @@
 
 uses
-  UFormNew, UFormMove, UCore;
+  UCore;
 
 resourcestring
@@ -132 +142 @@
       NewCaption := Core.Game.CurrentPlayer.Name + ' - ' + STurn + ' ' + IntToStr(Core.Game.TurnCounter) + ' - ' + NewCaption;
     Caption := NewCaption;
+  end;
+end;
+
+procedure TFormMain.LoadConfig(Config: TXmlConfig; Path: string);
+begin
+  with Config do begin
+    AToolBarBigIcons.Checked := GetValue(Path + '/LargeIcons', False);
+  end;
+end;
+
+procedure TFormMain.SaveConfig(Config: TXmlConfig; Path: string);
+begin
+  with Config do begin
+    SetValue(Path + '/LargeIcons', AToolBarBigIcons.Checked);
+  end;
+end;
+
+procedure TFormMain.ReloadView;
+begin
+  if AToolBarBigIcons.Checked then begin
+    ToolBar1.Images := Core.ImageListLarge;
+    ToolBar1.ButtonWidth := 32 + 7;
+    ToolBar1.ButtonHeight := 32 + 6;
+    ToolBar1.Height := 32 + 10;
+  end else begin
+    ToolBar1.ButtonWidth := 16 + 7;
+    ToolBar1.ButtonHeight := 16 + 6;
+    ToolBar1.Height := 16 + 10;
+    ToolBar1.Images := Core.ImageListSmall;
   end;
 end;
@@ -165 +204 @@
   end;
   Redraw;
+end;
+
+procedure TFormMain.AToolBarBigIconsExecute(Sender: TObject);
+begin
+  AToolBarBigIcons.Checked := not AToolBarBigIcons.Checked;
+  ReloadView;
 end;
 
@@ -194 +239 @@
 begin
   Core.Game.Running := False;
+  SaveConfig(Core.XMLConfig1, 'FormMain');
 end;
 
@@ -202 +248 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  Redraw;
+  LoadConfig(Core.XMLConfig1, 'FormMain');
+  ReloadView;
+  Redraw;
+end;
+
+procedure TFormMain.MenuItem19Click(Sender: TObject);
+begin
+
 end;