diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index dc832b77e34d33d66c6e9fdb1ae0a8fb8d685102..65000c43cabd1fb9793cffc6b3609836eec1bac9 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -366,23 +366,23 @@ void MainWindow::init() // Set OS dependent keyboard shortcuts for the main window, non OS dependent shortcuts are set in MainWindow.ui #ifdef Q_OS_MACX - ui.actionFlightView->setShortcut(QApplication::translate("MainWindow", "Meta+1", 0, QApplication::UnicodeUTF8)); - ui.actionMissionView->setShortcut(QApplication::translate("MainWindow", "Meta+2", 0, QApplication::UnicodeUTF8)); - ui.actionHardwareConfig->setShortcut(QApplication::translate("MainWindow", "Meta+3", 0, QApplication::UnicodeUTF8)); - ui.actionSimulationView->setShortcut(QApplication::translate("MainWindow", "Meta+4", 0, QApplication::UnicodeUTF8)); - ui.actionEngineersView->setShortcut(QApplication::translate("MainWindow", "Meta+5", 0, QApplication::UnicodeUTF8)); - ui.actionMavlinkView->setShortcut(QApplication::translate("MainWindow", "Meta+M", 0, QApplication::UnicodeUTF8)); - ui.actionUnconnectedView->setShortcut(QApplication::translate("MainWindow", "Meta+U", 0, QApplication::UnicodeUTF8)); - ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Meta+Return", 0, QApplication::UnicodeUTF8)); + ui.actionFlightView->setShortcut(QApplication::translate("MainWindow", "Meta+1", 0)); + ui.actionMissionView->setShortcut(QApplication::translate("MainWindow", "Meta+2", 0)); + ui.actionHardwareConfig->setShortcut(QApplication::translate("MainWindow", "Meta+3", 0)); + ui.actionSimulationView->setShortcut(QApplication::translate("MainWindow", "Meta+4", 0)); + ui.actionEngineersView->setShortcut(QApplication::translate("MainWindow", "Meta+5", 0)); + ui.actionMavlinkView->setShortcut(QApplication::translate("MainWindow", "Meta+M", 0)); + ui.actionUnconnectedView->setShortcut(QApplication::translate("MainWindow", "Meta+U", 0)); + ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Meta+Return", 0)); #else - ui.actionFlightView->setShortcut(QApplication::translate("MainWindow", "Ctrl+1", 0, QApplication::UnicodeUTF8)); - ui.actionMissionView->setShortcut(QApplication::translate("MainWindow", "Ctrl+2", 0, QApplication::UnicodeUTF8)); - ui.actionHardwareConfig->setShortcut(QApplication::translate("MainWindow", "Ctrl+3", 0, QApplication::UnicodeUTF8)); - ui.actionSimulationView->setShortcut(QApplication::translate("MainWindow", "Ctrl+4", 0, QApplication::UnicodeUTF8)); - ui.actionEngineersView->setShortcut(QApplication::translate("MainWindow", "Ctrl+5", 0, QApplication::UnicodeUTF8)); - ui.actionMavlinkView->setShortcut(QApplication::translate("MainWindow", "Ctrl+M", 0, QApplication::UnicodeUTF8)); - ui.actionUnconnectedView->setShortcut(QApplication::translate("MainWindow", "Ctrl+U", 0, QApplication::UnicodeUTF8)); - ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Ctrl+Return", 0, QApplication::UnicodeUTF8)); + ui.actionFlightView->setShortcut(QApplication::translate("MainWindow", "Ctrl+1", 0)); + ui.actionMissionView->setShortcut(QApplication::translate("MainWindow", "Ctrl+2", 0)); + ui.actionHardwareConfig->setShortcut(QApplication::translate("MainWindow", "Ctrl+3", 0)); + ui.actionSimulationView->setShortcut(QApplication::translate("MainWindow", "Ctrl+4", 0)); + ui.actionEngineersView->setShortcut(QApplication::translate("MainWindow", "Ctrl+5", 0)); + ui.actionMavlinkView->setShortcut(QApplication::translate("MainWindow", "Ctrl+M", 0)); + ui.actionUnconnectedView->setShortcut(QApplication::translate("MainWindow", "Ctrl+U", 0)); + ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Ctrl+Return", 0)); #endif connect(&windowNameUpdateTimer, SIGNAL(timeout()), this, SLOT(configureWindowName()));