Changeset 263

Timestamp:

Jun 11, 2020, 10:57:27 PM (5 years ago)

Author:

chronos

Message:

• Modified: More keyboard shortcuts made configurable.

Location:

trunk

Files:

• LocalPlayer/Term.pas (modified) (5 diffs)
• UKeyBindings.pas (modified) (2 diffs)

trunk/LocalPlayer/Term.pas

@@ -6460 +6460 @@
   begin
     case Key of
-      VK_F4:
-        MenuClick_Check(StatPopup, mScienceStat);
-      VK_F6:
-        MenuClick_Check(StatPopup, mDiagram);
-      VK_F7:
-        MenuClick_Check(StatPopup, mWonders);
-      VK_F8:
-        MenuClick_Check(StatPopup, mShips);
+      VK_F4: MenuClick_Check(StatPopup, mScienceStat);
+      VK_F6: MenuClick_Check(StatPopup, mDiagram);
+      VK_F7: MenuClick_Check(StatPopup, mWonders);
+      VK_F8: MenuClick_Check(StatPopup, mShips);
     end;
     exit;
   end;
 
-  if not idle then
-    exit;
-
-  if ClientMode = cEditMap then
-  begin
-    if Shift = [ssCtrl] then
+  if not idle then exit;
+
+  if ClientMode = cEditMap then begin
+    if ShortCut = BResign.ShortCut then MenuClick(mResign)
+    else if ShortCut = BRandomMap.ShortCut then MenuClick(mRandomMap)
+    else if ShortCut = BHelp.ShortCut then MenuClick(mHelp);
+    (*if Shift = [ssCtrl] then
       case char(Key) of
-        (* 'A':
+         'A':
           begin // auto symmetry
           Server($7F0,me,0,nil^);
@@ -6491 +6488 @@
           if MyMap[dx] and fTerrain>=fGrass then inc(dy);
           dy:=dy
-          end; *)
-        'Q':
-          MenuClick(mResign);
-        'R':
-          MenuClick(mRandomMap);
+          end;
       end;
-    if ShortCut = BHelp.ShortCut then MenuClick(mHelp);
+    *)
+
     Exit;
   end;
@@ -6513 +6507 @@
   else if ShortCut = BEmpire.ShortCut then MenuClick_Check(StatPopup, mEmpire);
 
-  if Shift = [ssAlt] then
+  if Shift = [ssAlt] then begin
     case char(Key) of
-      '0':
-        SetDebugMap(-1);
-      '1' .. '9':
-        SetDebugMap(ord(Key) - 48);
+      '0': SetDebugMap(-1);
+      '1'..'9': SetDebugMap(ord(Key) - 48);
     end
-  else if Shift = [ssCtrl] then
+  end else if Shift = [ssCtrl] then begin
     case char(Key) of
-      'J':
-        MenuClick(mJump);
-      'K':
-        mShowClick(mDebugMap);
-      'L':
-        mShowClick(mLocCodes);
-      'M':
-        if LogDlg.Visible then
-          LogDlg.Close
-        else
-          LogDlg.Show;
-      'N':
-        mNamesClick(mNames);
-      'Q':
-        MenuClick_Check(GamePopup, mResign);
-      'R':
-        MenuClick(mRun);
-      '0' .. '9':
-        begin
-          if ord(Key) - 48 = me then
-            SetViewpoint(0)
-          else
-            SetViewpoint(ord(Key) - 48);
+      'J': MenuClick(mJump);
+      'K': mShowClick(mDebugMap);
+      'L': mShowClick(mLocCodes);
+      'M': if LogDlg.Visible then LogDlg.Close
+        else LogDlg.Show;
+      'N': mNamesClick(mNames);
+      'Q': MenuClick_Check(GamePopup, mResign);
+      'R': MenuClick(mRun);
+      '0'..'9': begin
+          if ord(Key) - 48 = me then SetViewpoint(0)
+            else SetViewpoint(ord(Key) - 48);
         end;
-      ' ':
-        begin // test map repaint time
+      ' ': begin // test map repaint time
           time0 := NowPrecise;
           MapValid := false;
@@ -6554 +6533 @@
           SimpleMessage(Format('Map repaint time: %.3f ms',
             [(time1 - time0) / OneMillisecond]));
-        end
+        end;
     end
-  else if Shift = [] then
+  end else if Shift = [] then begin
     case char(Key) of
