[vlc-commits] commit: Qt4: small preference cleanup (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jul  5 11:24:30 2010 +0200| [597e38cbe309d14e0b02615a277c290c7424062d] | committer: Jean-Baptiste Kempf 

Qt4: small preference cleanup

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

 modules/gui/qt4/ui/sprefs_interface.ui |  117 ++++++++++++++------------------
 1 files changed, 51 insertions(+), 66 deletions(-)

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index be24032..5aef28b 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>802</width>
-    <height>651</height>
+    <width>793</width>
+    <height>589</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -41,10 +41,36 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="assoButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>220</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Set up associations...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="assocLabel">
+        <property name="text">
+         <string>File extensions association</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
+   <item row="3" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Privacy / Network Interaction</string>
@@ -181,47 +207,6 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QGroupBox" name="assoBox">
-     <property name="title">
-      <string>File associations</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_4">
-      <item>
-       <widget class="QPushButton" name="assoButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>220</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Set up associations...</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="1" column="0" colspan="2">
     <widget class="QGroupBox" name="LooknfeelBox">
      <property name="title">
@@ -342,24 +327,17 @@
          <property name="margin">
           <number>0</number>
          </property>
-         <item row="4" column="0">
-          <widget class="QCheckBox" name="resizingBox">
-           <property name="text">
-            <string>Resize interface to video size</string>
-           </property>
-          </widget>
-         </item>
-         <item row="9" column="0">
+         <item row="11" column="0">
           <widget class="QCheckBox" name="treePlaylist">
            <property name="text">
             <string>Display playlist tree</string>
            </property>
           </widget>
          </item>
-         <item row="8" column="1">
+         <item row="10" column="1">
           <widget class="QComboBox" name="stylesCombo"/>
          </item>
-         <item row="8" column="0">
+         <item row="10" column="0">
           <widget class="QLabel" name="label">
            <property name="text">
             <string>Force window style:</string>
@@ -369,38 +347,45 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="0">
+         <item row="7" column="0">
           <widget class="QCheckBox" name="systrayBox">
            <property name="text">
             <string>Show systray icon</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="1">
-          <widget class="QCheckBox" name="embedVideo">
-           <property name="text">
-            <string>Embed video in interface</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="1">
+         <item row="7" column="1">
           <widget class="QCheckBox" name="sysPop">
            <property name="text">
             <string>Systray popup when minimized</string>
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
+         <item row="1" column="0">
           <widget class="QCheckBox" name="fsController">
            <property name="text">
             <string>Show controls in full screen mode</string>
            </property>
           </widget>
          </item>
-         <item row="0" column="0">
+         <item row="1" column="1">
           <widget class="QCheckBox" name="minimalviewBox">
            <property name="text">
-            <string>Minimal view mode (no toolbars)</string>
+            <string>Start in minimal view mode</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
+          <widget class="QCheckBox" name="embedVideo">
+           <property name="text">
+            <string>Integrate video in interface</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="1">
+          <widget class="QCheckBox" name="resizingBox">
+           <property name="text">
+            <string>Resize interface to video size</string>
            </property>
           </widget>
          </item>