Qt: Ok is not ok as a button label.

[vlc] / modules / gui / qt4 / dialogs / sout.hpp

diff --git a/modules/gui/qt4/dialogs/sout.hpp b/modules/gui/qt4/dialogs/sout.hpp
index 371f5f4420b227c1c976fd1eb79a70b19654bb10..202b6f36ff4ef4cd49c1d442bcae3d02e6f304a2 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.hpp
+++ b/modules/gui/qt4/dialogs/sout.hpp
@@ -24,8 +24,11 @@
 #ifndef _SOUT_DIALOG_H_
 #define _SOUT_DIALOG_H_
 
-#include <vlc/vlc.h>
-#include <vlc_streaming.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h> /* Gettext functions */
 
 #include "ui/sout.h"
 #include "util/qvlcframe.hpp"
@@ -39,34 +42,30 @@ class SoutDialog : public QVLCDialog
 {
     Q_OBJECT;
 public:
-    static SoutDialog * getInstance( QWidget *parent,
-                                     intf_thread_t *p_intf,
-                                     bool transcode_only )
+    static SoutDialog* getInstance( QWidget *parent, intf_thread_t *p_intf,
+                                    bool transcode_only )
     {
         if( !instance )
             instance = new SoutDialog( parent, p_intf, transcode_only );
         else
         {
-            instance->setParent( parent );
-            if( transcode_only != instance->b_transcode_only )
-            {
-                instance->toggleSout();
-                instance->b_transcode_only = transcode_only;
-            }
+            /* Recenter the dialog on the parent */
+            instance->setParent( parent, Qt::Dialog );
+            instance->b_transcode_only = transcode_only;
+            instance->toggleSout();
         }
         return instance;
-    };
+    }
 
-    virtual ~SoutDialog();
+    virtual ~SoutDialog(){}
 
     QString getMrl(){ return mrl; }
 
 private:
+    Ui::Sout ui;
+    static SoutDialog *instance;
     SoutDialog( QWidget* parent, intf_thread_t *,
                 bool _transcode_only = false );
-    static SoutDialog *instance;
-
-    Ui::Sout ui;
     QPushButton *okButton;
     QString mrl;
     bool b_transcode_only;
@@ -84,6 +83,8 @@ private slots:
     void setATranscodeOptions( bool );
     void setSTranscodeOptions( bool );
     void setRawOptions( bool );
+    void changeUDPandRTPmess( bool );
+    void RTPtoggled( bool );
 };
 
 #endif