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

Keep the dive list disabled if editing a dive

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

5
qt-ui/maintab.cpp
View file

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

1
qt-ui/maintab.h
View file

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

3
qt-ui/mainwindow.cpp
View file

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