Qt: add deinterlace and deinterlace-mode to simple preferences.

Minor changes by jb@videolan.org

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index fd7cbdb750c63d8c46a91a609927c4bed524ef00..f0e56477933214fdabb1b1330b164edfdc6ed102 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -209,7 +209,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             ui.hwYUVBox->setVisible( false );
 #endif
 
-            CONFIG_GENERIC( "deinterlace-mode", StringList, ui.deinterLabel, deinterlaceBox );
+            CONFIG_GENERIC( "deinterlace", IntegerList, ui.deinterLabel, deinterlaceBox );
+            CONFIG_GENERIC( "deinterlace-mode", StringList, ui.deinterModeLabel, deinterlaceModeBox );
             CONFIG_GENERIC( "aspect-ratio", String, ui.arLabel, arLine );
 
             CONFIG_GENERIC_FILE( "snapshot-path", Directory, ui.dirLabel,

diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui
index 973e666bda0a1f34a6d027989b64d25b024f8655..ae304dbe0ef1bab9fa6485780bd5f306d3b4cc8d 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_video.ui
+++ b/modules/gui/qt4/ui/sprefs_video.ui
@@ -1,108 +1,109 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <author>Jean-Baptiste Kempf</author>
  <class>SPrefsVideo</class>
- <widget class="QWidget" name="SPrefsVideo" >
-  <property name="geometry" >
+ <widget class="QWidget" name="SPrefsVideo">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>647</width>
-    <height>682</height>
+    <width>514</width>
+    <height>606</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>10</number>
    </property>
-   <property name="margin" >
+   <property name="margin">
     <number>9</number>
    </property>
    <item>
-    <widget class="QCheckBox" name="enableVideo" >
-     <property name="text" >
+    <widget class="QCheckBox" name="enableVideo">
+     <property name="text">
       <string>Enable video</string>
      </property>
-     <property name="checked" >
+     <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="displayBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="displayBox">
+     <property name="title">
       <string>Display</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="1" column="2" >
-       <widget class="QCheckBox" name="windowDecorations" >
-        <property name="text" >
-         <string>Window decorations</string>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="2" >
-       <widget class="QCheckBox" name="fullscreen" >
-        <property name="text" >
+      <item row="0" column="0" colspan="2">
+       <widget class="QCheckBox" name="fullscreen">
+        <property name="text">
          <string>Fullscreen</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2" >
-       <widget class="QCheckBox" name="alwaysOnTop" >
-        <property name="text" >
+      <item row="2" column="0" colspan="2">
+       <widget class="QCheckBox" name="alwaysOnTop">
+        <property name="text">
          <string>Always on top</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="2" >
-       <widget class="QComboBox" name="outputModule" />
+      <item row="5" column="1" colspan="2">
+       <widget class="QComboBox" name="outputModule"/>
       </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="voutLabel" >
-        <property name="text" >
+      <item row="5" column="0">
+       <widget class="QLabel" name="voutLabel">
+        <property name="text">
          <string>Output</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>outputModule</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QCheckBox" name="overlay" >
-        <property name="text" >
+      <item row="0" column="2">
+       <widget class="QCheckBox" name="overlay">
+        <property name="text">
          <string>Accelerated video output (Overlay)</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="2" >
-       <widget class="QCheckBox" name="skipFrames" >
-        <property name="text" >
+      <item row="3" column="0" colspan="2">
+       <widget class="QCheckBox" name="skipFrames">
+        <property name="text">
          <string>Skip frames</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <widget class="QCheckBox" name="windowDecorations">
+        <property name="text">
+         <string>Window decorations</string>
+        </property>
+        <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="2" column="2" >
-       <widget class="QCheckBox" name="hwYUVBox" >
-        <property name="text" >
-         <string>Use hardware YUV->RGB conversions</string>
+      <item row="2" column="2">
+       <widget class="QCheckBox" name="hwYUVBox">
+        <property name="text">
+         <string>Use hardware YUV-&gt;RGB conversions</string>
         </property>
        </widget>
       </item>
@@ -110,33 +111,33 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="directXBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="directXBox">
+     <property name="title">
       <string>DirectX</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="1" column="1" colspan="2" >
-       <widget class="QComboBox" name="dXdisplayDevice" />
+      <item row="1" column="1" colspan="2">
+       <widget class="QComboBox" name="dXdisplayDevice"/>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="dxDeviceLabel" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="dxDeviceLabel">
+        <property name="text">
          <string>Display device</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>dXdisplayDevice</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="2" >
-       <widget class="QCheckBox" name="wallpaperMode" >
-        <property name="text" >
+      <item row="0" column="0" colspan="2">
+       <widget class="QCheckBox" name="wallpaperMode">
+        <property name="text">
          <string>Enable wallpaper mode</string>
         </property>
        </widget>
@@ -145,99 +146,129 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_2" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
       <string>Video</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout" >
-      <item row="0" column="1" >
-       <widget class="QComboBox" name="deinterlaceBox" />
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="deinterLabel" >
-        <property name="text" >
-         <string>Deinterlacing Mode</string>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="deinterLabel">
+        <property name="text">
+         <string>Deinterlacing</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="arLabel" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="arLabel">
+        <property name="text">
          <string>Force Aspect Ratio</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QLineEdit" name="arLine" />
+      <item row="0" column="1">
+       <widget class="QComboBox" name="deinterlaceBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="deinterModeLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QComboBox" name="deinterlaceModeBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="3">
+       <widget class="QLineEdit" name="arLine"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Video snapshots</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="0" column="1" colspan="2" >
-       <widget class="QLineEdit" name="snapshotsDirectory" />
+      <item row="0" column="1" colspan="2">
+       <widget class="QLineEdit" name="snapshotsDirectory"/>
       </item>
-      <item row="0" column="3" >
-       <widget class="QPushButton" name="snapshotsDirectoryBrowse" >
-        <property name="text" >
+      <item row="0" column="3">
+       <widget class="QPushButton" name="snapshotsDirectoryBrowse">
+        <property name="text">
          <string>Browse...</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="dirLabel" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="dirLabel">
+        <property name="text">
          <string>Directory</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>snapshotsDirectory</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="prefixLabel" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="prefixLabel">
+        <property name="text">
          <string>Prefix</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>snapshotsPrefix</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QLineEdit" name="snapshotsPrefix" >
-        <property name="text" >
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="snapshotsPrefix">
+        <property name="text">
          <string>vlc-snap</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="formatLabel" >
-        <property name="text" >
+      <item row="2" column="0">
+       <widget class="QLabel" name="formatLabel">
+        <property name="text">
          <string>Format</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>snapshotsFormat</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" colspan="3" >
-       <widget class="QComboBox" name="snapshotsFormat" />
+      <item row="2" column="1" colspan="3">
+       <widget class="QComboBox" name="snapshotsFormat"/>
       </item>
-      <item row="1" column="2" colspan="2" >
-       <widget class="QCheckBox" name="snapshotsSequentialNumbering" >
-        <property name="text" >
+      <item row="1" column="2" colspan="2">
+       <widget class="QCheckBox" name="snapshotsSequentialNumbering">
+        <property name="text">
          <string>Sequential numbering</string>
         </property>
        </widget>
@@ -252,7 +283,6 @@
   <tabstop>fullscreen</tabstop>
   <tabstop>overlay</tabstop>
   <tabstop>alwaysOnTop</tabstop>
-  <tabstop>windowDecorations</tabstop>
   <tabstop>skipFrames</tabstop>
   <tabstop>outputModule</tabstop>
   <tabstop>wallpaperMode</tabstop>