Qt4 - SPrefs : a few additions. Still not working for selecting interface.

[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 d69fbc3f8c90e75c37b18b78bef894719a38ad76..73760c71cd3c0ace1970df74b8d39324afbce8d0 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -1,15 +1,12 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>SPrefsInterface</class>
  <widget class="QWidget" name="SPrefsInterface" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>357</height>
+    <width>440</width>
+    <height>373</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -34,65 +31,101 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="3" column="0" colspan="2" >
+      <item row="5" column="2" >
+       <widget class="QPushButton" name="skinBrowse" >
+        <property name="text" >
+         <string>Browse</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" >
+       <widget class="QLineEdit" name="fileSkin" />
+      </item>
+      <item row="4" column="1" colspan="2" >
        <widget class="QLabel" name="label_3" >
         <property name="text" >
-         <string>This is VLC's skinable interface. You can download skins on http://www.videolan.org/ to customize your player.</string>
+         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-style:italic;">This is VLC's skinnable interface. You can download skins on &lt;/span>&lt;a href="http://www.videolan.org/">&lt;span style=" font-style:italic; text-decoration: underline; color:#0000ff;">http://www.videolan.org/vlc/skins.php&lt;/span>&lt;/a>&lt;span style=" font-style:italic;"> to customize your player.&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
         </property>
         <property name="wordWrap" >
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2" >
+      <item row="1" column="1" colspan="2" >
        <widget class="QLabel" name="label_2" >
         <property name="text" >
-         <string>This is the new VLC default interface. It's dialogs give access to most VLC features.</string>
+         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-style:italic;">VLC's default interface, with native look and feel&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
         </property>
         <property name="wordWrap" >
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="5" column="0" colspan="2" >
-       <widget class="QLabel" name="label_4" >
+      <item row="0" column="0" colspan="2" >
+       <widget class="QRadioButton" name="qt4" >
         <property name="text" >
-         <string>This is the legacy VLC default interface. It will be removed once the Qt4 interface is completed and tested.</string>
-        </property>
-        <property name="textFormat" >
-         <enum>Qt::AutoText</enum>
-        </property>
-        <property name="wordWrap" >
-         <bool>true</bool>
+         <string>Default</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" >
-       <widget class="QRadioButton" name="wxwidgets" >
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>wxWidgets</string>
+         <string>Skin File</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
+      <item row="3" column="0" colspan="2" >
        <widget class="QRadioButton" name="skins" >
         <property name="text" >
          <string>Skins</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QRadioButton" name="qt4" >
+      <item row="2" column="1" >
+       <widget class="QCheckBox" name="qtAlwaysVideo" >
         <property name="text" >
-         <string>Qt4</string>
+         <string>Display always the video</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="language" />
+   <item row="2" column="0" colspan="2" >
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Instances</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="OneInterfaceMode" >
+        <property name="text" >
+         <string>Allow only one interface</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="EnqueueOneInterfaceMode" >
+        <property name="text" >
+         <string>Enqueue files in playlist when in one interface mode</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item row="0" column="0" >
     <widget class="QLabel" name="label" >
@@ -101,9 +134,11 @@
      </property>
     </widget>
    </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="language" />
+   </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
 </ui>