diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index bacbb6361bb3d2a3ccdd31600a972de328228a48..da85df9c87fb88868da0ca609592fe8a04ac1ab3 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -236,14 +236,6 @@ MainWindow::MainWindow() move((scrSize.width() - w) / 2, (scrSize.height() - h) / 2); } } - - // Make sure the proper fullscreen/normal menu item is checked properly. - _ui.actionFullscreen->setChecked(isFullScreen()); - _ui.actionNormal->setChecked(!isFullScreen()); - - // And that they will stay checked properly after user input - connect(_ui.actionFullscreen, &QAction::triggered, this, &MainWindow::fullScreenActionItemCallback); - connect(_ui.actionNormal, &QAction::triggered, this, &MainWindow::normalActionItemCallback); #endif connect(_ui.actionStatusBar, &QAction::triggered, this, &MainWindow::showStatusBarCallback); @@ -253,12 +245,10 @@ MainWindow::MainWindow() _ui.actionSetup->setShortcut(QApplication::translate("MainWindow", "Meta+1", 0)); _ui.actionPlan->setShortcut(QApplication::translate("MainWindow", "Meta+2", 0)); _ui.actionFlight->setShortcut(QApplication::translate("MainWindow", "Meta+3", 0)); - _ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Meta+Return", 0)); #else _ui.actionSetup->setShortcut(QApplication::translate("MainWindow", "Ctrl+1", 0)); _ui.actionPlan->setShortcut(QApplication::translate("MainWindow", "Ctrl+2", 0)); _ui.actionFlight->setShortcut(QApplication::translate("MainWindow", "Ctrl+3", 0)); - _ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Ctrl+Return", 0)); #endif _ui.actionFlight->setChecked(true); @@ -403,26 +393,6 @@ void MainWindow::_showDockWidgetAction(bool show) } #endif -void MainWindow::fullScreenActionItemCallback(bool) -{ - if (!_ui.actionFullscreen->isChecked()) - _ui.actionFullscreen->setChecked(true); - _ui.actionNormal->setChecked(false); -} - -void MainWindow::normalActionItemCallback(bool) -{ - if (!_ui.actionNormal->isChecked()) - _ui.actionNormal->setChecked(true); - _ui.actionFullscreen->setChecked(false); - - // Qt documentation says that just call showNormal and it will return properly - // So calling showMaximized. - if (isFullScreen()) { - showMaximized(); - } -} - void MainWindow::showStatusBarCallback(bool checked) { _showStatusBar = checked; diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index 5becbc8330ba72fa2ac5526eae26f9a3d423439e..a6e02b72b66131748d345b29ca1554f6e95ee7ff 100644 --- a/src/ui/MainWindow.h +++ b/src/ui/MainWindow.h @@ -115,18 +115,6 @@ public slots: void configureWindowName(); protected slots: - /** - * @brief Unchecks the normalActionItem. - * Used as a triggered() callback by the fullScreenAction to make sure only one of it or the - * normalAction are checked at a time, as they're mutually exclusive. - */ - void fullScreenActionItemCallback(bool); - /** - * @brief Unchecks the fullScreenActionItem. - * Used as a triggered() callback by the normalAction to make sure only one of it or the - * fullScreenAction are checked at a time, as they're mutually exclusive. - */ - void normalActionItemCallback(bool); /** * @brief Enable/Disable Status Bar */ diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui index efa88c7823116da057b91aed59a4e4ef3ea9721c..4c58ab268bf295f84e78e3a5b1524bbf3e34d0fc 100644 --- a/src/ui/MainWindow.ui +++ b/src/ui/MainWindow.ui @@ -51,7 +51,7 @@ 0 0 1024 - 20 + 21 @@ -80,8 +80,6 @@ - - @@ -159,31 +157,6 @@ QAction::PreferencesRole - - - true - - - false - - - Fullscreen - - - - - true - - - false - - - Normal - - - Esc - - true @@ -245,21 +218,5 @@ - - actionFullscreen - triggered() - MainWindow - showFullScreen() - - - -1 - -1 - - - 399 - 249 - - -