diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-01-27 20:11:43 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-01-27 20:19:21 -0800 |
| commit | 6a161b532e8cbe42fba85263e463070ea68a31e7 (patch) | |
| tree | 1bb211820b98b0df7390a68897a1feccb7893c40 | |
| parent | 66fdb2b89d0697f64003cf98f02e9ec5b5d2209e (diff) | |
| download | subsurface-6a161b532e8cbe42fba85263e463070ea68a31e7.tar.gz | |
Fix UI issues and warning
Commit e219bc70f863 ("Refactor dctype -> divemode") introduced a few issues.
For one thing it causes a warning about incorrect use of zorder - I don't see
why this would be needed here, so I simply removed it.
Secondly, it adds a new, automatically named layout element that therefore gets
handled by our "consistent margin" code which creates a messy layout for the
Dive Notes tab. This patch gives that horizontal layout a useful name and adds
it to the list of "zero margin" layouts. Signed-off-by: Dirk Hohndel
<dirk@hohndel.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/maintab.ui | 6 | ||||
| -rw-r--r-- | qt-ui/mainwindow.cpp | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui index 937dec454..bffbac97a 100644 --- a/qt-ui/maintab.ui +++ b/qt-ui/maintab.ui @@ -22,9 +22,7 @@ <number>0</number> </property> <item row="2" column="1"> - <widget class="KMessageWidget" name="diveNotesMessage" native="true"> - <zorder>scrollArea</zorder> - </widget> + <widget class="KMessageWidget" name="diveNotesMessage" native="true"/> </item> <item row="3" column="1"> <widget class="QScrollArea" name="scrollArea"> @@ -374,7 +372,7 @@ </layout> </item> <item row="7" column="0" colspan="3"> - <layout class="QHBoxLayout" name="horizontalLayout_2"> + <layout class="QHBoxLayout" name="coordinatesDiveTypeLayout"> <item> <widget class="QLineEdit" name="coordinates"> <property name="readOnly"> diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 5d5a442f4..d13585788 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -127,6 +127,7 @@ MainWindow::MainWindow() : QMainWindow(), QMargins zeroMargins(0, 0, 0, 0); QList<QString> noMarginList; noMarginList << "notesAndSocialNetworksLayout" << + "coordinatesDiveTypeLayout" << "mainTabOuterLayout" << "ratingVisibilityWidgets" << "temperatureLabels" << |