diff options
| -rw-r--r-- | qt-gui.cpp | 1 | ||||
| -rw-r--r-- | qt-ui/maintab.cpp | 5 | ||||
| -rw-r--r-- | qt-ui/mainwindow.ui | 38 |
3 files changed, 21 insertions, 23 deletions
diff --git a/qt-gui.cpp b/qt-gui.cpp index cb06bf8d5..59fa1985e 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -95,6 +95,7 @@ void init_ui(int *argcp, char ***argvp) // the Gtk theme makes things unbearably ugly // so switch to Oxygen in this case + qDebug() << application->style()->objectName(); if (application->style()->objectName() == "gtk+") application->setStyle("Oxygen"); diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index c10d8737d..18e9b743a 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -42,7 +42,10 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), #ifdef __APPLE__ setDocumentMode(false); #else - setDocumentMode(true); + if (qApp->style()->objectName() == "gtk+") + setDocumentMode(false); + else + setDocumentMode(true); #endif // we start out with the fields read-only; once things are // filled from a dive, they are made writeable diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index 05a59524e..72f7444a0 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -26,10 +26,16 @@ </property> <widget class="QStackedWidget" name="infoPane"> <property name="currentIndex"> - <number>0</number> + <number>1</number> </property> <widget class="QWidget" name="page"> <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> <item> <widget class="MainTab" name="InfoWidget" native="true"/> </item> @@ -37,6 +43,12 @@ </widget> <widget class="QWidget" name="page_2"> <layout class="QHBoxLayout" name="horizontalLayout_4"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> <item> <widget class="DivePlannerWidget" name="widget" native="true"/> </item> @@ -52,16 +64,7 @@ <property name="spacing"> <number>0</number> </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> + <property name="margin"> <number>0</number> </property> <item> @@ -74,16 +77,7 @@ <property name="spacing"> <number>0</number> </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> + <property name="margin"> <number>0</number> </property> <item> @@ -169,7 +163,7 @@ <x>0</x> <y>0</y> <width>763</width> - <height>19</height> + <height>23</height> </rect> </property> <widget class="QMenu" name="menuFile"> |