-      '1':
-        MapBtnClick(MapBtn0);
-      '2':
-        MapBtnClick(MapBtn1);
-      '3':
-        MapBtnClick(MapBtn4);
-      '4':
-        MapBtnClick(MapBtn5);
-      '5':
-        MapBtnClick(MapBtn6);
-      'T':
-        MenuClick(mTechTree);
-      'W':
-        MenuClick(mWait);
+      '1': MapBtnClick(MapBtn0);
+      '2': MapBtnClick(MapBtn1);
+      '3': MapBtnClick(MapBtn4);
+      '4': MapBtnClick(MapBtn5);
+      '5': MapBtnClick(MapBtn6);
+      'T': MenuClick(mTechTree);
+      'W': MenuClick(mWait);
     end;
-
-  if UnFocus >= 0 then
-    if Shift = [ssCtrl] then
+  end;
+
+  if UnFocus >= 0 then begin
+    if ShortCut = BDisbandUnit.ShortCut then MenuClick(mDisband)
+    else if ShortCut = BFortify.ShortCut then MenuClick_Check(TerrainPopup, mFort)
+    else if ShortCut = BCenterUnit.ShortCut then MenuClick(mCentre)
+    else if ShortCut = BStay.ShortCut then MenuClick(mStay)
+    else if ShortCut = BNoOrders.ShortCut then MenuClick(mNoOrders);
+
+    if Shift = [ssCtrl] then begin
       case char(Key) of
-        'C':
-          MenuClick_Check(UnitPopup, mCancel);
-        'D':
-          MenuClick(mDisband);
-        'P':
-          MenuClick_Check(UnitPopup, mPillage);
-        'T':
-          MenuClick_Check(UnitPopup, mSelectTransport);
-      end
-    else if Shift = [] then
+        'C': MenuClick_Check(UnitPopup, mCancel);
+        'P': MenuClick_Check(UnitPopup, mPillage);
+        'T': MenuClick_Check(UnitPopup, mSelectTransport);
+      end;
+    end else if Shift = [] then begin
       case char(Key) of
-        ' ':
-          MenuClick(mNoOrders);
-        'A':
-          MenuClick_Check(TerrainPopup, mAirBase);
-        'B':
-          MenuClick_Check(UnitPopup, mCity);
-        'C':
-          MenuClick(mCentre);
-        'E':
-          begin
+        'A': MenuClick_Check(TerrainPopup, mAirBase);
+        'B': MenuClick_Check(UnitPopup, mCity);
+        'E': begin
             InitPopup(TerrainPopup);
             if mEnhance.Visible and mEnhance.Enabled then
               MenuClick(mEnhance)
-            else
-              MenuClick(mEnhanceDef)
+            else MenuClick(mEnhanceDef)
           end;
-        'F':
-          MenuClick_Check(TerrainPopup, mFort);
-        'G':
-          MenuClick_Check(UnitPopup, mGoOn);
-        'H':
-          MenuClick_Check(UnitPopup, mHome);
-        'I':
-          if JobTest(UnFocus, jFarm, [eTreaty]) then
+        'G': MenuClick_Check(UnitPopup, mGoOn);
+        'H': MenuClick_Check(UnitPopup, mHome);
+        'I': if JobTest(UnFocus, jFarm, [eTreaty]) then
             MenuClick(mFarm)
           else if JobTest(UnFocus, jClear, [eTreaty]) then
             MenuClick(mClear)
-          else
-            MenuClick_Check(TerrainPopup, mIrrigation);
-        'L':
-          MenuClick_Check(UnitPopup, mLoad);
-        'M':
-          if JobTest(UnFocus, jAfforest, [eTreaty]) then
+          else MenuClick_Check(TerrainPopup, mIrrigation);
+        'L': MenuClick_Check(UnitPopup, mLoad);
+        'M': if JobTest(UnFocus, jAfforest, [eTreaty]) then
             MenuClick(mAfforest)
-          else
-            MenuClick_Check(TerrainPopup, mMine);
-        'N':
-          MenuClick_Check(TerrainPopup, mCanal);
-        'O':
-          MenuClick_Check(TerrainPopup, MTrans);
-        'P':
-          MenuClick_Check(TerrainPopup, mPollution);
-        'R':
-          if JobTest(UnFocus, jRR, [eTreaty]) then
+          else MenuClick_Check(TerrainPopup, mMine);
+        'N': MenuClick_Check(TerrainPopup, mCanal);
+        'O': MenuClick_Check(TerrainPopup, MTrans);
+        'P': MenuClick_Check(TerrainPopup, mPollution);
+        'R': if JobTest(UnFocus, jRR, [eTreaty]) then
             MenuClick(mRR)
