Qt4: One Day / One Simples Pref UI.

The Input Ui needs to be reviewed since I added a few buttons that weren't specified in the wiki.

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index e8f80246c3e3eadd20822b2e08b77981fea94b13..7718931c2a89bea31124a92971a8142c05457e96 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -20,6 +20,7 @@ TOUI =        \
        ui/open \
        ui/main_interface \
        ui/sprefs_audio \
+       ui/sprefs_input \
        ui/sprefs_interface \
        ui/sprefs_playlist \
        ui/sprefs_subtitles \
@@ -175,6 +176,7 @@ EXTRA_DIST += \
        ui/open.ui \
        ui/main_interface.ui \
        ui/sprefs_audio.ui \
+       ui/sprefs_input.ui \
        ui/sprefs_interface.ui \
        ui/sprefs_playlist.ui \
        ui/sprefs_subtitles.ui \

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index a49c8353178019f109895e6d22ab5693f2ab5e42..469cab056d8d3598e179db1faeda2c72ad24c1e9 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -43,6 +43,7 @@
 #include "pixmaps/video_50x50.xpm"
 
 #include "ui/sprefs_audio.h"
+#include "ui/sprefs_input.h"
 #include "ui/sprefs_video.h"
 #include "ui/sprefs_subtitles.h"
 #include "ui/sprefs_playlist.h"

diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui
index 9414a1c1bcae4e8074961eb3f98e2e4811e7d5fb..58cd81801f9e91ea5b81dcb7c4ef67224939313e 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -1,11 +1,12 @@
 <ui version="4.0" >
+ <author>Jean-Baptiste Kempf</author>
  <class>SPrefsAudio</class>
  <widget class="QWidget" name="SPrefsAudio" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>475</width>
+    <width>418</width>
     <height>597</height>
    </rect>
   </property>
@@ -29,141 +30,123 @@
      </property>
     </widget>
    </item>
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <widget class="QGroupBox" name="groupBox_3" >
      <property name="title" >
       <string>General Audio</string>
      </property>
-     <widget class="QSlider" name="defaultVolume" >
-      <property name="geometry" >
-       <rect>
-        <x>250</x>
-        <y>60</y>
-        <width>200</width>
-        <height>16</height>
-       </rect>
-      </property>
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>1</hsizetype>
-        <vsizetype>0</vsizetype>
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="maximumSize" >
-       <size>
-        <width>200</width>
-        <height>16777215</height>
-       </size>
-      </property>
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_2" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>50</y>
-        <width>249</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Default volume</string>
-      </property>
-     </widget>
-     <widget class="QCheckBox" name="checkBox" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>90</y>
-        <width>231</width>
-        <height>23</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Use S/PDIF when available</string>
-      </property>
-     </widget>
-     <widget class="QComboBox" name="preferredAudioLanguage" >
-      <property name="geometry" >
-       <rect>
-        <x>250</x>
-        <y>20</y>
-        <width>200</width>
-        <height>26</height>
-       </rect>
-      </property>
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>1</hsizetype>
-        <vsizetype>0</vsizetype>
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="maximumSize" >
-       <size>
-        <width>300</width>
-        <height>16777215</height>
-       </size>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_8" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>120</y>
-        <width>249</width>
-        <height>26</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Force detection of Dolby Surround</string>
-      </property>
-     </widget>
-     <widget class="QComboBox" name="preferredAudioLanguage_2" >
-      <property name="geometry" >
-       <rect>
-        <x>250</x>
-        <y>120</y>
-        <width>200</width>
-        <height>26</height>
-       </rect>
-      </property>
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>1</hsizetype>
-        <vsizetype>0</vsizetype>
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="maximumSize" >
-       <size>
-        <width>300</width>
-        <height>16777215</height>
-       </size>
-      </property>
-      <property name="currentIndex" >
-       <number>-1</number>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>20</y>
-        <width>249</width>
-        <height>26</height>
-       </rect>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
       </property>
-      <property name="text" >
-       <string>Preferred audio language</string>
+      <property name="spacing" >
+       <number>6</number>
       </property>
-     </widget>
+      <item row="2" column="0" colspan="2" >
+       <widget class="QLabel" name="label_8" >
+        <property name="text" >
+         <string>Force detection of Dolby Surround</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QComboBox" name="preferredAudioLanguage_2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>3</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize" >
+         <size>
+          <width>300</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="currentIndex" >
+         <number>-1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <widget class="QCheckBox" name="checkBox" >
+        <property name="text" >
+         <string>Use S/PDIF when available</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2" >
+       <widget class="QComboBox" name="preferredAudioLanguage" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>1</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize" >
+         <size>
+          <width>300</width>
+          <height>16777215</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="2" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Preferred audio language</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QSlider" name="defaultVolume" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>1</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize" >
+         <size>
+          <width>200</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="2" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Default volume</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>
@@ -178,49 +161,63 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="3" column="2" >
-       <widget class="QPushButton" name="fileBrowseButton" >
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="FileName" />
+      </item>
+      <item row="4" column="2" >
+       <widget class="QPushButton" name="fileBrowseButton_2" >
         <property name="text" >
          <string>Browse</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="2" >
-       <widget class="QPushButton" name="fileBrowseButton_2" >
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_7" >
         <property name="text" >
-         <string>Browse</string>
+         <string>File</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" >
-       <widget class="QLineEdit" name="lineEdit" />
+      <item row="3" column="2" >
+       <widget class="QPushButton" name="OSSBrowse" >
+        <property name="text" >
+         <string>Browse</string>
+        </property>
+       </widget>
       </item>
       <item row="3" column="1" >
