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

Add the first call to registerApplicationState

Browse source 
This will be used to set the 'default' state. The other
two possible states right now are plan and add; those will
be created right next.

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-02-09 16:23:30 -02:00 • committed by Dirk Hohndel
parent 9e3bff6b7c
commit 7d48c1fc26
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/globe.h
View file

@ -19,7 +19,7 @@ class GlobeGPS : public MarbleWidget {
Q_OBJECT
public:
using MarbleWidget::centerOn;
GlobeGPS(QWidget *parent);
GlobeGPS(QWidget *parent = 0);
void reload();
void repopulateLabels();
void centerOnCurrentDive();

2
qt-ui/maintab.h
View file

@ -40,7 +40,7 @@ public:
IGNORE
};
MainTab(QWidget *parent);
MainTab(QWidget *parent = 0);
~MainTab();
void clearStats();
void clearInfo();

13
qt-ui/mainwindow.cpp
View file

@ -45,6 +45,17 @@ MainWindow::MainWindow() : QMainWindow(),
Q_ASSERT_X(m_Instance == NULL, "MainWindow", "MainWindow recreated!");
m_Instance = this;
ui.setupUi(this);
// Define the States of the Application Here, Currently the states are situations where the different
// widgets will change on the mainwindow.
// for the "default" mode
MainTab *mainTab = new MainTab();
DiveListView *diveListView = new DiveListView();
ProfileWidget2 *profileWidget = new ProfileWidget2();
GlobeGPS *globe = new GlobeGPS();
registerApplicationState("Default", mainTab, diveListView, profileWidget, globe );
ui.multiFilter->hide();
// what is a sane order for those icons? we should have the ones the user is
// most likely to want towards the top so they are always visible
@ -1484,7 +1495,7 @@ void MainWindow::checkForUndoAndRedo()
ui.action_Redo->setEnabled(undoBuffer->canRedo());
}
void registerApplicationState(const QByteArray& state, QWidget *topLeft, QWidget *bottomLeft, QWidget *topRight, QWidget *bottomRight)
void MainWindow::registerApplicationState(const QByteArray& state, QWidget *topLeft, QWidget *bottomLeft, QWidget *topRight, QWidget *bottomRight)
{
applicationState[state] = WidgetForBorder(topLeft, bottomLeft, topRight, bottomRight);
}

2
qt-ui/mainwindow.h
View file

@ -202,7 +202,7 @@ private:
QList<QAction *> profileToolbarActions;
struct WidgetForBorder {
WidgetForBorder(QWidget *tl, QWidget *bl, QWidget *tr, QWidget *br) :
WidgetForBorder(QWidget *tl = 0, QWidget *bl = 0, QWidget *tr = 0, QWidget *br = 0) :
topLeft(tl), bottomLeft(bl), topRight(tr), bottomRight(br) {}
QWidget *topLeft;
QWidget *bottomLeft;