Add keyboard shortcut to actions in the UI

Also bolds action tooltip text to make it clearer. Shortcuts live inside ({shortcut-here}) in the tooltip
qgis · Jan 21, 2017 · 6d53f83 · DelazJ · Jan 21, 2017 · NathanW2
1 parent ad963e6
commit 6d53f83
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/src/gui/qgsshortcutsmanager.cpp b/src/gui/qgsshortcutsmanager.cpp
@@ -103,6 +103,8 @@ bool QgsShortcutsManager::registerAction( QAction* action, const QString& defaul
   QString sequence = settings.value( mSettingsPath + actionText, defaultSequence ).toString();
 
   action->setShortcut( sequence );
+  action->setToolTip( "<b>" + action->toolTip() + "</b>" );
+  this->updateActionToolTip( action, sequence );
 
   return true;
 }
@@ -216,6 +218,7 @@ bool QgsShortcutsManager::setObjectKeySequence( QObject* object, const QString&
 bool QgsShortcutsManager::setKeySequence( QAction* action, const QString& sequence )
 {
   action->setShortcut( sequence );
+  this->updateActionToolTip( action, sequence );
 
   QString actionText = action->text();
   actionText.remove( '&' ); // remove the accelerator
@@ -307,3 +310,20 @@ void QgsShortcutsManager::shortcutDestroyed()
 {
   mShortcuts.remove( qobject_cast<QShortcut*>( sender() ) );
 }
+
+void QgsShortcutsManager::updateActionToolTip( QAction *action, QString sequence )
+{
+  QString current = action->toolTip();
+  // Remove the old shortcut.
+  QRegExp rx( "\\(.*\\)" );
+  current.replace( rx, "" );
+
+  if ( !sequence.isEmpty() )
+  {
+    action->setToolTip( current + " (" + sequence + ")" );
+  }
+  else
+  {
+    action->setToolTip( current );
+  }
+}
diff --git a/src/gui/qgsshortcutsmanager.h b/src/gui/qgsshortcutsmanager.h
@@ -231,6 +231,14 @@ class GUI_EXPORT QgsShortcutsManager : public QObject
     ShortcutsHash mShortcuts;
     QString mSettingsPath;
     static QgsShortcutsManager* sInstance;
+
+    /**
+     * Updates the action to include the shortcut keys. Shortcut keys are
+     * included between () at the end of the action tooltop.
+     * @param action The action to append the shortcut.
+     * @param sequence The shortcut sequence.
+     */
+    void updateActionToolTip( QAction* action, QString sequence );
 };
 
 #endif // QGSSHORTCUTSMANAGER_H