Changed bookmark menu shortcut to Ctrl+D and Disconnect shortcut to Shift+Ctrl+F

Resolves #1982337

1 files changed, 9 insertions, 6 deletions

diff --git a/UMain.pas b/UMain.pas
index ff1c330..be60b0e 100644
--- a/UMain.pas
+++ b/UMain.pas
@@ -467,8 +467,8 @@ begin
   RightPasswordButton := TGTKImageButton.Create(Self);   RightPasswordButton.Icon := StockLock16;
   LeftPasswordButton.BorderStyle := bsNone;
   RightPasswordButton.BorderStyle := bsNone;
-  LeftBookmarkButton.SetSizeRequest(22, 22);        LeftBookmarkButton.Tooltip := LANGBookmarkButton_Tooltip;
-  RightBookmarkButton.SetSizeRequest(22, 22);       RightBookmarkButton.Tooltip := LANGBookmarkButton_Tooltip;
+  LeftBookmarkButton.SetSizeRequest(22, 22);        LeftBookmarkButton.Tooltip := LANGBookmarkButton_Tooltip + ' (Ctrl+D)';
+  RightBookmarkButton.SetSizeRequest(22, 22);       RightBookmarkButton.Tooltip := LANGBookmarkButton_Tooltip + ' (Ctrl+D)';
   LeftPasswordButton.SetSizeRequest(28, 22);        LeftPasswordButton.Tooltip := LANGPasswordButton_Tooltip;
   RightPasswordButton.SetSizeRequest(28, 22);       RightPasswordButton.Tooltip := LANGPasswordButton_Tooltip;
   LeftPasswordButton.Visible := False;
@@ -523,13 +523,13 @@ begin
   LeftDisconnectButton.Caption := '✖';
   LeftDisconnectButton.CanFocus := False;
   LeftDisconnectButton.SetSizeRequest(22, 22);
-  LeftDisconnectButton.Tooltip := LANGDisconnectButton_Tooltip;
+  LeftDisconnectButton.Tooltip := LANGDisconnectButton_Tooltip + ' (Shift+Ctrl+F)';
   LeftDisconnectButton.Visible := False;
   RightDisconnectButton := TGTKButton.Create(Self);
   RightDisconnectButton.Caption := '✖';
   RightDisconnectButton.CanFocus := False;
   RightDisconnectButton.SetSizeRequest(22, 22);
-  RightDisconnectButton.Tooltip := LANGDisconnectButton_Tooltip;
+  RightDisconnectButton.Tooltip := LANGDisconnectButton_Tooltip + ' (Shift+Ctrl+F)';
   RightDisconnectButton.Visible := False;
   LeftLeaveArchiveButton := TGTKButton.Create(Self);
   LeftLeaveArchiveButton.Caption := '⇚';
@@ -879,7 +879,7 @@ begin
   miDisconnect := TGTKMenuItem.CreateTyped(Self, itImageText);
   miDisconnect.Caption := LANGmiDisconnect_Caption;
   miDisconnect.Enabled := False;
-  miDisconnect.ShortCuts.AddName('<Control>D');
+  miDisconnect.ShortCuts.AddName('<Shift><Control>F');
   miDisconnect.StockIcon := 'gtk-disconnect';
   miDisconnect.OnClick := miDisconnectClick;
   mnuNetwork.Add(miDisconnect);
@@ -1412,7 +1412,6 @@ begin
                                                     if QuickFind then QuickFindSendKey(LeftPanel, Key)
                                                                  else ActivateCommandLine(Key);
                                                   end;
-
     GDK_P, GDK_Capital_P, GDK_N, GDK_Capital_N:
       if ((Shift = [ssAlt]) or (Shift = [ssCtrl]) or ((Shift = []) and (not QuickFind))) { and (CommandLineHistory.Count > 0) }
         then CommandLineComboKeyDown(Sender, Key, Shift, Accept)
@@ -1420,6 +1419,10 @@ begin
     GDK_A, GDK_Capital_A: if (Shift = [ssAlt]) or (Shift = [ssCtrl]) or ((Shift = []) and (not QuickFind))
                             then CommandLineComboKeyDown(Sender, Key, Shift, Accept)
                             else if QuickFind then QuickFindSendKey(LeftPanel, Key);
+    GDK_D, GDK_Capital_D: if Shift = [ssCtrl] then begin
+               ShowBookmarkQuick(LeftPanel);
+               Accept := False;
+             end;
     GDK_WIN_POPUP : begin
                       Accept := False;
                       PopupFileMenuPos;