[vlc-commits] Qt: remove unneeded margins and parameters

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon May 19 19:10:32 2014 +0200| [334715eee3a99c2c02219df41238f316498f1fbf] | committer: Jean-Baptiste Kempf

Qt: remove unneeded margins and parameters

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=334715eee3a99c2c02219df41238f316498f1fbf
---

 modules/gui/qt4/ui/sprefs_interface.ui |    9 ---------
 modules/gui/qt4/ui/sprefs_subtitles.ui |   25 ++++++++++++-------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 784e4ad..546ddca 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -145,21 +145,12 @@
               <height>50</height>
              </size>
             </property>
-            <property name="baseSize">
-             <size>
-              <width>0</width>
-              <height>0</height>
-             </size>
-            </property>
             <property name="styleSheet">
              <string notr="true">background-color: rgb(192, 192, 192);</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignHCenter|Qt::AlignTop</set>
             </property>
-            <property name="margin">
-             <number>0</number>
-            </property>
            </widget>
           </item>
           <item>
diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui
index f99cbab..b9e851d 100644
--- a/modules/gui/qt4/ui/sprefs_subtitles.ui
+++ b/modules/gui/qt4/ui/sprefs_subtitles.ui
@@ -8,7 +8,7 @@
     <x>0</x>
     <y>0</y>
     <width>741</width>
-    <height>410</height>
+    <height>416</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -161,9 +161,6 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1" colspan="3">
-          <widget class="QFontComboBox" name="font"/>
-         </item>
          <item row="1" column="0">
           <widget class="QLabel" name="fontSizeLabel">
            <property name="minimumSize">
@@ -200,7 +197,7 @@
            </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>20</width>
+             <width>10</width>
              <height>20</height>
             </size>
            </property>
@@ -265,13 +262,6 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="3">
-          <widget class="QCheckBox" name="backgroundCheck">
-           <property name="text">
-            <string>Add a background</string>
-           </property>
-          </widget>
-         </item>
          <item row="4" column="0">
           <widget class="QLabel" name="subsPosLabel">
            <property name="minimumSize">
@@ -310,6 +300,16 @@
            </property>
           </widget>
          </item>
+         <item row="0" column="1" colspan="4">
+          <widget class="QFontComboBox" name="font"/>
+         </item>
+         <item row="3" column="1">
+          <widget class="QCheckBox" name="backgroundCheck">
+           <property name="text">
+            <string>Add a background</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
@@ -343,7 +343,6 @@
   <tabstop>effect</tabstop>
   <tabstop>outlineColor</tabstop>
   <tabstop>shadowCheck</tabstop>
-  <tabstop>backgroundCheck</tabstop>
   <tabstop>subsPosition</tabstop>
  </tabstops>
  <resources/>