From 32960899532b3749f38b65edabe6f2372522e53b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 10 Feb 2015 10:41:15 -0800 Subject: Change the order of the quadrants At least to me it seems more natural to enumerate them row by row instead of column by column, so now we do 1 2 instead of 1 3 3 4 2 4 Signed-off-by: Dirk Hohndel --- qt-ui/mainwindow.cpp | 14 +++++++------- qt-ui/mainwindow.h | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 3c256844c..7899aec3f 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -63,11 +63,11 @@ MainWindow::MainWindow() : QMainWindow(), DivePlannerWidget *plannerWidget = new DivePlannerWidget(); PlannerDetails *plannerDetails = new PlannerDetails(); - registerApplicationState("Default", mainTab, diveListView, profileWidget, globeGps ); - registerApplicationState("AddDive", mainTab, diveListView, profileWidget, globeGps ); - registerApplicationState("EditDive", mainTab, diveListView, profileWidget, globeGps ); - registerApplicationState("PlanDive", plannerWidget, plannerSettings, profileWidget, plannerDetails ); - registerApplicationState("EditPlannedDive", plannerWidget, diveListView, profileWidget, globeGps ); + registerApplicationState("Default", mainTab, profileWidget, diveListView, globeGps ); + registerApplicationState("AddDive", mainTab, profileWidget, diveListView, globeGps ); + registerApplicationState("EditDive", mainTab, profileWidget, diveListView, globeGps ); + registerApplicationState("PlanDive", plannerWidget, profileWidget, plannerSettings, plannerDetails ); + registerApplicationState("EditPlannedDive", plannerWidget, profileWidget, diveListView, globeGps ); setApplicationState("Default"); ui.multiFilter->hide(); @@ -1513,9 +1513,9 @@ void MainWindow::checkForUndoAndRedo() ui.action_Redo->setEnabled(undoBuffer->canRedo()); } -void MainWindow::registerApplicationState(const QByteArray& state, QWidget *topLeft, QWidget *bottomLeft, QWidget *topRight, QWidget *bottomRight) +void MainWindow::registerApplicationState(const QByteArray& state, QWidget *topLeft, QWidget *topRight, QWidget *bottomLeft, QWidget *bottomRight) { - applicationState[state] = WidgetForQuadrant(topLeft, bottomLeft, topRight, bottomRight); + applicationState[state] = WidgetForQuadrant(topLeft, topRight, bottomLeft, bottomRight); if (ui.topLeft->indexOf(topLeft) == -1) { ui.topLeft->addWidget(topLeft); } diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h index b0b526380..3405d9e56 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -199,7 +199,7 @@ private: void saveSplitterSizes(); QString lastUsedDir(); void updateLastUsedDir(const QString &s); - void registerApplicationState(const QByteArray& state, QWidget *topLeft, QWidget *bottomLeft, QWidget *topRight, QWidget *bottomRight); + void registerApplicationState(const QByteArray& state, QWidget *topLeft, QWidget *topRight, QWidget *bottomLeft, QWidget *bottomRight); bool filesAsArguments; UpdateManager *updateManager; @@ -211,11 +211,11 @@ private: QList profileToolbarActions; struct WidgetForQuadrant { - WidgetForQuadrant(QWidget *tl = 0, QWidget *bl = 0, QWidget *tr = 0, QWidget *br = 0) : - topLeft(tl), bottomLeft(bl), topRight(tr), bottomRight(br) {} + WidgetForQuadrant(QWidget *tl = 0, QWidget *tr = 0, QWidget *bl = 0, QWidget *br = 0) : + topLeft(tl), topRight(tr), bottomLeft(bl), bottomRight(br) {} QWidget *topLeft; - QWidget *bottomLeft; QWidget *topRight; + QWidget *bottomLeft; QWidget *bottomRight; }; QHash applicationState; -- cgit v1.2.3-70-g09d2