enhance: make file exit action OS friendly

ansgarbecker · ansgarbecker · commit 1f19d004905a · 2025-10-19T13:10:38.000+02:00
Sets default shortcut Ctrl+Q and Quit caption in Linux. Also, move the predefined shortcut from the main menu item to the underlying action item, where it belongs. Closes #2277
diff --git a/source/main.lfm b/source/main.lfm
@@ -3607,7 +3607,6 @@ object MainForm: TMainForm
       end
       object FileExitItem: TMenuItem
         Action = actExitApplication
-        ShortCut = 32883
       end
     end
     object MainMenuEdit: TMenuItem
@@ -3921,6 +3920,7 @@ object MainForm: TMainForm
       Caption = 'E&xit'
       Hint = 'Exit|Exit application'
       ImageIndex = 26
+      ShortCut = 32883
       OnExecute = actExitApplicationExecute
     end
     object actFollowForeignKey: TAction
diff --git a/source/main.pas b/source/main.pas
@@ -2046,12 +2046,25 @@ procedure TMainForm.FormCreate(Sender: TObject);
   if AppSettings.ReadBool(asDoubleClickInsertsNodeText) then
     menuDoubleClickInsertsNodeText.Click;
 
-  // Shortcuts
-  FActionList1DefaultCaptions := TStringList.Create;
-  FActionList1DefaultHints := TStringList.Create;
+  // Make exit action OS friendly
+  {$IFDEF UNIX}
+    actExitApplication.Caption := '&Quit';
+    actExitApplication.ShortCut := KeyToShortCut(VK_Q, [ssCtrl]);
+  {$ENDIF}
+  {$IFDEF WINDOWS}
+    actExitApplication.Caption := 'E&xit';
+    actExitApplication.ShortCut := KeyToShortCut(VK_F4, [ssAlt]);
+  {$ENDIF}
+  // Customized keyboard shortcuts
   for i:=0 to ActionList1.ActionCount-1 do begin
     Action := TAction(ActionList1.Actions[i]);
     Action.ShortCut := AppSettings.ReadInt(asActionShortcut1, Action.Name, Action.ShortCut);
+  end;
+
+  // Keep a list of untranslated captions and hints of actions
+  FActionList1DefaultCaptions := TStringList.Create;
+  FActionList1DefaultHints := TStringList.Create;
+  for i:=0 to ActionList1.ActionCount-1 do begin
     FActionList1DefaultCaptions.Insert(i, Action.Caption);
     FActionList1DefaultHints.Insert(i, Action.Hint);
   end;
