summaryrefslogtreecommitdiffstats
path: root/qt-ui/maintab.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-11-01 11:19:23 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-11-01 11:19:23 -0700
commit9e635392373cdc56fb3a897ea491e7c33fdbd424 (patch)
treef774d955632b301428088365d41abe62badfdd26 /qt-ui/maintab.h
parent1a4d098ef2062923bbe09538cc01c1d130989640 (diff)
parent0e96c9f62e3a7030d9208f32e59390cb3fd20bbe (diff)
downloadsubsurface-9e635392373cdc56fb3a897ea491e7c33fdbd424.tar.gz
Merge branch 'editMode' of github.com:tcanabrava/subsurface
Diffstat (limited to 'qt-ui/maintab.h')
-rw-r--r--qt-ui/maintab.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/qt-ui/maintab.h b/qt-ui/maintab.h
index 9cfe43a26..afc30a079 100644
--- a/qt-ui/maintab.h
+++ b/qt-ui/maintab.h
@@ -46,6 +46,8 @@ class MainTab : public QTabWidget
{
Q_OBJECT
public:
+ enum EditMode { NONE, DIVE, TRIP, ADD, MANUALLY_ADDED_DIVE };
+
MainTab(QWidget *parent);
void clearStats();
void clearInfo();
@@ -74,8 +76,10 @@ public slots:
void editCylinderWidget(const QModelIndex& index);
void editWeightWidget(const QModelIndex& index);
void addDiveStarted();
+ void enableEdition(EditMode newEditMode = NONE);
private:
+ EditMode editMode;
Ui::MainTab ui;
WeightModel *weightModel;
CylindersModel *cylindersModel;
@@ -88,9 +92,7 @@ private:
* then applying the changes on the other dives.*/
struct dive multiEditEquipmentPlaceholder;
- enum { NONE, DIVE, TRIP, ADD } editMode;
Completers completers;
- void enableEdition();
void resetPallete();
QString printGPSCoords(int lat, int lon);
};