Qt4 - SPrefs, add an option for saving volume on exit, and fix the displayMode in...

[vlc] / modules / gui / qt4 / ui / sprefs_interface.ui

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 5bf9650a5d80c482dbeed6d55d788628afc5e285..23152ddb38ee4ed146f23c0135c3354c899a8e89 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -61,21 +61,37 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="3" >
-       <widget class="QCheckBox" name="qtAlwaysVideo" >
+      <item row="1" column="1" >
+       <widget class="QLabel" name="label" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="text" >
-         <string>_("Always display the video")</string>
+         <string>_("Display Mode")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" colspan="2" >
+       <widget class="QComboBox" name="displayModeBox" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" colspan="2" >
+      <item row="2" column="1" colspan="3" >
        <widget class="QCheckBox" name="embedVideo" >
         <property name="text" >
          <string>_("Integrate video in interface")</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="3" >
+      <item row="3" column="0" colspan="4" >
        <widget class="Line" name="line" >
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
@@ -89,7 +105,7 @@
         </property>
        </widget>
       </item>
-      <item rowspan="3" row="4" column="1" colspan="3" >
+      <item rowspan="2" row="4" column="1" colspan="3" >
        <widget class="QLabel" name="skinsLabel" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
@@ -136,23 +152,23 @@
         </property>
        </spacer>
       </item>
-      <item rowspan="2" row="6" column="0" >
+      <item row="6" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
          <string>_("Skin File")</string>
         </property>
        </widget>
       </item>
-      <item row="7" column="2" colspan="2" >
+      <item row="6" column="1" colspan="2" >
+       <widget class="QLineEdit" name="fileSkin" />
+      </item>
+      <item row="6" column="3" >
        <widget class="QPushButton" name="skinBrowse" >
         <property name="text" >
          <string>_("Browse...")</string>
         </property>
        </widget>
       </item>
-      <item row="7" column="1" >
-       <widget class="QLineEdit" name="fileSkin" />
-      </item>
      </layout>
     </widget>
    </item>
@@ -257,7 +273,6 @@
  <tabstops>
   <tabstop>language</tabstop>
   <tabstop>qt4</tabstop>
-  <tabstop>qtAlwaysVideo</tabstop>
   <tabstop>skins</tabstop>
   <tabstop>fileSkin</tabstop>
   <tabstop>skinBrowse</tabstop>