Qt4 - SPrefs : Input Panel. almost all implementations, but not the macro-ones (netwo...

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index d2f6480bdb92d1fd3b4eb289792eb486f5cb005f..760b07e0cb531a7039bd19dd5a9cace1a68798d9 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -132,6 +132,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
     switch( number )
     {
+        /* Video Panel Implementation */
         START_SPREFS_CAT( Video , "General video settings" );
          #ifndef WIN32
             ui.directXBox->setVisible( false );
@@ -160,6 +161,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                             snapshotsFormat );
          END_SPREFS_CAT;
 
+         /* Audio Panel Implementation */
         START_SPREFS_CAT( Audio,  "General audio settings" );
 #ifdef WIN32
             ui.OSSBrowse->hide();
@@ -196,8 +198,24 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
          CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
         END_SPREFS_CAT;
 
+        /* Input and Codecs Panel Implementation */
         START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings"  );
+          /* Disk Devices */
+/*          CONFIG_GENERIC( );*/
 
+          CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
+          CONFIG_GENERIC( "http-proxy", String , NULL, proxy );
+
+          /* Caching */
+/*          CONFIG_GENERIC( );*/
+
+          CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel );
+          CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair );
+          CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox );
+
+          CONFIG_GENERIC( "timeshift-force", Bool, NULL, timeshiftBox );
+          CONFIG_GENERIC( "dump-force", Bool, NULL, DumpBox );
+//        CONFIG_GENERIC( "", Bool, NULL, RecordBox ); //FIXME activate record 
         END_SPREFS_CAT;
 
         START_SPREFS_CAT( Interface, "Interfaces settings" );

diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index 367c7b0aa1f0ec7b70f845cbd7afebcc0740ac66..ed4a01b5dde6d8c4f34442562aac6cacd61c10d4 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <author>Jean-Baptiste Kempf</author>
  <class>SPrefsInputAndCodecs</class>
- <widget class="QWidget" name="SprefsInputAndCodecs" >
+ <widget class="QWidget" name="SPrefsInputAndCodecs" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -92,7 +92,7 @@
        </widget>
       </item>
       <item row="1" column="1" colspan="2" >
-       <widget class="QLineEdit" name="lineEdit" />
+       <widget class="QLineEdit" name="proxy" />
       </item>
       <item row="0" column="1" colspan="2" >
        <widget class="QSpinBox" name="UDPPort" >
@@ -113,7 +113,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>UDP Default Port</string>
+         <string>Server Default Port</string>
         </property>
        </widget>
       </item>
@@ -133,9 +133,9 @@
        <number>6</number>
       </property>
       <item row="2" column="0" >
-       <widget class="QCheckBox" name="RTCP_TCPBox" >
+       <widget class="QCheckBox" name="RTSP_TCPBox" >
         <property name="text" >
-         <string>Use RTP over RTCP (TCP)</string>
+         <string>Use RTP over RTSP (TCP)</string>
         </property>
        </widget>
       </item>