qt4: attempt to work around a design flaw in the toolbar editor

[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..85c1284ca30df23e1bdd2d45bf83bc143347852b 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.hpp
+++ b/modules/gui/qt4/dialogs/sout.hpp
@@ -21,55 +21,109 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _SOUT_DIALOG_H_
-#define _SOUT_DIALOG_H_
+#ifndef QVLC_SOUT_DIALOG_H_
+#define QVLC_SOUT_DIALOG_H_ 1
 
-#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"
 
 class QPushButton;
+class QToolButton;
 class QCheckBox;
 class QGridLayout;
 class QTextEdit;
 
-class SoutDialog : public QVLCDialog
+class SoutMrl
 {
-    Q_OBJECT;
 public:
-    static SoutDialog * getInstance( QWidget *parent,
-                                     intf_thread_t *p_intf,
-                                     bool transcode_only )
+    SoutMrl( const QString& head = "")
+    {
+        mrl = head;
+        b_first = true;
+        b_has_bracket = false;
+    }
+
+    QString getMrl()
+    {
+        return mrl;
+    }
+
+    void begin( const QString& module )
     {
-        if( !instance )
-            instance = new SoutDialog( parent, p_intf, transcode_only );
+        if( !b_first )
+            mrl += ":";
+        b_first = false;
+
+        mrl += module;
+        b_has_bracket = false;
+    }
+    void end()
+    {
+        if( b_has_bracket )
+            mrl += "}";
+    }
+    void option( const QString& option, const QString& value = "" )
+    {
+        if( !b_has_bracket )
+            mrl += "{";
         else
+            mrl += ",";
+        b_has_bracket = true;
+
+        mrl += option;
+
+        if( !value.isEmpty() )
         {
-            instance->setParent( parent );
-            if( transcode_only != instance->b_transcode_only )
+            char *psz = config_StringEscape( qtu(value) );
+            if( psz )
             {
-                instance->toggleSout();
-                instance->b_transcode_only = transcode_only;
+                mrl += "=" + qfu( psz );
+                free( psz );
             }
         }
-        return instance;
-    };
+    }
+    void option( const QString& name, const int i_value, const int i_precision = 10 )
+    {
+        option( name, QString::number( i_value, i_precision ) );
+    }
+    void option( const QString& name, const double f_value )
+    {
+        option( name, QString::number( f_value ) );
+    }
 
-    virtual ~SoutDialog();
+    void option( const QString& name, const QString& base, const int i_value, const int i_precision = 10 )
+    {
+        option( name, base + ":" + QString::number( i_value, i_precision ) );
+    }
+
+private:
+    QString mrl;
+    bool b_has_bracket;
+    bool b_first;
+};
+
+
+class SoutDialog : public QVLCDialog
+{
+    Q_OBJECT
+public:
+    SoutDialog( QWidget* parent, intf_thread_t *, const QString& mrl = "");
+    virtual ~SoutDialog(){}
 
     QString getMrl(){ return mrl; }
 
 private:
-    SoutDialog( QWidget* parent, intf_thread_t *,
-                bool _transcode_only = false );
-    static SoutDialog *instance;
-
     Ui::Sout ui;
-    QPushButton *okButton;
+
     QString mrl;
-    bool b_transcode_only;
+    QPushButton *okButton;
+    QToolButton *closeTabButton;
 
 public slots:
     void updateMRL();
@@ -77,13 +131,11 @@ public slots:
 private slots:
     void ok();
     void cancel();
-    void toggleSout();
-    void setOptions();
-    void fileBrowse();
-    void setVTranscodeOptions( bool );
-    void setATranscodeOptions( bool );
-    void setSTranscodeOptions( bool );
-    void setRawOptions( bool );
+    void next();
+    void prev();
+    void closeTab();
+    void tabChanged( int );
+    void addDest();
 };
 
 #endif