Changeset 291 for trunk/UKeyBindings.pas

Timestamp:

Mar 2, 2021, 10:16:54 PM (3 years ago)

Author:

chronos

Message:

• Modified: Allow to redefine all action keys.

File:

• trunk/UKeyBindings.pas (modified) (5 diffs)

trunk/UKeyBindings.pas

@@ -9 +9 @@
 
 type
+
+  { TKeyBinding }
+
   TKeyBinding = class
     ShortName: string;
     FullName: string;
     ShortCut: TShortCut;
+    ShortCut2: TShortCut;
+    function Test(AShortCut: TShortCut): Boolean;
   end;
 
@@ -18 +23 @@
 
   TKeyBindings = class(TFPGObjectList<TKeyBinding>)
-    function AddItem(const ShortName, FullName: string; ShortCut: TShortCut): TKeyBinding; overload;
-    function AddItem(const ShortName, FullName: string; ShortCutText: string): TKeyBinding; overload;
+    function AddItem(const ShortName, FullName: string; ShortCut: TShortCut; ShortCut2: TShortCut = 0): TKeyBinding; overload;
+    function AddItem(const ShortName, FullName: string; ShortCutText: string; ShortCutText2: string = ''): TKeyBinding; overload;
     function Search(ShortName: string): TKeyBinding;
     procedure LoadFromFile(FileName: string);
@@ -45 +50 @@
   BStay: TKeyBinding;
   BNoOrders: TKeyBinding;
+  BCancel: TKeyBinding;
+  BPillage: TKeyBinding;
+  BSelectTransport: TKeyBinding;
   BTechTree: TKeyBinding;
   BWait: TKeyBinding;
   BJump: TKeyBinding;
+  BMapBtn0: TKeyBinding;
+  BMapBtn1: TKeyBinding;
+  BMapBtn4: TKeyBinding;
+  BMapBtn5: TKeyBinding;
+  BMapBtn6: TKeyBinding;
+  BSetDebugMap0: TKeyBinding;
+  BSetDebugMap1: TKeyBinding;
+  BSetDebugMap2: TKeyBinding;
+  BSetDebugMap3: TKeyBinding;
+  BSetDebugMap4: TKeyBinding;
+  BSetDebugMap5: TKeyBinding;
+  BSetDebugMap6: TKeyBinding;
+  BSetDebugMap7: TKeyBinding;
+  BSetDebugMap8: TKeyBinding;
+  BSetDebugMap9: TKeyBinding;
+  BDebugMap: TKeyBinding;
+  BLocCodes: TKeyBinding;
+  BLogDlg: TKeyBinding;
+  BNames: TKeyBinding;
+  BRun: TKeyBinding;
+  BTestMapRepaint: TKeyBinding;
+  BSetViewpoint0: TKeyBinding;
+  BSetViewpoint1: TKeyBinding;
+  BSetViewpoint2: TKeyBinding;
+  BSetViewpoint3: TKeyBinding;
+  BSetViewpoint4: TKeyBinding;
+  BSetViewpoint5: TKeyBinding;
+  BSetViewpoint6: TKeyBinding;
+  BSetViewpoint7: TKeyBinding;
+  BSetViewpoint8: TKeyBinding;
+  BSetViewpoint9: TKeyBinding;
+  BAirBase: TKeyBinding;
+  BBuildCity: TKeyBinding;
+  BEnhance: TKeyBinding;
+  BGoOn: TKeyBinding;
+  BHome: TKeyBinding;
+  BFarmClearIrrigation: TKeyBinding;
+  BLoad: TKeyBinding;
+  BAfforestMine: TKeyBinding;
+  BCanal: TKeyBinding;
+  BTrans: TKeyBinding;
+  BPollution: TKeyBinding;
+  BRailRoad: TKeyBinding;
+  BUnload: TKeyBinding;
+  BRecover: TKeyBinding;
+  BUtilize: TKeyBinding;
+  BMoveLeftDown: TKeyBinding;
+  BMoveDown: TKeyBinding;
+  BMoveRightDown: TKeyBinding;
+  BMoveRight: TKeyBinding;
+  BMoveRightUp: TKeyBinding;
+  BMoveUp: TKeyBinding;
+  BMoveLeftUp: TKeyBinding;
+  BMoveLeft: TKeyBinding;
 
 
 implementation
 
+{ TKeyBinding }
+
+function TKeyBinding.Test(AShortCut: TShortCut): Boolean;
+begin
+  Result := (AShortCut = ShortCut) or (AShortCut = ShortCut2);
+end;
+
 { TKeyBindings }
 
-function TKeyBindings.AddItem(const ShortName, FullName: string; ShortCut: TShortCut
-  ): TKeyBinding;
+function TKeyBindings.AddItem(const ShortName, FullName: string; ShortCut: TShortCut;
+  ShortCut2: TShortCut = 0): TKeyBinding;
 begin
   Result := TKeyBinding.Create;
@@ -61 +130 @@
   Result.FullName := FullName;
   Result.ShortCut := ShortCut;
+  Result.ShortCut2 := ShortCut2;
   Add(Result);
 end;
 
 function TKeyBindings.AddItem(const ShortName, FullName: string;
-  ShortCutText: string): TKeyBinding;
-begin
-  Result := AddItem(ShortName, FullName, TextToShortCut(ShortCutText));
+  ShortCutText: string; ShortCutText2: string = ''): TKeyBinding;
+begin
+  Result := AddItem(ShortName, FullName, TextToShortCut(ShortCutText),
+    TextToShortCut(ShortCutText2));
 end;
 
@@ -141 +212 @@
   BStay := AddItem('Stay', 'Stay', 'S');
   BNoOrders := AddItem('NoOrders', 'No orders', 'Space');
