From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sun, 19 Sep 2010 22:17:35 +0000 (+0200)
Subject: Qt: sprefs, simplification
X-Git-Tag: 1.2.0-pre1~5250
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2530046854382902dfce326fc2343897f62e4c58;p=vlc

Qt: sprefs, simplification

Removal of UDPport... This doesn't belong here
---

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 5c2490d7aa..62068b270f 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -430,8 +430,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC_FILE( "input-record-path", Directory, ui.recordLabel,
                                  ui.recordPath, ui.recordBrowse );
 
-            CONFIG_GENERIC_NO_BOOL( "server-port", Integer, ui.portLabel,
-                                    UDPPort );
             CONFIG_GENERIC( "http-proxy", String , ui.httpProxyLabel, proxy );
             CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, ui.ppLabel,
                                     PostProcLevel );
diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index 33b4856251..ea84ce042f 100644
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -8,7 +8,7 @@
     <x>0</x>
     <y>0</y>
     <width>737</width>
-    <height>635</height>
+    <height>594</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -328,58 +328,6 @@
       <item row="0" column="1">
        <widget class="QComboBox" name="cachingCombo"/>
       </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="portLabel">
-        <property name="minimumSize">
-         <size>
-          <width>250</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Default port (server mode)</string>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <property name="buddy">
-         <cstring>UDPPort</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="UDPPort">
-          <property name="alignment">
-           <set>Qt::AlignRight</set>
-          </property>
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>65535</number>
-          </property>
-          <property name="value">
-           <number>1234</number>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
      </layout>
     </widget>
    </item>