Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3f5ba935
Commit
3f5ba935
authored
Jun 24, 2014
by
Bryant Mairs
Browse files
QApplication::UnicodeUTF8 no longer exists as it is now the default.
parent
1f4c371f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ui/MainWindow.cc
View file @
3f5ba935
...
...
@@ -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
()));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment