Qt: don't attach the core dialogs to the Main Interface but to the Dialog Provider.

[vlc] / modules / gui / qt4 / dialogs / external.cpp

diff --git a/modules/gui/qt4/dialogs/external.cpp b/modules/gui/qt4/dialogs/external.cpp
index bc91b27a127cfcbcfc99f245de09ac6ddbe35a90..ee090b0b467777b61108bc1c86c25d45aa01dfc1 100644 (file)
--- a/modules/gui/qt4/dialogs/external.cpp
+++ b/modules/gui/qt4/dialogs/external.cpp
@@ -33,6 +33,8 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
+#include <QProgressDialog>
+#include <QMutex>
 
 QVLCVariable::QVLCVariable (vlc_object_t *obj, const char *varname, int type)
     : object (obj), name (qfu(varname))
@@ -51,25 +53,34 @@ int QVLCVariable::callback (vlc_object_t *object, const char *,
                             vlc_value_t, vlc_value_t cur, void *data)
 {
     QVLCVariable *self = (QVLCVariable *)data;
+
     emit self->pointerChanged (object, cur.p_address);
+    return VLC_SUCCESS;
 }
 
 
-DialogHandler::DialogHandler (intf_thread_t *intf)
-    : intf (intf),
+DialogHandler::DialogHandler (intf_thread_t *intf, QObject *_parent)
+    : intf (intf), QObject( _parent ),
       message (VLC_OBJECT(intf), "dialog-fatal", VLC_VAR_ADDRESS),
       login (VLC_OBJECT(intf), "dialog-login", VLC_VAR_ADDRESS),
-      question (VLC_OBJECT(intf), "dialog-question", VLC_VAR_ADDRESS)
+      question (VLC_OBJECT(intf), "dialog-question", VLC_VAR_ADDRESS),
+      progressBar (VLC_OBJECT(intf), "dialog-progress-bar", VLC_VAR_ADDRESS)
 {
     connect (&message, SIGNAL(pointerChanged(vlc_object_t *, void *)),
-             this, SLOT(displayMessage(vlc_object_t *, void *)),
+             SLOT(displayMessage(vlc_object_t *, void *)),
              Qt::BlockingQueuedConnection);
     connect (&login, SIGNAL(pointerChanged(vlc_object_t *, void *)),
-             this, SLOT(requestLogin(vlc_object_t *, void *)),
+             SLOT(requestLogin(vlc_object_t *, void *)),
              Qt::BlockingQueuedConnection);
     connect (&question, SIGNAL(pointerChanged(vlc_object_t *, void *)),
-             this, SLOT(requestAnswer(vlc_object_t *, void *)),
+             SLOT(requestAnswer(vlc_object_t *, void *)),
+             Qt::BlockingQueuedConnection);
+    connect (&progressBar, SIGNAL(pointerChanged(vlc_object_t *, void *)),
+             SLOT(startProgressBar(vlc_object_t *, void *)),
              Qt::BlockingQueuedConnection);
+    connect (this,
+             SIGNAL(progressBarDestroyed(QWidget *)),
+             SLOT(stopProgressBar(QWidget *)));
 
     dialog_Register (intf);
 }
@@ -168,3 +179,74 @@ void DialogHandler::requestAnswer (vlc_object_t *, void *value)
     delete box;
     data->answer = answer;
 }
+
+
+QVLCProgressDialog::QVLCProgressDialog (DialogHandler *parent,
+                                        struct dialog_progress_bar_t *data)
+    : QProgressDialog (qfu(data->message),
+                       data->cancel ? ("&" + qfu(data->cancel)) : 0, 0, 1000),
+      cancelled (false),
+      handler (parent)
+{
+    if (data->title != NULL)
+        setWindowTitle (qfu(data->title));
+    setMinimumDuration (0);
+
+    connect (this, SIGNAL(progressed(int)), SLOT(setValue(int)));
+    connect (this, SIGNAL(described(const QString&)),
+                   SLOT(setLabelText(const QString&)));
+    connect (this, SIGNAL(canceled(void)), SLOT(saveCancel(void)));
+
+    data->pf_update = update;
+    data->pf_check = check;
+    data->pf_destroy = destroy;
+    data->p_sys = this;
+}
+
+QVLCProgressDialog::~QVLCProgressDialog (void)
+{
+}
+
+void QVLCProgressDialog::update (void *priv, const char *text, float value)
+{
+    QVLCProgressDialog *self = static_cast<QVLCProgressDialog *>(priv);
+
+    if (text != NULL)
+        emit self->described (qfu(text));
+    emit self->progressed ((int)(value * 1000.));
+}
+
+static QMutex cancel_mutex;
+
+bool QVLCProgressDialog::check (void *priv)
+{
+    QVLCProgressDialog *self = static_cast<QVLCProgressDialog *>(priv);
+    QMutexLocker locker (&cancel_mutex);
+    return self->cancelled;
+}
+
+void QVLCProgressDialog::destroy (void *priv)
+{
+    QVLCProgressDialog *self = static_cast<QVLCProgressDialog *>(priv);
+
+    emit self->handler->progressBarDestroyed (self);
+}
+
+void QVLCProgressDialog::saveCancel (void)
+{
+    QMutexLocker locker (&cancel_mutex);
+    cancelled = true;
+}
+
+void DialogHandler::startProgressBar (vlc_object_t *, void *value)
+{
+    dialog_progress_bar_t *data = (dialog_progress_bar_t *)value;
+    QWidget *dlg = new QVLCProgressDialog (this, data);
+
+    dlg->show ();
+}
+
+void DialogHandler::stopProgressBar (QWidget *dlg)
+{
+    delete dlg;
+}