Fix for missing resizing in sout dialog.

Patch by Leo Spalteholz, thanks.

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 5ed388472ea357a6d916e7f52f2e869c57211bd1..5d1227d610b5686982ffb362a9367156b8bad133 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -29,11 +29,10 @@
 
 SoutDialog::SoutDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
 {
-    setWindowTitle( qtr( "Stream output") );
-    main = new QWidget( this );
+    //setWindowTitle( qtr( "Stream output") );
 
     /* UI stuff */
-    ui.setupUi( main );
+    ui.setupUi( this );
 #define ADD_VCODEC( name, fcc) ui.vCodec->addItem( name, QVariant( fcc ) );
     ADD_VCODEC( "MPEG-1", "mp1v" );
     ADD_VCODEC( "MPEG-2", "mp2v" );

diff --git a/modules/gui/qt4/dialogs/sout.hpp b/modules/gui/qt4/dialogs/sout.hpp
index 55088efe9b9585437e0064c0f5797b472ce9b22d..94b06e38a408aeb37f861c3661f5aa6b54fd1986 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.hpp
+++ b/modules/gui/qt4/dialogs/sout.hpp
@@ -36,7 +36,6 @@ class SoutDialog : public QVLCFrame
     Q_OBJECT;
 public:
     SoutDialog( intf_thread_t * );
-    QWidget *main;
 private:
     Ui::Sout ui;
 public slots:

diff --git a/modules/gui/qt4/ui/sout.ui b/modules/gui/qt4/ui/sout.ui
index d414068412be3840708d38a464c7139ed100c0c5..08818e8da3a260aade43b4671e024de9ac4888fa 100644 (file)
--- a/modules/gui/qt4/ui/sout.ui
+++ b/modules/gui/qt4/ui/sout.ui
@@ -5,12 +5,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>630</width>
-    <height>660</height>
+    <width>601</width>
+    <height>611</height>
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Form</string>
+   <string>Stream Output</string>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >