Changeset 206 for trunk

Timestamp:

May 21, 2018, 2:50:02 PM (7 years ago)

Author:

chronos

Message:

• Added: New window to list all available actions with their keyboard shortcuts.
• Fixed: Keyboard shortcuts didn't worked for FormClient docked into FormMain.
• Fixed: Signal a turn start to first player if a game is loaded from a file.

Location:

trunk

Files:

• Forms/UFormClient.lfm (modified) (4 diffs)
• Forms/UFormClient.pas (modified) (2 diffs)
• Forms/UFormKeyShortcuts.lfm (added)
• Forms/UFormKeyShortcuts.lrt (added)
• Forms/UFormKeyShortcuts.pas (added)
• Forms/UFormMain.lfm (modified) (5 diffs)
• Forms/UFormMain.pas (modified) (1 diff)
• Languages/xtactics.cs.po (modified) (6 diffs)
• Languages/xtactics.po (modified) (4 diffs)
• UCore.lfm (modified) (5 diffs)
• UCore.pas (modified) (12 diffs)
• xtactics.lpi (modified) (3 diffs)

trunk/Forms/UFormClient.lfm

@@ -1 +1 @@
 object FormClient: TFormClient
-  Left = 662
+  Left = 528
   Height = 621
-  Top = 413
+  Top = 280
   Width = 775
   Caption = 'Client'
   ClientHeight = 621
   ClientWidth = 775
-  DesignTimePPI = 144
+  DesignTimePPI = 120
   OnClose = FormClose
   OnCreate = FormCreate
@@ -17 +17 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 30
-    Top = 591
+    Height = 28
+    Top = 593
     Width = 775
     Panels = <    
@@ -34 +34 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 591
+    Height = 593
     Top = 0
     Width = 32
@@ -75 +75 @@
   object PaintBox1: TPaintBox
     Left = 32
-    Height = 591
+    Height = 593
     Top = 0
     Width = 743

trunk/Forms/UFormClient.pas

@@ -217 +217 @@
     Caption := NewCaption;
     Drawing := False;
-    AGameEndTurn.Enabled := Core.Game.Running;
   end;
 end;
@@ -299 +298 @@
   TimerPeriod := 0;
   LastTimerTime := Now;
+  Core.CoolTranslator1.TranslateComponentRecursive(Self);
 end;
 

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 775
   Caption = 'xTactics'
-  ClientHeight = 587
+  ClientHeight = 596
   ClientWidth = 775
-  DesignTimePPI = 144
+  DesignTimePPI = 120
   Menu = MainMenu1
   OnClose = FormClose
@@ -77 +77 @@
   object PanelMain: TPanel
     Left = 0
-    Height = 547
+    Height = 556
     Top = 40
     Width = 775
@@ -92 +92 @@
       object MenuItem2: TMenuItem
         Action = Core.AGameNew
-        Caption = 'New...'
       end
       object MenuItem3: TMenuItem
@@ -108 +107 @@
       object MenuItem15: TMenuItem
         Action = Core.AGameSave
-        ShortCut = 16467
       end
       object MenuItem29: TMenuItem
         Action = Core.AGameSaveAs
-        Caption = 'Save as'
-        ShortCut = 24659
       end
       object MenuItem5: TMenuItem
@@ -177 +173 @@
       object MenuItem23: TMenuItem
         Action = Core.AHelp
+      end
+      object MenuItem4: TMenuItem
+        Action = Core.AShowKeyShortcuts
       end
       object MenuItem17: TMenuItem

trunk/Forms/UFormMain.pas

@@ -44 +44 @@
     MenuItem28: TMenuItem;
     MenuItem29: TMenuItem;
+    MenuItem4: TMenuItem;
     MenuItemLoadRecent: TMenuItem;
     MenuItem3: TMenuItem;

trunk/Languages/xtactics.cs.po

@@ -9 +9 @@
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 1.8.8\n"
 "Language: cs\n"
 
@@ -64 +64 @@
 #: tcore.agamesaveas.caption
 msgid "Save as..."
