From cf9d077b5d877e8fe204048a6411461e1b5813f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20P=C3=A5lsson?= Date: Tue, 18 Feb 2014 09:44:02 +0100 Subject: Added onDialogCanceled signal --- browser/browserpage.h | 2 ++ browser/unit-tests/browserdbus/testbrowserdbus.cpp | 24 ++++++++++++++++++++++ browser/unit-tests/browserdbus/testbrowserdbus.h | 2 ++ browser/userinput.cpp | 2 ++ browser/userinput.h | 1 + common/browserdbus.cpp | 5 +++-- common/browserdbus.h | 1 + 7 files changed, 35 insertions(+), 2 deletions(-) diff --git a/browser/browserpage.h b/browser/browserpage.h index 20cc1a1..bede6d9 100644 --- a/browser/browserpage.h +++ b/browser/browserpage.h @@ -31,6 +31,8 @@ public: m_userInput, SIGNAL(onConfirmDialog(QString))); connect(this, SIGNAL(onPromptDialog(QString, QString)), m_userInput, SIGNAL(onPromptDialog(QString, QString))); + connect(this, SIGNAL(onDialogCanceled(void)), + m_userInput, SIGNAL(onDialogCanceled(void))); } ~BrowserPage(){ } diff --git a/browser/unit-tests/browserdbus/testbrowserdbus.cpp b/browser/unit-tests/browserdbus/testbrowserdbus.cpp index f82565f..e8a050e 100644 --- a/browser/unit-tests/browserdbus/testbrowserdbus.cpp +++ b/browser/unit-tests/browserdbus/testbrowserdbus.cpp @@ -258,6 +258,18 @@ void TestBrowserDBus::testConfirmDialog() { m_bdb->closeConfirmDialog(conn::brw::DR_OK); } +void TestBrowserDBus::testCancelConfirmDialog() { + QSignalSpy spy (m_bdb, SIGNAL(onConfirmDialog(QString))); + QSignalSpy spy2 (m_bdb, SIGNAL(onDialogCanceled(void))); + m_bdb->createPageWindow(1,0,0,800,600); + m_bdb->loadurl(testFileUrl()); + QProcess::execute("xdotool mousemove 150 500"); + QProcess::execute("xdotool click 1"); + QVERIFY(spy.wait(1000)); + m_bdb->closeConfirmDialog(conn::brw::DR_CANCEL); + QVERIFY(spy2.wait(1000)); +} + void TestBrowserDBus::testPromptDialog() { QSignalSpy spy (m_bdb, SIGNAL(onPromptDialog(QString,QString))); m_bdb->createPageWindow(1,0,0,800,600); @@ -268,6 +280,18 @@ void TestBrowserDBus::testPromptDialog() { m_bdb->closePromptDialog("Hello!", conn::brw::DR_OK); } +void TestBrowserDBus::testCancelPromptDialog() { + QSignalSpy spy (m_bdb, SIGNAL(onPromptDialog(QString,QString))); + QSignalSpy spy2 (m_bdb, SIGNAL(onDialogCanceled(void))); + m_bdb->createPageWindow(1,0,0,800,600); + m_bdb->loadurl(testFileUrl()); + QProcess::execute("xdotool mousemove 250 500"); + QProcess::execute("xdotool click 1"); + QVERIFY(spy.wait(1000)); + m_bdb->closePromptDialog("Hello!", conn::brw::DR_CANCEL); + QVERIFY(spy2.wait(1000)); +} + void TestBrowserDBus::testAlertDialog() { QSignalSpy spy (m_bdb, SIGNAL(onAlertDialog(QString))); m_bdb->createPageWindow(1,0,0,800,600); diff --git a/browser/unit-tests/browserdbus/testbrowserdbus.h b/browser/unit-tests/browserdbus/testbrowserdbus.h index 5f6d400..e356f83 100644 --- a/browser/unit-tests/browserdbus/testbrowserdbus.h +++ b/browser/unit-tests/browserdbus/testbrowserdbus.h @@ -43,7 +43,9 @@ private slots: void testSelect(); void testActivate(); void testConfirmDialog(); + void testCancelConfirmDialog(); void testPromptDialog(); + void testCancelPromptDialog(); void testAlertDialog(); private: diff --git a/browser/userinput.cpp b/browser/userinput.cpp index 6406677..5d2d950 100644 --- a/browser/userinput.cpp +++ b/browser/userinput.cpp @@ -52,6 +52,7 @@ conn::brw::ERROR_IDS userinput::closeConfirmDialog (conn::brw::DIALOG_RESULT b) break; case conn::brw::DR_CANCEL: emit doCloseConfirmDialog(false); + emit onDialogCanceled(); break; default: qDebug() << "Bad value for conn::brw::DIALOG_RESULT"; @@ -67,6 +68,7 @@ conn::brw::ERROR_IDS userinput::closePromptDialog(QString resultStr, conn::brw:: break; case conn::brw::DR_CANCEL: emit doClosePromptDialog(resultStr, false); + emit onDialogCanceled(); break; default: qDebug() << "Bad value for conn::brw::DIALOG_RESULT"; diff --git a/browser/userinput.h b/browser/userinput.h index 31b8d67..a1aff0a 100644 --- a/browser/userinput.h +++ b/browser/userinput.h @@ -36,6 +36,7 @@ signals: void onConfirmDialog(QString); void onPromptDialog(QString,QString); void onAlertDialog(QString); + void onDialogCanceled(void); // Internal void doCloseAlertDialog(void); diff --git a/common/browserdbus.cpp b/common/browserdbus.cpp index a6c9a24..35bb912 100644 --- a/common/browserdbus.cpp +++ b/common/browserdbus.cpp @@ -214,8 +214,9 @@ void BrowserDbus::createPageWindow(int deviceid, int x, int y, int width, int he actualuserinput = userinput; connect(actualuserinput, SIGNAL(onAlertDialog(QString)), this, SIGNAL(onAlertDialog(QString))); - connect(actualuserinput, SIGNAL(onConfirmDialog(QString)), this, SIGNAL(onConfirmDialog(QString))); - connect(actualuserinput, SIGNAL(onPromptDialog(QString,QString)), this, SIGNAL(onPromptDialog(QString,QString))); + connect(actualuserinput, SIGNAL(onConfirmDialog(QString)), this, SIGNAL(onConfirmDialog(QString))); + connect(actualuserinput, SIGNAL(onPromptDialog(QString,QString)),this, SIGNAL(onPromptDialog(QString,QString))); + connect(actualuserinput, SIGNAL(onDialogCanceled(void)), this, SIGNAL(onDialogCanceled())); if(!actualuserinput->isValid()) qDebug() << "failed create object /Browser/IWebPageWindow*/IUserInput"; diff --git a/common/browserdbus.h b/common/browserdbus.h index 9e1a43d..c31a7ba 100644 --- a/common/browserdbus.h +++ b/common/browserdbus.h @@ -107,6 +107,7 @@ signals: void onConfirmDialog(QString); void onPromptDialog(QString,QString); void onAlertDialog(QString); + void onDialogCanceled(void); public slots: void pageloadingstarted(); -- cgit v1.2.1