Begin simple prefs interface panel.

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 6e48ab5ba7d94657a2bcd7c3ff3453378d237269..bebc177ff36964b1862b6fe45795f2e40651be42 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -14,7 +14,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 TOUI = ui/input_stats ui/main_interface ui/file_open \
        ui/logindialog ui/inputdialog ui/progressdialog ui/sprefs_trivial \
        ui/sprefs_audio ui/sprefs_playlist ui/sprefs_subtitles \
-       ui/sprefs_video
+       ui/sprefs_video ui/sprefs_interface
 UIH = $(TOUI:%=%.h)
 
 TOMOC = main_interface \

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 1e2c94c05db38e834baaf53caa45c5f9abc0c8c7..eaa5446aab6960e3a3b1ce912c0a07fea09b5aa4 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -45,6 +45,7 @@
 #include "ui/sprefs_video.h"
 #include "ui/sprefs_subtitles.h"
 #include "ui/sprefs_playlist.h"
+#include "ui/sprefs_interface.h"
 
 #define ITEM_HEIGHT 50
 
@@ -164,7 +165,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         START_SPREFS_CAT( Playlist );
         END_SPREFS_CAT;
 
-        case SPrefsInterface: break;
+        START_SPREFS_CAT( Interface );
+
+            CONFIG_GENERIC( "language", StringList, NULL, language );
+
+        END_SPREFS_CAT;
 
         START_SPREFS_CAT( Subtitles );
 

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
new file mode 100644 (file)
index 0000000..d69fbc3
--- /dev/null
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -0,0 +1,109 @@
+<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>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="1" column="0" colspan="2" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Default Interface</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="3" column="0" 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>
+        </property>
+        <property name="wordWrap" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" 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>
+        </property>
+        <property name="wordWrap" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" colspan="2" >
+       <widget class="QLabel" name="label_4" >
+        <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>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QRadioButton" name="wxwidgets" >
+        <property name="text" >
+         <string>wxWidgets</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QRadioButton" name="skins" >
+        <property name="text" >
+         <string>Skins</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="qt4" >
+        <property name="text" >
+         <string>Qt4</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="language" />
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Language</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>