diff options
| -rw-r--r-- | qt-ui/mainwindow.cpp | 31 | ||||
| -rw-r--r-- | qt-ui/mainwindow.h | 17 |
2 files changed, 48 insertions, 0 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 1a12305d9..dec550389 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -119,6 +119,13 @@ MainWindow::MainWindow() : QMainWindow(), QWidget *diveSitePictures = new QWidget(); // Placeholder + std::pair<QByteArray, QVariant> enabled = std::make_pair("enabled", QVariant(true)); + std::pair<QByteArray, QVariant> disabled = std::make_pair("enabled", QVariant(false)); + PropertyList enabledList; + PropertyList disabledList; + enabledList.push_back(enabled); + disabledList.push_back(disabled); + registerApplicationState("Default", mainTab, profileContainer, diveListView, globeGps ); registerApplicationState("AddDive", mainTab, profileContainer, diveListView, globeGps ); registerApplicationState("EditDive", mainTab, profileContainer, diveListView, globeGps ); @@ -126,6 +133,13 @@ MainWindow::MainWindow() : QMainWindow(), registerApplicationState("EditPlannedDive", plannerWidget, profileContainer, diveListView, globeGps ); registerApplicationState("EditDiveSite", diveSiteEdit, diveSitePictures, diveListView, globeGps); + setStateProperties("Default", enabledList, enabledList, enabledList,enabledList); + setStateProperties("AddDive", enabledList, enabledList, enabledList,enabledList); + setStateProperties("EditDive", enabledList, enabledList, enabledList,enabledList); + setStateProperties("PlanDive", enabledList, enabledList, enabledList,enabledList); + setStateProperties("EditPlannedDive", enabledList, enabledList, enabledList,enabledList); + setStateProperties("EditDiveSite", enabledList, enabledList, disabledList, enabledList); + setApplicationState("Default"); ui.multiFilter->hide(); @@ -213,6 +227,11 @@ MainWindow::~MainWindow() m_Instance = NULL; } +void MainWindow::setStateProperties(const QByteArray& state, const PropertyList& tl, const PropertyList& tr, const PropertyList& bl, const PropertyList& br) +{ + stateProperties[state] = PropertiesForQuadrant(tl, tr, bl, br); +} + void MainWindow::on_actionDiveSiteEdit_triggered() { setApplicationState("EditDiveSite"); } @@ -1726,9 +1745,21 @@ void MainWindow::setApplicationState(const QByteArray& state) { } SET_CURRENT_INDEX( topLeft ) + Q_FOREACH(const WidgetProperty& p, stateProperties[state].topLeft) { + ui.topLeft->currentWidget()->setProperty( p.first.data(), p.second); + } SET_CURRENT_INDEX( topRight ) + Q_FOREACH(const WidgetProperty& p, stateProperties[state].topRight) { + ui.topRight->currentWidget()->setProperty( p.first.data(), p.second); + } SET_CURRENT_INDEX( bottomLeft ) + Q_FOREACH(const WidgetProperty& p, stateProperties[state].bottomLeft) { + ui.bottomLeft->currentWidget()->setProperty( p.first.data(), p.second); + } SET_CURRENT_INDEX( bottomRight ) + Q_FOREACH(const WidgetProperty& p, stateProperties[state].bottomRight) { + ui.bottomRight->currentWidget()->setProperty( p.first.data(), p.second); + } #undef SET_CURRENT_INDEX } diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h index 4df1d1238..2d2ea8847 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -39,6 +39,9 @@ class PlannerSettingsWidget; class QUndoStack; class LocationInformationWidget; +typedef std::pair<QByteArray, QVariant> WidgetProperty; +typedef QVector<WidgetProperty> PropertyList; + enum MainWindowTitleFormat { MWTF_DEFAULT, MWTF_FILENAME @@ -89,6 +92,7 @@ public: void printPlan(); void checkSurvey(QSettings *s); void setApplicationState(const QByteArray& state); + void setStateProperties(const QByteArray& state, const PropertyList& tl, const PropertyList& tr, const PropertyList& bl,const PropertyList& br); bool inPlanner(); QUndoStack *undoStack; NotificationWidget *getNotificationWidget(); @@ -225,7 +229,20 @@ private: QWidget *bottomLeft; QWidget *bottomRight; }; + + struct PropertiesForQuadrant { + PropertiesForQuadrant(){} + PropertiesForQuadrant(const PropertyList& tl, const PropertyList& tr,const PropertyList& bl,const PropertyList& br) : + topLeft(tl), topRight(tr), bottomLeft(bl), bottomRight(br) {} + PropertyList topLeft; + PropertyList topRight; + PropertyList bottomLeft; + PropertyList bottomRight; + }; + QHash<QByteArray, WidgetForQuadrant> applicationState; + QHash<QByteArray, PropertiesForQuadrant> stateProperties; + QByteArray currentApplicationState; WindowTitleUpdate *wtu; }; |