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

Merge branch 'multiDiveEdition' of https://github.com/tcanabrava/subsurface

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	qt-ui/maintab.h
This commit is contained in:
Dirk Hohndel 2013-09-16 20:52:01 -04:00
commit 396d73705e
3 changed files with 135 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-ui/maintab.h
View file

@ -9,11 +9,12 @@
#include <QTabWidget>
#include <QDialog>
#include <QMap>
#include "models.h"
class QCompleter;
struct dive;
namespace Ui
{
class MainTab;
@ -68,8 +69,7 @@ private:
Ui::MainTab *ui;
WeightModel *weightModel;
CylindersModel *cylindersModel;
NotesBackup notesBackup;
struct dive* currentDive;
QMap<dive*, NotesBackup> notesBackup;
enum { NONE, DIVE, TRIP } editMode;
Completers completers;
void enableEdition();