Qt4 - Sprefs, avoid to cut text.

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 63e5eaed2e48059527c3fe4ab0818fe949693f62..f9c5cdee9f9aa7d7a5c7ac5da1021d52421bcb76 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -5,10 +5,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>485</width>
-    <height>578</height>
+    <width>483</width>
+    <height>583</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
@@ -29,29 +35,23 @@
       <string>_("Native or Skins")</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="3" column="0" colspan="3" >
-       <widget class="Line" name="line" >
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="qt4" >
+        <property name="text" >
+         <string>_("Native")</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" colspan="2" >
-       <widget class="QLabel" name="skinsLabel" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+      <item row="0" column="1" colspan="3" >
+       <widget class="QLabel" name="defaultLabel" >
         <property name="frameShape" >
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="text" >
-         <string>_("This is VLC's skinnable interface. You can download skins at &lt;a href="http://www.videolan.org/vlc/skins.php">http://www.videolan.org/vlc/skins.php&lt;/a> to customize your player.")</string>
+         <string>_("This is VLC's default interface, with a native look and feel.")</string>
         </property>
-        <property name="alignment" >
-         <set>Qt::AlignBottom|Qt::AlignJustify</set>
+        <property name="textFormat" >
+         <enum>Qt::RichText</enum>
         </property>
         <property name="wordWrap" >
          <bool>true</bool>
@@ -59,75 +59,100 @@
         <property name="margin" >
          <number>10</number>
         </property>
-        <property name="openExternalLinks" >
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-      <item row="5" column="2" >
-       <widget class="QPushButton" name="skinBrowse" >
+      <item row="1" column="1" colspan="3" >
+       <widget class="QCheckBox" name="qtAlwaysVideo" >
         <property name="text" >
-         <string>_("Browse...")</string>
+         <string>_("Always display the video")</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0" >
-       <widget class="QLabel" name="label_4" >
+      <item row="2" column="1" colspan="2" >
+       <widget class="QCheckBox" name="embedVideo" >
         <property name="text" >
-         <string>_("Skin File")</string>
+         <string>_("Integrate video in interface")</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="1" >
-       <widget class="QLineEdit" name="fileSkin" />
+      <item row="3" column="0" colspan="3" >
+       <widget class="Line" name="line" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
       </item>
-      <item row="0" column="1" colspan="2" >
-       <widget class="QLabel" name="defaultLabel" >
+      <item row="4" column="0" >
+       <widget class="QRadioButton" name="skins" >
+        <property name="text" >
+         <string>_("Skins")</string>
+        </property>
+       </widget>
+      </item>
+      <item rowspan="3" row="4" column="1" colspan="3" >
+       <widget class="QLabel" name="skinsLabel" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="frameShape" >
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="text" >
-         <string>_("This is VLC's default interface, with a native look and feel.")</string>
+         <string>_("This is VLC's skinnable interface. You can download skins at &lt;a href="http://www.videolan.org/vlc/skins.php">http://www.videolan.org/vlc/skins.php&lt;/a> to customize your player.")</string>
         </property>
         <property name="textFormat" >
          <enum>Qt::RichText</enum>
         </property>
+        <property name="scaledContents" >
+         <bool>true</bool>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
         <property name="wordWrap" >
          <bool>true</bool>
         </property>
         <property name="margin" >
-         <number>10</number>
+         <number>0</number>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QRadioButton" name="qt4" >
-        <property name="text" >
-         <string>_("Native")</string>
+        <property name="openExternalLinks" >
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" >
-       <widget class="QRadioButton" name="skins" >
-        <property name="text" >
-         <string>_("Skins")</string>
+      <item row="5" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
         </property>
-       </widget>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
       </item>
-      <item row="1" column="1" colspan="2" >
-       <widget class="QCheckBox" name="qtAlwaysVideo" >
+      <item rowspan="2" row="6" column="0" >
+       <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>_("Always display the video")</string>
+         <string>_("Skin File")</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QCheckBox" name="embedVideo" >
+      <item row="7" column="2" colspan="2" >
+       <widget class="QPushButton" name="skinBrowse" >
         <property name="text" >
-         <string>_("Integrate video in interface")</string>
+         <string>_("Browse...")</string>
         </property>
        </widget>
       </item>
+      <item row="7" column="1" >
+       <widget class="QLineEdit" name="fileSkin" />
+      </item>
      </layout>
     </widget>
    </item>