From 7e2e8b973163e1716a08da7c798b1a7c0953fee1 Mon Sep 17 00:00:00 2001
From: Mike Skec <skec@protonmail.ch>
Date: Fri, 12 Mar 2021 17:31:02 +1100
Subject: Add accelerators to menubar

A bit of a hack was needed to add these to the dock menu items - the accelerators won't work in non-English languages
---
 src/mainwindow.cpp |  9 +++++++++
 src/mainwindow.ui  | 48 ++++++++++++++++++++++++------------------------
 2 files changed, 33 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ea34b74..18cc557 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -50,6 +50,15 @@ MainWindow::MainWindow(QApplication * app, QWidget *parent) :
         QAction * act = dock->toggleViewAction();
         act->setShortcut(dock->property("_shortcut").toString());
         // act->setIcon(dock->windowIcon());
+
+        // TODO: make this work in non-English languages somehow
+        if (act->text() == "Document Outline")
+            act->setText("Document &Outline");
+        else if (act->text() == "Favourites")
+            act->setText("&Favourites");
+        else if (act->text() == "History")
+            act->setText("&History");
+
         this->ui->menuView->addAction(act);
     }
 
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 2659a65..c85bd22 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -186,7 +186,7 @@
    </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
-     <string>File</string>
+     <string>&amp;File</string>
     </property>
     <addaction name="actionNew_Tab"/>
     <addaction name="actionNew_window"/>
@@ -202,7 +202,7 @@
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
-     <string>Help</string>
+     <string>&amp;Help</string>
     </property>
     <addaction name="actionHelp"/>
     <addaction name="actionChangelog"/>
@@ -212,14 +212,14 @@
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
-     <string>View</string>
+     <string>&amp;View</string>
     </property>
     <addaction name="actionShow_document_source"/>
     <addaction name="separator"/>
    </widget>
    <widget class="QMenu" name="menuNavigation">
     <property name="title">
-     <string>Navigation</string>
+     <string>&amp;Navigation</string>
     </property>
     <addaction name="actionGo_to_home"/>
     <addaction name="actionBackward"/>
@@ -242,7 +242,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>About...</string>
+    <string>&amp;About...</string>
    </property>
   </action>
   <action name="actionQuit">
@@ -251,7 +251,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Quit</string>
+    <string>&amp;Quit</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Q</string>
@@ -259,7 +259,7 @@
   </action>
   <action name="actionNew_Tab">
    <property name="text">
-    <string>New Tab</string>
+    <string>New &amp;Tab</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+T</string>
@@ -271,7 +271,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Close Tab</string>
+    <string>&amp;Close Tab</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+W</string>
@@ -283,7 +283,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Settings</string>
+    <string>&amp;Settings</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+,</string>
@@ -295,7 +295,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Back</string>
+    <string>&amp;Back</string>
    </property>
    <property name="toolTip">
     <string>Back</string>
@@ -310,7 +310,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Forward</string>
+    <string>For&amp;ward</string>
    </property>
    <property name="toolTip">
     <string>Forward</string>
@@ -325,7 +325,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Root</string>
+    <string>R&amp;oot</string>
    </property>
    <property name="toolTip">
     <string>Go to the root directory (/)</string>
@@ -340,7 +340,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Parent</string>
+    <string>&amp;Parent</string>
    </property>
    <property name="toolTip">
     <string>Go to the parent directory</string>
@@ -355,7 +355,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Refresh</string>
+    <string>&amp;Refresh</string>
    </property>
    <property name="shortcut">
     <string>F5</string>
@@ -367,7 +367,7 @@
      <normaloff>:/icons/common/qt.svg</normaloff>:/icons/common/qt.svg</iconset>
    </property>
    <property name="text">
-    <string>About Qt...</string>
+    <string>About &amp;Qt...</string>
    </property>
   </action>
   <action name="actionSave_as">
@@ -376,7 +376,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Save as...</string>
+    <string>&amp;Save as...</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+S</string>
@@ -391,7 +391,7 @@
      <normaloff>:/icons/light/actions/favourite-on.svg</normaloff>:/icons/light/actions/favourite-on.svg</iconset>
    </property>
    <property name="text">
-    <string>Add to favourites</string>
+    <string>Add to &amp;favourites</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+D</string>
@@ -403,7 +403,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Go to home</string>
+    <string>Go to &amp;home</string>
    </property>
    <property name="shortcut">
     <string>Alt+Home</string>
@@ -415,7 +415,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Help</string>
+    <string>&amp;Help</string>
    </property>
    <property name="shortcut">
     <string>F1</string>
@@ -427,7 +427,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Changelog</string>
+    <string>Change&amp;log</string>
    </property>
   </action>
   <action name="actionManage_Certificates">
@@ -436,12 +436,12 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Manage Certificates…</string>
+    <string>&amp;Manage Certificates…</string>
    </property>
   </action>
   <action name="actionShow_document_source">
    <property name="text">
-    <string>View document source</string>
+    <string>View document &amp;source</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+U</string>
@@ -449,7 +449,7 @@
   </action>
   <action name="actionNew_window">
    <property name="text">
-    <string>New Window</string>
+    <string>New &amp;window</string>
    </property>
    <property name="toolTip">
     <string>Opens a new window</string>
@@ -460,7 +460,7 @@
   </action>
   <action name="actionClose_Window">
    <property name="text">
-    <string>Close Window</string>
+    <string>Close Win&amp;dow</string>
    </property>
    <property name="shortcut">
     <string>Alt+F4</string>
-- 
cgit v1.2.3