GUI - add shortcut combos to tooltips

sonic-pi-net · Jul 28, 2015 · 7e4df36 · 7e4df36
1 parent bcd9704
commit 7e4df36
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
@@ -818,18 +818,18 @@ void MainWindow::initPrefsWindow() {
   show_line_numbers = new QCheckBox(tr("Show line numbers"));
   show_line_numbers->setToolTip(tr("Toggle line number visibility."));
   show_log = new QCheckBox(tr("Show log"));
-  show_log->setToolTip(tr("Toggle visibility of the log."));
+  show_log->setToolTip(tooltipStrShiftMeta('L', tr("Toggle visibility of the log.")));
   show_log->setChecked(true);
   show_buttons = new QCheckBox(tr("Show buttons"));
-  show_buttons->setToolTip(tr("Toggle visibility of the control buttons."));
+  show_buttons->setToolTip(tooltipStrShiftMeta('B', tr("Toggle visibility of the control buttons.")));
   show_buttons->setChecked(true);
   show_tabs = new QCheckBox(tr("Show tabs"));
   show_tabs->setChecked(true);
   show_tabs->setToolTip(tr("Toggle visibility of the buffer selection tabs."));
   full_screen = new QCheckBox(tr("Full screen"));
-  full_screen->setToolTip(tr("Toggle full screen mode."));
+  full_screen->setToolTip(tooltipStrShiftMeta('F', tr("Toggle full screen mode.")));
   dark_mode = new QCheckBox(tr("Dark mode"));
-  dark_mode->setToolTip(tr("Toggle dark mode.\nDark mode is perfect for live coding in night clubs."));
+  dark_mode->setToolTip(tooltipStrShiftMeta('M', tr("Toggle dark mode.")) + QString(tr("\nDark mode is perfect for live coding in night clubs.")));
   connect(show_line_numbers, SIGNAL(clicked()), this, SLOT(changeShowLineNumbers()));
   connect(show_log, SIGNAL(clicked()), this, SLOT(updateLogVisibility()));
   connect(show_buttons, SIGNAL(clicked()), this, SLOT(updateButtonVisibility()));
@@ -1701,18 +1701,31 @@ char MainWindow::int2char(int i){
   return '0' + i;
 }
 
+ QString MainWindow::tooltipStrShiftMeta(char key, QString str) {
+#ifdef Q_OS_MAC
+    return QString("%1 (⇧⌘%2)").arg(str).arg(key);
+#else
+    return QString("%1 (⇧-alt-%2)").arg(str).arg(key);
+#endif
+}
+
+ QString MainWindow::tooltipStrMeta(char key, QString str) {
+#ifdef Q_OS_MAC
+    return QString("%1 (⌘%2)").arg(str).arg(key);
+#else
+    return QString("%1 (alt-%2)").arg(str).arg(key);
+#endif
+}
+
+
 // set tooltips, connect event handlers, and add shortcut if applicable
 void MainWindow::setupAction(QAction *action, char key, QString tooltip,
 			     const char *slot)
 {
   QString shortcut, tooltipKey;
   tooltipKey = tooltip;
   if (key != 0) {
-#ifdef Q_OS_MAC
-    tooltipKey = QString("%1 (⌘%2)").arg(tooltip).arg(key);
-#else
-    tooltipKey = QString("%1 (alt-%2)").arg(tooltip).arg(key);
-#endif
+    tooltipKey = tooltipStrMeta(key, tooltip);
   }
 
   action->setToolTip(tooltipKey);

diff --git a/app/gui/qt/mainwindow.h b/app/gui/qt/mainwindow.h
@@ -188,6 +188,8 @@ private slots:
     char int2char(int i);
     void setupAction(QAction *action, char key, QString tooltip,
 		     const char *slot);
+    QString tooltipStrShiftMeta(char key, QString str);
+    QString tooltipStrMeta(char key, QString str);
     QString readFile(QString name);
     QString rootPath();