-msgstr ""
+msgstr "Uložit jako..."
 
 #: tcore.ahelp.caption
@@ -93 +93 @@
 msgstr "Grafy"
 
+#: tcore.ashowkeyshortcuts.caption
+msgctxt "tcore.ashowkeyshortcuts.caption"
+msgid "Key shortcuts"
+msgstr "Klávesové zkratky"
+
 #: tcore.ashowunitmoves.caption
 msgctxt "tcore.ashowunitmoves.caption"
@@ -191 +196 @@
 msgstr "Nápověda"
 
+#: tformkeyshortcuts.caption
+msgctxt "tformkeyshortcuts.caption"
+msgid "Key shortcuts"
+msgstr "Klávesové zkratky"
+
+#: tformkeyshortcuts.listview1.columns[0].caption
+msgid "Action"
+msgstr "Akce"
+
+#: tformkeyshortcuts.listview1.columns[1].caption
+msgid "Window"
+msgstr "Okno"
+
+#: tformkeyshortcuts.listview1.columns[2].caption
+msgid "Shortcut"
+msgstr "Zkratka"
+
+#: tformkeyshortcuts.menuitem1.caption
+msgid "Execute"
+msgstr "Vykonat"
+
 #: tformmain.atoolbarbigicons.caption
 msgctxt "tformmain.atoolbarbigicons.caption"
@@ -236 +262 @@
 msgstr "Nápověda"
 
-#: tformmain.menuitem2.caption
-msgid "New..."
-msgstr ""
-
 #: tformmain.menuitem22.caption
 msgctxt "tformmain.menuitem22.caption"
 msgid "Statusbar visible"
 msgstr "Viditelná stavová lišta"
-
-#: tformmain.menuitem29.caption
-msgid "Save as"
-msgstr ""
 
 #: tformmain.menuitem8.caption
@@ -794 +812 @@
 "Vyhodnocení útoku jednotek je určen pravidlem podobným tomu, které je použito u hry Risk. Bitva se skládá z několika bojů. Každá boj útočník může použít do 3 jednotek a obránce do 2 jednotek. Počet jednotek pro každou stranu určuje počet kostek. Obě strany házejí jejich kostkami a seřadí je v sestupném pořadí. Každá strana bere jednu kostku s nejvyšší hodnotou. Ten, který má kostku s vyšší hodnotou vyhrává. V případě remízy, vyhrává obránce. Prohrávající ztrácí své jednotky a další pár kostek je vyhodnocen. Tento proces je vypočítáván automaticky a pro každý plánovaný útok je zobrazena odhadovaná pravděpodobnost.\n"
 
+#: uformkeyshortcuts.sglobal
+msgid "Global"
+msgstr "Globální"
+
+#: uformkeyshortcuts.smainform
+msgid "Main window"
+msgstr "Hlavní okno"
+
 #: uformmain.sturn
 msgctxt "uformmain.sturn"

trunk/Languages/xtactics.po

@@ -83 +83 @@
 msgstr ""
 
+#: tcore.ashowkeyshortcuts.caption
+msgctxt "tcore.ashowkeyshortcuts.caption"
+msgid "Key shortcuts"
+msgstr ""
+
 #: tcore.ashowunitmoves.caption
 msgctxt "tcore.ashowunitmoves.caption"
@@ -181 +186 @@
 msgstr ""
 
+#: tformkeyshortcuts.caption
+msgctxt "tformkeyshortcuts.caption"
+msgid "Key shortcuts"
+msgstr ""
+
+#: tformkeyshortcuts.listview1.columns[0].caption
+msgid "Action"
+msgstr ""
+
+#: tformkeyshortcuts.listview1.columns[1].caption
+msgid "Window"
+msgstr ""
+
+#: tformkeyshortcuts.listview1.columns[2].caption
+msgid "Shortcut"
+msgstr ""
+
+#: tformkeyshortcuts.menuitem1.caption
+msgid "Execute"
+msgstr ""
+
 #: tformmain.atoolbarbigicons.caption
 msgctxt "tformmain.atoolbarbigicons.caption"
