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

desktop: remove check for editMode in maintab

Browse source 
The accept / reject message is only shown in edit-mode, no
need to check it. This is a step in simplification / removal
of the edit mode.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-01-29 16:15:17 +01:00 • committed by Dirk Hohndel
parent 2789bb05b1
commit 4d60662531
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -504,19 +504,15 @@ void MainTab::acceptChanges()
ui.dateEdit->setEnabled(true); ui.dateEdit->setEnabled(true);
hideMessage(); hideMessage();
if (editMode) { MainWindow::instance()->showProfile();
MainWindow::instance()->showProfile(); DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING);
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING); Command::editProfile(&displayed_dive);
Command::editProfile(&displayed_dive);
}
int scrolledBy = MainWindow::instance()->diveList->verticalScrollBar()->sliderPosition(); int scrolledBy = MainWindow::instance()->diveList->verticalScrollBar()->sliderPosition();
if (editMode) { MainWindow::instance()->diveList->reload();
MainWindow::instance()->diveList->reload(); MainWindow::instance()->refreshDisplay();
MainWindow::instance()->refreshDisplay(); MainWindow::instance()->refreshProfile();
MainWindow::instance()->refreshProfile();
} else {
MainWindow::instance()->refreshDisplay();
}
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING); DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING);
MainWindow::instance()->diveList->verticalScrollBar()->setSliderPosition(scrolledBy); MainWindow::instance()->diveList->verticalScrollBar()->setSliderPosition(scrolledBy);
MainWindow::instance()->diveList->setFocus(); MainWindow::instance()->diveList->setFocus();
@ -528,13 +524,12 @@ void MainTab::acceptChanges()
void MainTab::rejectChanges() void MainTab::rejectChanges()
{ {
if (editMode && current_dive) { if (QMessageBox::warning(MainWindow::instance(), TITLE_OR_TEXT(tr("Discard the changes?"),
if (QMessageBox::warning(MainWindow::instance(), TITLE_OR_TEXT(tr("Discard the changes?"), tr("You are about to discard your changes.")),
tr("You are about to discard your changes.")), QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) {
QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) { return;
return;
}
} }
ui.dateEdit->setEnabled(true); ui.dateEdit->setEnabled(true);
editMode = false; editMode = false;
hideMessage(); hideMessage();
@ -544,6 +539,7 @@ void MainTab::rejectChanges()
updateDiveInfo(); updateDiveInfo();
// show the profile and dive info // show the profile and dive info
MainWindow::instance()->refreshDisplay();
MainWindow::instance()->refreshProfile(); MainWindow::instance()->refreshProfile();
MainWindow::instance()->setEnabledToolbar(true); MainWindow::instance()->setEnabledToolbar(true);
ui.editDiveSiteButton->setEnabled(!ui.location->text().isEmpty()); ui.editDiveSiteButton->setEnabled(!ui.location->text().isEmpty());