diff options
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | desktop-widgets/mainwindow.h | 4 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 4 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.h | 2 |
4 files changed, 5 insertions, 11 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 8126acf10..f01d3ea48 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -297,8 +297,6 @@ MainWindow::MainWindow() : QMainWindow(), // now let's set up some connections connect(graphics, &ProfileWidget2::enableToolbar ,this, &MainWindow::setEnabledToolbar); - connect(graphics, &ProfileWidget2::disableShortcuts, this, &MainWindow::disableShortcuts); - connect(graphics, &ProfileWidget2::enableShortcuts, this, &MainWindow::enableShortcuts); connect(graphics, &ProfileWidget2::editCurrentDive, this, &MainWindow::editCurrentDive); connect(&diveListNotifier, &DiveListNotifier::settingsChanged, graphics, &ProfileWidget2::settingsChanged); @@ -771,6 +769,7 @@ void MainWindow::on_actionReplanDive_triggered() // put us in PLAN mode setApplicationState(ApplicationState::PlanDive); + disableShortcuts(true); graphics->setPlanState(&displayed_dive, 0); plannerWidgets->replanDive(); } @@ -783,6 +782,7 @@ void MainWindow::on_actionDivePlanner_triggered() // put us in PLAN mode setApplicationState(ApplicationState::PlanDive); + disableShortcuts(true); graphics->setPlanState(&displayed_dive, 0); plannerWidgets->planDive(); } @@ -1515,7 +1515,7 @@ void MainWindow::editCurrentDive() if (mainTab->isEditing() || DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING) return; - disableShortcuts(); + disableShortcuts(false); copy_dive(current_dive, &displayed_dive); // Work on a copy of the dive DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::ADD); DivePlannerPointsModel::instance()->loadFromDive(&displayed_dive); diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h index 4b28c0a9e..18fc5c577 100644 --- a/desktop-widgets/mainwindow.h +++ b/desktop-widgets/mainwindow.h @@ -164,8 +164,6 @@ slots: void setEnabledToolbar(bool arg1); // Some shortcuts like "change DC" or "copy/paste dive components" // should only be enabled when the profile's visible. - void disableShortcuts(bool disablePaste = true); - void enableShortcuts(); void startDiveSiteEdit(); private: @@ -237,6 +235,8 @@ private: void setQuadrantWidget(QSplitter &splitter, const Quadrant &q, int pos); void setQuadrantWidgets(QSplitter &splitter, const Quadrant &left, const Quadrant &right); void registerApplicationState(ApplicationState state, Quadrants q); + void disableShortcuts(bool disablePaste = true); + void enableShortcuts(); QMenu *connections; QAction *share_on_fb; diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index ea09ad040..8e71c391a 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -1127,8 +1127,6 @@ void ProfileWidget2::setProfileState() disconnectTemporaryConnections(); /* show the same stuff that the profile shows. */ - emit enableShortcuts(); - currentState = PROFILE; emit enableToolbar(true); setBackgroundBrush(getColor(::BACKGROUND, isGrayscale)); @@ -1279,7 +1277,6 @@ void ProfileWidget2::setAddState(const dive *d, int dc) mouseFollowerHorizontal->setLine(timeAxis->line()); mouseFollowerVertical->setLine(QLineF(0, profileYAxis->pos().y(), 0, timeAxis->pos().y())); disconnectTemporaryConnections(); - emit disableShortcuts(false); actionsForKeys[Qt::Key_Left]->setShortcut(Qt::Key_Left); actionsForKeys[Qt::Key_Right]->setShortcut(Qt::Key_Right); actionsForKeys[Qt::Key_Up]->setShortcut(Qt::Key_Up); @@ -1310,7 +1307,6 @@ void ProfileWidget2::setPlanState(const dive *d, int dc) mouseFollowerHorizontal->setLine(timeAxis->line()); mouseFollowerVertical->setLine(QLineF(0, profileYAxis->pos().y(), 0, timeAxis->pos().y())); disconnectTemporaryConnections(); - emit disableShortcuts(true); actionsForKeys[Qt::Key_Left]->setShortcut(Qt::Key_Left); actionsForKeys[Qt::Key_Right]->setShortcut(Qt::Key_Right); actionsForKeys[Qt::Key_Up]->setShortcut(Qt::Key_Up); diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h index 44567dbd8..c45bbc611 100644 --- a/profile-widget/profilewidget2.h +++ b/profile-widget/profilewidget2.h @@ -100,8 +100,6 @@ public: signals: void fontPrintScaleChanged(double scale); void enableToolbar(bool enable); - void enableShortcuts(); - void disableShortcuts(bool paste); void editCurrentDive(); public |