diff options
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/mainwindow.cpp | 11 | ||||
| -rw-r--r-- | qt-ui/mainwindow.ui | 14 |
2 files changed, 13 insertions, 12 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 03f93a64d..08b228d4a 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -132,15 +132,16 @@ MainWindow::MainWindow() : QMainWindow(), // has no concept of "toolbar" for a non-mainwindow widget (...) // I need to take the current item that's in the toolbar Position // and reposition it alongside the grid layout. - QLayoutItem *p = ui.gridLayout->takeAt(0); - ui.gridLayout->addWidget(toolBar, 0, 0); - ui.gridLayout->addItem(p, 0, 1); + QLayoutItem *p = ui.profileInnerLayout->takeAt(0); + ui.profileInnerLayout->addWidget(toolBar, 0, 0); + ui.profileInnerLayout->addItem(p, 0, 1); // and now for some layout hackery // this gets us consistent margins everywhere and a much more balanced look QMargins margins(5, 5, 5, 5); QList<QString> dontChange; - dontChange << "notesAndSocialNetworksLayout" << ui.gridLayout->objectName(); + dontChange << "notesAndSocialNetworksLayout" << + "profileInnerLayout"; Q_FOREACH (QLayout *layout, findChildren<QLayout *>()) { // lots of internally used layouts by Qt have no names // don't mess with those (or scroll bars look terrible, among other things @@ -153,7 +154,7 @@ MainWindow::MainWindow() : QMainWindow(), layout->setContentsMargins(margins); } margins = QMargins(0, 5, 5, 5); - ui.gridLayout->setContentsMargins(margins); + ui.profileInnerLayout->setContentsMargins(margins); updateManager = new UpdateManager(this); } diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index 08c8d3451..ca5db455c 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -11,7 +11,7 @@ </rect> </property> <widget class="QWidget" name="centralwidget"> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QVBoxLayout" name="fullWindowLayout"> <property name="spacing"> <number>0</number> </property> @@ -44,7 +44,7 @@ <number>0</number> </property> <widget class="QWidget" name="page"> - <layout class="QHBoxLayout" name="horizontalLayout_3"> + <layout class="QHBoxLayout" name="mainTabOuterLayout"> <property name="spacing"> <number>0</number> </property> @@ -69,7 +69,7 @@ <property name="enabled"> <bool>true</bool> </property> - <layout class="QHBoxLayout" name="horizontalLayout_4"> + <layout class="QHBoxLayout" name="profileOuterLayout"> <property name="spacing"> <number>0</number> </property> @@ -96,7 +96,7 @@ </widget> </widget> <widget class="QWidget" name="ProfileWidget"> - <layout class="QGridLayout" name="gridLayout"> + <layout class="QGridLayout" name="profileInnerLayout"> <property name="leftMargin"> <number>0</number> </property> @@ -127,7 +127,7 @@ <number>0</number> </property> <widget class="QWidget" name="page_3"> - <layout class="QVBoxLayout" name="verticalLayout_4"> + <layout class="QVBoxLayout" name="diveListLayout"> <item> <widget class="DiveListView" name="ListWidget"> <property name="selectionMode"> @@ -150,7 +150,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QVBoxLayout" name="globeLayout"> <item> <widget class="GlobeGPS" name="globe" native="true"/> </item> @@ -165,7 +165,7 @@ </property> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <layout class="QHBoxLayout" name="horizontalLayout"> + <layout class="QHBoxLayout" name="divePlanLayout"> <item> <widget class="QLabel" name="divePlanOutputLabel"> <property name="maximumSize"> |