@@ -226 +252 @@
 msgstr ""
 
-#: tformmain.menuitem2.caption
-msgid "New..."
-msgstr ""
-
 #: tformmain.menuitem22.caption
 msgctxt "tformmain.menuitem22.caption"
 msgid "Statusbar visible"
-msgstr ""
-
-#: tformmain.menuitem29.caption
-msgid "Save as"
 msgstr ""
 
@@ -773 +791 @@
 msgstr ""
 
+#: uformkeyshortcuts.sglobal
+msgid "Global"
+msgstr ""
+
+#: uformkeyshortcuts.smainform
+msgid "Main window"
+msgstr ""
+
 #: uformmain.sturn
 msgctxt "uformmain.sturn"

trunk/UCore.lfm

@@ -3 +3 @@
   OnDestroy = DataModuleDestroy
   OldCreateOrder = False
-  Height = 811
-  HorizontalOffset = 330
-  VerticalOffset = 228
-  Width = 1258
-  PPI = 144
-  object ActionList1: TActionList
+  Height = 676
+  HorizontalOffset = 275
+  VerticalOffset = 190
+  Width = 1048
+  PPI = 120
+  object ActionListMain: TActionList
     Images = ImageListSmall
-    left = 137
-    top = 60
+    left = 114
+    top = 50
     object AExit: TAction
       Caption = 'Exit'
@@ -95 +95 @@
       OnExecute = AGameSaveExecute
     end
+    object AShowKeyShortcuts: TAction
+      Caption = 'Key shortcuts'
+      OnExecute = AShowKeyShortcutsExecute
+    end
   end
   object ImageListSmall: TImageList
