mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-17 22:16:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disable dive component copy/paste shortcuts when no profile show

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

17
qt-ui/mainwindow.cpp
View file

@ -268,7 +268,7 @@ void MainWindow::cleanUpEmpty()
ui.globe->reload(); ui.globe->reload();
if (!existing_filename) if (!existing_filename)
setTitle(MWTF_DEFAULT); setTitle(MWTF_DEFAULT);
disableDcShortcuts(); disableShortcuts();
} }
bool MainWindow::okToClose(QString message) bool MainWindow::okToClose(QString message)
@ -342,21 +342,26 @@ void MainWindow::on_actionPrint_triggered()
#endif #endif
} }
void MainWindow::disableDcShortcuts() void MainWindow::disableShortcuts(bool disablePaste)
{ {
ui.actionPreviousDC->setShortcut(QKeySequence()); ui.actionPreviousDC->setShortcut(QKeySequence());
ui.actionNextDC->setShortcut(QKeySequence()); ui.actionNextDC->setShortcut(QKeySequence());
ui.copy->setShortcut(QKeySequence());
if (disablePaste)
ui.paste->setShortcut(QKeySequence());
} }
void MainWindow::enableDcShortcuts() void MainWindow::enableShortcuts()
{ {
ui.actionPreviousDC->setShortcut(Qt::Key_Left); ui.actionPreviousDC->setShortcut(Qt::Key_Left);
ui.actionNextDC->setShortcut(Qt::Key_Right); ui.actionNextDC->setShortcut(Qt::Key_Right);
ui.copy->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_C));
ui.paste->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_V));
} }
void MainWindow::showProfile() void MainWindow::showProfile()
{ {
enableDcShortcuts(); enableShortcuts();
ui.newProfile->setProfileState(); ui.newProfile->setProfileState();
ui.infoPane->setCurrentIndex(MAINTAB); ui.infoPane->setCurrentIndex(MAINTAB);
} }
@ -1359,14 +1364,14 @@ void MainWindow::editCurrentDive()
QString defaultDC(d->dc.model); QString defaultDC(d->dc.model);
DivePlannerPointsModel::instance()->clear(); DivePlannerPointsModel::instance()->clear();
if (defaultDC == "manually added dive") { if (defaultDC == "manually added dive") {
disableDcShortcuts(); disableShortcuts();
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::ADD); DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::ADD);
ui.newProfile->setAddState(); ui.newProfile->setAddState();
ui.infoPane->setCurrentIndex(MAINTAB); ui.infoPane->setCurrentIndex(MAINTAB);
DivePlannerPointsModel::instance()->loadFromDive(d); DivePlannerPointsModel::instance()->loadFromDive(d);
ui.InfoWidget->enableEdition(MainTab::MANUALLY_ADDED_DIVE); ui.InfoWidget->enableEdition(MainTab::MANUALLY_ADDED_DIVE);
} else if (defaultDC == "planned dive") { } else if (defaultDC == "planned dive") {
disableDcShortcuts(); disableShortcuts();
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::PLAN); DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::PLAN);
//TODO: I BROKE THIS BY COMMENTING THE LINE BELOW //TODO: I BROKE THIS BY COMMENTING THE LINE BELOW
// and I'm sleepy now, so I think I should not try to fix right away. // and I'm sleepy now, so I think I should not try to fix right away.

8
qt-ui/mainwindow.h
View file

@ -67,10 +67,10 @@ public:
void showError(QString message); void showError(QString message);
void setTitle(enum MainWindowTitleFormat format); void setTitle(enum MainWindowTitleFormat format);
// The 'Change DC Shortcuts' should only be enabled // Some shortcuts like "change DC" or "copy/paste dive components"
// when the profile's visible. // should only be enabled when the profile's visible.
void disableDcShortcuts(); void disableShortcuts(bool disablePaste = true);
void enableDcShortcuts(); void enableShortcuts();
void loadFiles(const QStringList files); void loadFiles(const QStringList files);
void importFiles(const QStringList importFiles); void importFiles(const QStringList importFiles);
void importTxtFiles(const QStringList fileNames); void importTxtFiles(const QStringList fileNames);

6
qt-ui/profile/profilewidget2.cpp
View file

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