+  BCancel := AddItem('Cancel', 'Cancel', 'Ctrl+C');
+  BPillage := AddItem('Pillage', 'Pillage', 'Ctrl+P');
+  BSelectTransport := AddItem('SelectTransport', 'Select transport', 'Ctrl+T');
   BTechTree := AddItem('TechTree', 'Tech tree', 'T');
   BWait := AddItem('Wait', 'Wait', 'W');
   BJump := AddItem('Jump', 'Jump 20 turns', 'Ctrl+J');
+  BMapBtn0 := AddItem('MapButton1', 'Map button 1', '1');
+  BMapBtn1 := AddItem('MapButton2', 'Map button 2', '2');
+  BMapBtn4 := AddItem('MapButton3', 'Map button 3', '3');
+  BMapBtn5 := AddItem('MapButton4', 'Map button 4', '4');
+  BMapBtn6 := AddItem('MapButton5', 'Map button 5', '5');
+  BSetDebugMap0 := AddItem('SetDebugMap0', 'Set debug map 0', '0');
+  BSetDebugMap1 := AddItem('SetDebugMap1', 'Set debug map 1', '1');
+  BSetDebugMap2 := AddItem('SetDebugMap2', 'Set debug map 2', '2');
+  BSetDebugMap3 := AddItem('SetDebugMap3', 'Set debug map 3', '3');
+  BSetDebugMap4 := AddItem('SetDebugMap4', 'Set debug map 4', '4');
+  BSetDebugMap5 := AddItem('SetDebugMap5', 'Set debug map 5', '5');
+  BSetDebugMap6 := AddItem('SetDebugMap6', 'Set debug map 6', '6');
+  BSetDebugMap7 := AddItem('SetDebugMap7', 'Set debug map 7', '7');
+  BSetDebugMap8 := AddItem('SetDebugMap8', 'Set debug map 8', '8');
+  BSetDebugMap9 := AddItem('SetDebugMap9', 'Set debug map 9', '9');
+  BDebugMap := AddItem('DebugMap', 'Debug map', 'Ctrl+K');
+  BLocCodes := AddItem('LocCodes', 'Location codes', 'Ctrl+L');
+  BLogDlg := AddItem('LogDlg', 'Log dialog', 'Ctrl+M');
+  BNames := AddItem('ShowNames', 'Show names', 'Ctrl+N');
+  BRun := AddItem('Run', 'Run', 'Ctrl+R');
+  BTestMapRepaint := AddItem('TestMapRepaint', 'Test map reapaint', 'Ctrl+Space');
+  BSetViewpoint0 := AddItem('SetViewpoint0', 'Set viewpoint 0', 'Ctrl+0');
+  BSetViewpoint1 := AddItem('SetViewpoint1', 'Set viewpoint 1', 'Ctrl+1');
+  BSetViewpoint2 := AddItem('SetViewpoint2', 'Set viewpoint 2', 'Ctrl+2');
+  BSetViewpoint3 := AddItem('SetViewpoint3', 'Set viewpoint 3', 'Ctrl+3');
+  BSetViewpoint4 := AddItem('SetViewpoint4', 'Set viewpoint', 'Ctrl+4');
+  BSetViewpoint5 := AddItem('SetViewpoint0', 'Set viewpoint', 'Ctrl+5');
+  BSetViewpoint6 := AddItem('SetViewpoint1', 'Set viewpoint', 'Ctrl+6');
+  BSetViewpoint7 := AddItem('SetViewpoint2', 'Set viewpoint', 'Ctrl+7');
+  BSetViewpoint8 := AddItem('SetViewpoint3', 'Set viewpoint', 'Ctrl+8');
+  BSetViewpoint9 := AddItem('SetViewpoint4', 'Set viewpoint', 'Ctrl+9');
+  BAirBase := AddItem('AirBase', 'Air base', 'A');
+  BBuildCity := AddItem('BuildCity', 'Build city', 'B');
+  BEnhance := AddItem('Enhance', 'Enhance', 'E');
+  BGoOn := AddItem('GoOn', 'Go on', 'G');
+  BHome := AddItem('Home', 'Home', 'H');
+  BFarmClearIrrigation := AddItem('FarmClearIrrigation', 'Farm/Clear/Irrigation', 'I');
+  BLoad := AddItem('Load', 'Load', 'L');
+  BAfforestMine := AddItem('AfforestMine', 'Afforest/Mine', 'M');
+  BCanal := AddItem('Canal', 'Canal', 'N');
+  BTrans := AddItem('Trans', 'Trans', 'O');
+  BPollution := AddItem('Pollution', 'Pollution', 'P');
+  BRailRoad := AddItem('RailRoad', 'Rails/Road', 'R');
+  BUnload := AddItem('Unload', 'Unload', 'U');
+  BRecover := AddItem('Recover', 'Recover', 'V');
+  BUtilize := AddItem('Utilize', 'Utilize', 'Z');
+  BMoveLeftDown := AddItem('MoveLeftDown', 'Move unit left-down', 'Num1', 'End');
+  BMoveDown := AddItem('MoveDown', 'Move unit down', 'Num2', 'Down');
+  BMoveRightDown := AddItem('MoveRightDown', 'Move unit right-down', 'Num3', 'PgDn');
+  BMoveRight := AddItem('MoveRight', 'Move unit right', 'Num6', 'Right');
+  BMoveRightUp := AddItem('MoveRightUp', 'Move unit right-up', 'Num9', 'PgUp');
+  BMoveUp := AddItem('MoveUp', 'Move unit up', 'Num8', 'Up');
+  BMoveLeftUp := AddItem('MoveLeftUp', 'Move unit left-up', 'Num7', 'Home');
+  BMoveLeft := AddItem('MoveLeft', 'Move unit left', 'Num4', 'Left');
 end;