-          else
-            MenuClick_Check(TerrainPopup, mRoad);
-        'S':
-          MenuClick(mStay);
-        'U':
-          MenuClick_Check(UnitPopup, mUnload);
-        'V':
-          MenuClick_Check(UnitPopup, mRecover);
-        'Z':
-          MenuClick_Check(UnitPopup, mUtilize);
+          else MenuClick_Check(TerrainPopup, mRoad);
+        'U': MenuClick_Check(UnitPopup, mUnload);
+        'V': MenuClick_Check(UnitPopup, mRecover);
+        'Z': MenuClick_Check(UnitPopup, mUtilize);
         #33 .. #40, #97 .. #100, #102 .. #105:
           begin { arrow keys }
@@ -6693 +6640 @@
             MoveUnit(dx, dy, muAutoNext)
           end;
-      end
+      end;
+    end;
+  end;
 end;
 

trunk/UKeyBindings.pas

@@ -38 +38 @@
   BNations: TKeyBinding;
   BEmpire: TKeyBinding;
+  BResign: TKeyBinding;
+  BRandomMap: TKeyBinding;
+  BDisbandUnit: TKeyBinding;
+  BFortify: TKeyBinding;
+  BCenterUnit: TKeyBinding;
+  BStay: TKeyBinding;
+  BNoOrders: TKeyBinding;
 
 
@@ -113 +120 @@
 
 KeyBindings := TKeyBindings.Create;
-BEndTurn := KeyBindings.AddItem('EndTurn', 'End turn', 'NumPlus');
-BHelp := KeyBindings.AddItem('Help', 'Help', 'F1');
-BUnitStat := KeyBindings.AddItem('UnitStat', 'Unit stat', 'F2');
-BCityStat := KeyBindings.AddItem('CityStat', 'City stat', 'F3');
-BScienceStat := KeyBindings.AddItem('ScienceStat', 'Science research', 'F4');
-BEUnitStat := KeyBindings.AddItem('EnemyUnitStat', 'Enemy unit stat', 'F5');
-BDiagram := KeyBindings.AddItem('Diagram', 'Charts', 'F6');
-BWonders := KeyBindings.AddItem('Wonders', 'World wonders', 'F7');
-BShips := KeyBindings.AddItem('Ships', 'Colonization ships', 'F8');
-BNations := KeyBindings.AddItem('Nations', 'Nations', 'F9');
-BEmpire := KeyBindings.AddItem('Empire', 'Empire', 'F10');
+with KeyBindings do begin
+  BEndTurn := AddItem('EndTurn', 'End turn', 'NumPlus');
+  BHelp := AddItem('Help', 'Help', 'F1');
+  BUnitStat := AddItem('UnitStat', 'Unit stat', 'F2');
+  BCityStat := AddItem('CityStat', 'City stat', 'F3');
+  BScienceStat := AddItem('ScienceStat', 'Science research', 'F4');
+  BEUnitStat := AddItem('EnemyUnitStat', 'Enemy unit stat', 'F5');
+  BDiagram := AddItem('Diagram', 'Charts', 'F6');
+  BWonders := AddItem('Wonders', 'World wonders', 'F7');
+  BShips := AddItem('Ships', 'Colonization ships', 'F8');
+  BNations := AddItem('Nations', 'Nations', 'F9');
+  BEmpire := AddItem('Empire', 'Empire', 'F10');
+  BResign := AddItem('Resign', 'Resign', 'Ctrl+Q');
+  BRandomMap := AddItem('RandomMap', 'Random map', 'Ctrl+R');
+  BDisbandUnit := AddItem('DisbandUnit', 'Disband unit', 'Ctrl+D');
+  BFortify := AddItem('Fortify', 'Fortify', 'F');
+  BCenterUnit := AddItem('CenterUnit', 'Center', 'C');
+  BStay := AddItem('Stay', 'Stay', 'S');
+  BNoOrders := AddItem('NoOrders', 'No orders', ' ');
+end;