-       <widget class="QLineEdit" name="lineEdit_2" />
-      </item>
-      <item row="2" column="1" colspan="2" >
-       <widget class="QComboBox" name="alsaDevice_2" />
+       <widget class="QLineEdit" name="OSSDevice" />
       </item>
-      <item row="1" column="1" colspan="2" >
-       <widget class="QComboBox" name="alsaDevice" />
-      </item>
-      <item row="0" column="1" colspan="2" >
-       <widget class="QComboBox" name="outputModule" />
+      <item row="3" column="0" >
+       <widget class="QLabel" name="OSSLabel" >
+        <property name="text" >
+         <string>OSS Device</string>
+        </property>
+       </widget>
       </item>
       <item row="2" column="0" >
-       <widget class="QLabel" name="label_6" >
+       <widget class="QLabel" name="DirectXLabel" >
         <property name="text" >
          <string>DirectX Device</string>
         </property>
        </widget>
       </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QComboBox" name="DirectXDevice" />
+      </item>
       <item row="1" column="0" >
-       <widget class="QLabel" name="label_4" >
+       <widget class="QLabel" name="alsaLabel" >
         <property name="text" >
          <string>Alsa Device</string>
         </property>
        </widget>
       </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QComboBox" name="alsaDevice" />
+      </item>
+      <item row="0" column="1" colspan="2" >
+       <widget class="QComboBox" name="outputModule" />
+      </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="label_3" >
         <property name="text" >
@@ -228,20 +225,6 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="label_9" >
-        <property name="text" >
-         <string>OSS Device</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="label_7" >
-        <property name="text" >
-         <string>File</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -299,6 +282,7 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
+ <includes/>
  <resources/>
  <connections/>
 </ui>

diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
new file mode 100644 (file)
index 0000000..a4c94c7
--- /dev/null
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -0,0 +1,298 @@
+<ui version="4.0" >
+ <author>Jean-Baptiste Kempf</author>
+ <class>Spref_input</class>
+ <widget class="QWidget" name="Spref_input" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>439</width>
+    <height>552</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Disk Devices</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="2" >
+       <widget class="QPushButton" name="CDDevice" >
+        <property name="text" >
+         <string>Browse</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QLineEdit" name="CDDevice" />
+      </item>
+      <item row="0" column="2" >
+       <widget class="QPushButton" name="DVDBrowse" >
+        <property name="text" >
+         <string>Browse</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QPushButton" name="VCDBrowse" >
+        <property name="text" >
+         <string>Browse</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Audio CD Device</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>VCD Device</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="DVDDevice" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>DVD Device</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLineEdit" name="VCDDevice" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Network</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="label_4" >
+        <property name="text" >
+         <string>UDP Default Port</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSpinBox" name="UDPPort" >
+        <property name="alignment" >
+         <set>Qt::AlignRight</set>
+        </property>
+        <property name="maximum" >
+         <number>65535</number>
+        </property>
+        <property name="minimum" >
+         <number>1</number>
+        </property>
+        <property name="value" >
+         <number>1234</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_3" >
+     <property name="title" >
+      <string>Codecs / Muxers</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="0" >
+       <widget class="QCheckBox" name="RTCP_TCPBox" >
+        <property name="text" >
+         <string>Use RTP over RTCP (TCP)</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_6" >
+        <property name="text" >
+         <string>Repair AVI files</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QSpinBox" name="PostProcLevel" >
+        <property name="alignment" >
+         <set>Qt::AlignRight</set>
+        </property>
+        <property name="maximum" >
+         <number>65535</number>
+        </property>
+        <property name="minimum" >
+         <number>1</number>
+        </property>
+        <property name="value" >
+         <number>6</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QComboBox" name="AviRepair" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_5" >
+        <property name="text" >
+         <string>Post-Processing Quality</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_4" >
+     <property name="title" >
+      <string>Access Filter</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="timeshiftBox" >
+        <property name="text" >
+         <string>Timeshift</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="RecordBox" >
+        <property name="text" >
+         <string>Record</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="DumpBox" >
+        <property name="text" >
+         <string>Dump</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_5" >
+     <property name="title" >
+      <string>Caching</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" >
+       <widget class="QSpinBox" name="localCache" >
+        <property name="alignment" >
+         <set>Qt::AlignRight</set>
+        </property>
+        <property name="maximum" >
+         <number>10000</number>
+        </property>
+        <property name="value" >
+         <number>300</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QSpinBox" name="DiscCache" >
+        <property name="alignment" >
+         <set>Qt::AlignRight</set>
+        </property>
+        <property name="maximum" >
+         <number>10000</number>
+        </property>
+        <property name="value" >
+         <number>300</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QSpinBox" name="networkCache" >
+        <property name="alignment" >
+         <set>Qt::AlignRight</set>
+        </property>
+        <property name="maximum" >
+         <number>10000</number>
+        </property>
+        <property name="value" >
+         <number>300</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="" >
+        <property name="text" >
+         <string>Default Network caching in ms</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_8" >
+        <property name="text" >
+         <string>Default Disc caching in ms</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_9" >
+        <property name="text" >
+         <string>Default local caching in ms</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <includes/>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui
index 06886222ad0ed4081f9d58a380dce4a0c165a7c4..2fec181e1a0156b534f0532b1a4fb1e57d29c74a 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_video.ui
+++ b/modules/gui/qt4/ui/sprefs_video.ui
@@ -1,4 +1,5 @@
 <ui version="4.0" >
+ <author>Jean-Baptiste Kempf</author>
  <class>SPrefsVideo</class>
  <widget class="QWidget" name="SPrefsVideo" >
   <property name="geometry" >
@@ -217,6 +218,7 @@
    </item>
   </layout>
  </widget>
+ <includes/>
  <resources/>
  <connections/>
 </ui>