-    left = 786
-    top = 420
+    left = 655
+    top = 350
     Bitmap = {
       4C690C00000010000000100000000000000000000000E3AA4BD6E5B35EFFE3B1
@@ -490 +494 @@
     POFilesFolder = 'Languages'
     OnTranslate = CoolTranslator1Translate
-    left = 137
-    top = 436
+    left = 114
+    top = 363
   end
   object ImageListLarge: TImageList
     Height = 32
     Width = 32
-    left = 786
-    top = 286
+    left = 655
+    top = 238
     Bitmap = {
       4C690C0000002000000020000000000000000000000000000000E2AA4B36E2A9
@@ -2042 +2046 @@
     RootName = 'CONFIG'
     ReadOnly = False
-    left = 137
-    top = 556
+    left = 114
+    top = 463
   end
   object OpenDialog1: TOpenDialog
     DefaultExt = '.xtmap'
-    left = 1126
-    top = 292
+    left = 938
+    top = 243
   end
   object SaveDialog1: TSaveDialog
     DefaultExt = '.xtmap'
-    left = 1126
-    top = 166
+    left = 938
+    top = 138
   end
   object ApplicationInfo: TApplicationInfo
@@ -2070 +2074 @@
     RegistryRoot = rrKeyCurrentUser
     License = 'CC0'
-    left = 137
-    top = 180
+    left = 114
+    top = 150
   end
   object PersistentForm: TPersistentForm
     MinVisiblePart = 50
     EntireVisible = False
-    left = 780
-    top = 600
+    left = 650
+    top = 500
   end
   object ScaleDPI1: TScaleDPI
     AutoDetect = False
-    left = 136
-    top = 676
+    left = 113
+    top = 563
   end
   object LastOpenedList1: TLastOpenedList
     MaxCount = 10
     OnChange = LastOpenedList1Change
-    left = 137
-    top = 300
+    left = 114
+    top = 250
   end
 end

trunk/UCore.pas

@@ -17 +17 @@
   TCore = class(TDataModule)
     AAbout: TAction;
+    AShowKeyShortcuts: TAction;
     AGameSave: TAction;
     APlayersStats: TAction;
@@ -27 +28 @@
     ApplicationInfo: TApplicationInfo;
     ASettings: TAction;
-    ActionList1: TActionList;
+    ActionListMain: TActionList;
     AExit: TAction;
     AGameEnd: TAction;
@@ -55 +56 @@
     procedure ASettingsExecute(Sender: TObject);
     procedure AShowChartsExecute(Sender: TObject);
+    procedure AShowKeyShortcutsExecute(Sender: TObject);
     procedure AShowUnitMovesExecute(Sender: TObject);
     procedure CoolTranslator1Translate(Sender: TObject);
@@ -81 +83 @@
     procedure RedrawClients;
     procedure UpdateOtherForms;
+    procedure FormClientActions;
   public
     Game: TGame;
@@ -109 +112 @@
 
 uses
-  UFormMain, UFormNew, UFormSettings, UFormAbout, UClientAI,
+  UFormMain, UFormNew, UFormSettings, UFormAbout, UClientAI, UFormKeyShortcuts,
   UFormHelp, UFormCharts, UFormUnitMoves, UFormPlayersStats;
 
@@ -373 +376 @@
 end;
 
+procedure TCore.AShowKeyShortcutsExecute(Sender: TObject);
+begin
+  if not Assigned(FormKeyShortcuts) then FormKeyShortcuts := TFormKeyShortcuts.Create(nil);
+  FormKeyShortcuts.Show;
+end;
+
 procedure TCore.AShowUnitMovesExecute(Sender: TObject);
 begin
@@ -382 +391 @@
 begin
   UGame.InitStrings;
+  CoolTranslator1.TranslateComponentRecursive(FormClient);
 end;
 
@@ -409 +419 @@
   if Assigned(FormUnitMoves) then FreeAndNil(FormUnitMoves);
   if Assigned(FormCharts) then FreeAndNil(FormCharts);
+  if Assigned(FormKeyShortcuts) then FreeAndNil(FormKeyShortcuts);
   FreeAndNil(FormClients);
   FreeAndNil(StoredDimension);
@@ -431 +442 @@
   Player: TPlayer;
   NewClient: TClient;
+  ServerClient: TServerClient;
 begin
   GameLoaded := True;
@@ -473 +485 @@
   RedrawClients;
   UpdateOtherForms;
+  UpdateActions;
+  ServerClient := Server.Clients.SearchByPlayer(Game.CurrentPlayer);
+  if Assigned(ServerClient) then ServerClient.TurnStart
+    else raise Exception.Create('Server client for current player not found.');
 end;
 
@@ -489 +505 @@
   if Assigned(FormUnitMoves) and FormUnitMoves.Visible then FormUnitMoves.ReloadList;
   if Assigned(FormPlayersStats) and FormPlayersStats.Visible then FormPlayersStats.ReloadList;
+end;
+
+procedure TCore.FormClientActions;
+var
+  Action: TAction;
+  I: Integer;
+begin
+  for I := 0 to FormClient.ActionList1.ActionCount - 1 do begin
+    Action := TAction.Create(FormMain);
+    Action.Assign(TAction(FormClient.ActionList1.Actions[I]));
+    Action.ActionList := FormMain.ActionList1;
+  end;
 end;
 
@@ -597 +625 @@
       LoadGame(LastOpenedList1.Items[0]);
     ScaleDPI;
+    FormClientActions;
 
     if Game.FileName = '' then StartNewGame;

trunk/xtactics.lpi

@@ -104 +104 @@
       </Item7>
     </RequiredPackages>
-    <Units Count="28">
+    <Units Count="29">
       <Unit0>
         <Filename Value="xtactics.lpr"/>
@@ -259 +259 @@
         <IsPartOfProject Value="True"/>
       </Unit27>
+      <Unit28>
+        <Filename Value="Forms/UFormKeyShortcuts.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormKeyShortcuts"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+      </Unit28>
     </Units>
   </ProjectOptions>
@@ -291 +298 @@
     <Linking>
       <Debugging>
+        <UseHeaptrc Value="True"/>
         <UseExternalDbgSyms Value="True"/>
       </Debugging>