Keep the dive list disabled if editing a dive

When, in a dive edit mode user entered a dive site
and went to dive site edit mode then finished the ds
edit, the app would lose the disabled property of the
dive list, making it possible to select a new dive
when we where editing another one, complete mess.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-08-25 21:08:05 -03:00 committed by Dirk Hohndel
parent fc6d819616
commit b8a09ca520
3 changed files with 9 additions and 0 deletions

View file

@ -851,6 +851,11 @@ void MainTab::reload()
mydive->what = copy_string(displayed_dive.what); \
}
MainTab::EditMode MainTab::getEditMode() const
{
return editMode;
}
#define EDIT_VALUE(what) \
if (mydive->what == cd->what || copyPaste) { \
mydive->what = displayed_dive.what; \

View file

@ -100,6 +100,7 @@ slots:
void enableGeoLookupEdition();
void disableGeoLookupEdition();
void setCurrentLocationIndex();
EditMode getEditMode() const;
private:
Ui::MainTab ui;
WeightModel *weightModel;

View file

@ -258,6 +258,9 @@ PlannerSettingsWidget *MainWindow::divePlannerSettingsWidget() {
void MainWindow::setDefaultState() {
setApplicationState("Default");
if (information()->getEditMode() != MainTab::NONE) {
ui.bottomLeft->currentWidget()->setEnabled(false);
}
}
void MainWindow::setLoadedWithFiles(bool f)