Disable dive component copy/paste shortcuts when no profile show

Instead of inventing another way to do this (and inevitably forgetting a
path where this should be re-enabled) I renamed the DcShortcup related
function and made them enable/disable the copy and paste shortcuts as
well.

Of course there now is one exception (isn't there always?): in "ADD" state
we don't want to be able to switch DCs, but we do want to be able to
paste.

Fixes #825

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-02-03 07:30:08 -08:00
parent fdb736c1e1
commit d34965135a
3 changed files with 18 additions and 13 deletions

View file

@ -916,7 +916,7 @@ void ProfileWidget2::setProfileState()
/* show the same stuff that the profile shows. */
//TODO: Move the DC handling to another method.
MainWindow::instance()->enableDcShortcuts();
MainWindow::instance()->enableShortcuts();
currentState = PROFILE;
MainWindow::instance()->setEnabledToolbar(true);
@ -1061,7 +1061,7 @@ void ProfileWidget2::setAddState()
mouseFollowerVertical->setLine(QLineF(0, profileYAxis->pos().y(), 0, timeAxis->pos().y()));
disconnectTemporaryConnections();
//TODO: Move this method to another place, shouldn't be on mainwindow.
MainWindow::instance()->disableDcShortcuts();
MainWindow::instance()->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);
@ -1094,7 +1094,7 @@ void ProfileWidget2::setPlanState()
mouseFollowerVertical->setLine(QLineF(0, profileYAxis->pos().y(), 0, timeAxis->pos().y()));
disconnectTemporaryConnections();
//TODO: Move this method to another place, shouldn't be on mainwindow.
MainWindow::instance()->disableDcShortcuts();
MainWindow::instance()->disableShortcuts();
actionsForKeys[Qt::Key_Left]->setShortcut(Qt::Key_Left);
actionsForKeys[Qt::Key_Right]->setShortcut(Qt::Key_Right);
actionsForKeys[Qt::Key_Up]->setShortcut(Qt::Key_Up);