From 17195e44a59cc96b60cd8ffdf367add4645b0629 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Fri, 2 Jan 2015 17:23:54 -0800
Subject: [PATCH] Remove all margins from mainwindow.ui file

And adjust them in code instead. This seems to look nice.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/mainwindow.cpp |  4 ++++
 qt-ui/mainwindow.ui  | 54 --------------------------------------------
 2 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 08b228d4a..500c0508a 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -141,6 +141,8 @@ MainWindow::MainWindow() : QMainWindow(),
 	QMargins margins(5, 5, 5, 5);
 	QList<QString> dontChange;
 	dontChange << "notesAndSocialNetworksLayout" <<
+		      "mainTabOuterLayout" <<
+		      "ratingVisibilityWidgets" <<
 		      "profileInnerLayout";
 	Q_FOREACH (QLayout *layout, findChildren<QLayout *>()) {
 		// lots of internally used layouts by Qt have no names
@@ -155,6 +157,8 @@ MainWindow::MainWindow() : QMainWindow(),
 	}
 	margins = QMargins(0, 5, 5, 5);
 	ui.profileInnerLayout->setContentsMargins(margins);
+	margins = QMargins(5, 5, 0, 5);
+	ui.profileOuterLayout->setContentsMargins(margins);
 
 	updateManager = new UpdateManager(this);
 }
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index ca5db455c..ac16afc30 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -15,18 +15,6 @@
     <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">
-     <number>0</number>
-    </property>
     <item>
      <widget class="MultiFilter" name="multiFilter" native="true"/>
     </item>
@@ -48,18 +36,6 @@
           <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">
-           <number>0</number>
-          </property>
           <item>
            <widget class="MainTab" name="InfoWidget" native="true"/>
           </item>
@@ -70,21 +46,6 @@
           <bool>true</bool>
          </property>
          <layout class="QHBoxLayout" name="profileOuterLayout">
-          <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">
-           <number>0</number>
-          </property>
           <item>
            <widget class="DivePlannerWidget" name="divePlannerWidget" native="true">
             <property name="enabled">
@@ -97,21 +58,6 @@
        </widget>
        <widget class="QWidget" name="ProfileWidget">
         <layout class="QGridLayout" name="profileInnerLayout">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <property name="spacing">
-          <number>0</number>
-         </property>
          <item row="0" column="0" rowspan="3">
           <widget class="ProfileWidget2" name="newProfile"/>
          </item>