Qt4: back-end for dialog_Question

diff --git a/modules/gui/qt4/dialogs/external.cpp b/modules/gui/qt4/dialogs/external.cpp
index afec0cb9e15425f9a5026170a761c9d567078a72..8b7b031f05d78c3c318543a2fdd68779ee957998 100644 (file)
--- a/modules/gui/qt4/dialogs/external.cpp
+++ b/modules/gui/qt4/dialogs/external.cpp
@@ -50,12 +50,19 @@ DialogHandler::DialogHandler (intf_thread_t *intf)
      var_Create (intf, "dialog-login", VLC_VAR_ADDRESS);
      var_AddCallback (intf, "dialog-login", LoginCallback, this);
 
+    connect (this, SIGNAL(question(struct dialog_question_t *)),
+             this, SLOT(requestAnswer(struct dialog_question_t *)),
+             Qt::BlockingQueuedConnection);
+     var_Create (intf, "dialog-question", VLC_VAR_ADDRESS);
+     var_AddCallback (intf, "dialog-question", QuestionCallback, this);
+
      dialog_Register (intf);
 }
 
 DialogHandler::~DialogHandler (void)
 {
     dialog_Unregister (intf);
+    var_DelCallback (intf, "dialog-question", QuestionCallback, this);
     var_DelCallback (intf, "dialog-login", LoginCallback, this);
     var_DelCallback (intf, "dialog-fatal", MessageCallback, this);
 }
@@ -138,3 +145,40 @@ void DialogHandler::requestLogin (struct dialog_login_t *data)
 
     delete dialog;
 }
+
+int DialogHandler::QuestionCallback (vlc_object_t *obj, const char *var,
+                                     vlc_value_t, vlc_value_t value, void *data)
+{
+     DialogHandler *self = (DialogHandler *)data;
+     dialog_question_t *dialog = (dialog_question_t *)value.p_address;
+
+     emit self->question (dialog);
+     return VLC_SUCCESS;
+}
+
+void DialogHandler::requestAnswer (struct dialog_question_t *data)
+{
+    QMessageBox *box = new QMessageBox (QMessageBox::Question,
+                                        qfu(data->title), qfu(data->message));
+    QAbstractButton *yes = (data->yes != NULL)
+        ? box->addButton ("&" + qfu(data->yes), QMessageBox::YesRole) : NULL;
+    QAbstractButton *no = (data->no != NULL)
+        ? box->addButton ("&" + qfu(data->no), QMessageBox::NoRole) : NULL;
+    QAbstractButton *cancel = (data->cancel != NULL)
+        ? box->addButton ("&" + qfu(data->cancel), QMessageBox::RejectRole)
+        : NULL;
+
+    box->exec ();
+
+    int answer;
+    if (box->clickedButton () == yes)
+        answer = 1;
+    else
+    if (box->clickedButton () == no)
+        answer = 2;
+    else
+        answer = 3;
+
+    delete box;
+    data->answer = answer;
+}

diff --git a/modules/gui/qt4/dialogs/external.hpp b/modules/gui/qt4/dialogs/external.hpp
index 2daa1d5634062c76e2e61b8e20af9f7780a809b1..0ff46e11086a714812842231a0ee202d59d1bf7e 100644 (file)
--- a/modules/gui/qt4/dialogs/external.hpp
+++ b/modules/gui/qt4/dialogs/external.hpp
@@ -38,15 +38,19 @@ private:
     static int MessageCallback (vlc_object_t *, const char *,
                                 vlc_value_t, vlc_value_t, void *);
     static int LoginCallback (vlc_object_t *obj, const char *,
-                              vlc_value_t, vlc_value_t, void *data);
+                              vlc_value_t, vlc_value_t, void *);
+    static int QuestionCallback (vlc_object_t *obj, const char *,
+                                 vlc_value_t, vlc_value_t, void *);
 
 private slots:
     void displayMessage (const struct dialog_fatal_t *);
-    void requestLogin (struct dialog_login_t *data);
+    void requestLogin (struct dialog_login_t *);
+    void requestAnswer (struct dialog_question_t *);
 
 signals:
     void message (const struct dialog_fatal_t *);
     void authentication (struct dialog_login_t *);
+    void question (struct dialog_question_t *);
 };
 
 #endif