Added select and activate

8 files changed, 67 insertions, 10 deletions

diff --git a/browser/browserview.cpp b/browser/browserview.cpp
index 4bda8ee..38be237 100644
--- a/browser/browserview.cpp
+++ b/browser/browserview.cpp
@@ -251,3 +251,10 @@ QString BrowserView::getFaviconFilePath(QString url) {
 void BrowserView::contentSizeChanged(const QSize &size) {
     emit onContentSizeChanged(size.width(), size.height());
 }
+
+void BrowserView::select() {
+    this->setFocus(Qt::OtherFocusReason);
+}
+void BrowserView::activate() {
+    this->activateWindow();
+}
diff --git a/browser/browserview.h b/browser/browserview.h
index 13a992a..36469e5 100644
--- a/browser/browserview.h
+++ b/browser/browserview.h
@@ -78,6 +78,8 @@ public:
     void setScrollPosition(uint, uint);
     QString createScreenshot(QString url);
     QString getFaviconFilePath(QString url);
+    void activate();
+    void select();
 
 signals:
     void pageLoadStarted();
diff --git a/browser/unit-tests/browserdbus/testbrowserdbus.cpp b/browser/unit-tests/browserdbus/testbrowserdbus.cpp
index ece127a..8ce7b5d 100644
--- a/browser/unit-tests/browserdbus/testbrowserdbus.cpp
+++ b/browser/unit-tests/browserdbus/testbrowserdbus.cpp
@@ -233,4 +233,19 @@ void TestBrowserDBus::testOnFaviconReceived() {
     QVERIFY(spy.wait(1000));
 }
 
+void TestBrowserDBus::testSelect() {
+    m_bdb->createPageWindow(1,0,0,800,600);
+    QTest::qSleep(300);
+    m_bdb->select();
+    QTest::qSleep(300);
+    QProcess::execute("xdotool getwindowname `xdotool getwindowfocus`");
+}
+void TestBrowserDBus::testActivate() {
+    m_bdb->createPageWindow(1,0,0,800,600);
+    QTest::qSleep(300);
+    m_bdb->activate();
+    QTest::qSleep(300);
+    QProcess::execute("xdotool getwindowname `xdotool getwindowfocus`");
+}
+
 QTEST_MAIN (TestBrowserDBus);
diff --git a/browser/unit-tests/browserdbus/testbrowserdbus.h b/browser/unit-tests/browserdbus/testbrowserdbus.h
index 3faab69..4e0d48a 100644
--- a/browser/unit-tests/browserdbus/testbrowserdbus.h
+++ b/browser/unit-tests/browserdbus/testbrowserdbus.h
@@ -40,6 +40,8 @@ private slots:
     void testOnActionStateChanged();
     void testOnContentSizeChanged();
     void testOnFaviconReceived();
+    void testSelect();
+    void testActivate();
 
 private:
     QString testFileUrl() {
diff --git a/browser/unit-tests/browserview/testbrowser.h b/browser/unit-tests/browserview/testbrowser.h
index 225edaf..b1e5014 100644
--- a/browser/unit-tests/browserview/testbrowser.h
+++ b/browser/unit-tests/browserview/testbrowser.h
@@ -2,16 +2,16 @@
 
 class TestBrowser: public QObject
 {
-	Q_OBJECT
+    Q_OBJECT
 
 private slots:
-	void testCanCreate();
-	void testCanLoadWebpage();
-	void testCanFinishLoadingWebpage();
-	void testProgressIncreases();
-	void testBack();
-	void testForward();
-	void testReload();
+    void testCanCreate();
+    void testCanLoadWebpage();
+    void testCanFinishLoadingWebpage();
+    void testProgressIncreases();
+    void testBack();
+    void testForward();
+    void testReload();
     void testGetTitle();
     void testGetUrl();
     void testCanCreateScreenshot();
diff --git a/browser/webpagewindow.cpp b/browser/webpagewindow.cpp
index 73e4e02..2d16a28 100644
--- a/browser/webpagewindow.cpp
+++ b/browser/webpagewindow.cpp
@@ -55,7 +55,8 @@ void webpagewindow::getUrlTitle() {
 }
 
 conn::brw::ERROR_IDS webpagewindow::activate() {
-    return conn::brw::EID_NOT_IMPLEMENTED;
+    webitem->activate();
+    return conn::brw::EID_NO_ERROR;
 }
 
 conn::brw::ERROR_IDS webpagewindow::getPageIcon(QString iconPath, QString &iconFilePath) {
@@ -214,7 +215,10 @@ QString webpagewindow::getUrl() {
     return webitem->getUrl();
 }
 
-conn::brw::ERROR_IDS webpagewindow::select(){}
+conn::brw::ERROR_IDS webpagewindow::select(){
+    webitem->select();
+    return conn::brw::EID_NO_ERROR;
+}
 
 double webpagewindow::getZoomFactor() {
     return webitem->getZoomFactor();
diff --git a/common/browserdbus.cpp b/common/browserdbus.cpp
index c33e1f2..9c2bf02 100644
--- a/common/browserdbus.cpp
+++ b/common/browserdbus.cpp
@@ -636,3 +636,28 @@ QString BrowserDbus::getFavicon(QString iconPath) {
     }
     return iconFilePath;
 }
+
+void BrowserDbus::activate() {
+    qDebug() << __PRETTY_FUNCTION__;
+
+    QDBusReply<conn::brw::ERROR_IDS> reply = actualtab->activate();
+    if(reply.isValid()) {
+        conn::brw::ERROR_IDS ret = reply.value();
+        qDebug() << "ERROR_IDS " << ret;
+    } else {
+        QDBusError error = reply.error();
+        qDebug() << "ERROR " << error.name() << error.message();
+    }
+}
+void BrowserDbus::select() {
+    qDebug() << __PRETTY_FUNCTION__;
+
+    QDBusReply<conn::brw::ERROR_IDS> reply = actualtab->select();
+    if(reply.isValid()) {
+        conn::brw::ERROR_IDS ret = reply.value();
+        qDebug() << "ERROR_IDS " << ret;
+    } else {
+        QDBusError error = reply.error();
+        qDebug() << "ERROR " << error.name() << error.message();
+    }
+}
diff --git a/common/browserdbus.h b/common/browserdbus.h
index 1d5dd99..0d7b73f 100644
--- a/common/browserdbus.h
+++ b/common/browserdbus.h
@@ -70,6 +70,8 @@ public:
     Q_INVOKABLE void setScrollPosition(uint &x, uint &y);
     Q_INVOKABLE QString getPageIcon(QString);
     Q_INVOKABLE QString getFavicon(QString);
+    Q_INVOKABLE void activate();
+    Q_INVOKABLE void select();
 
     QString title() { return m_title; }
     void setTitle(QString title) { m_title = title; }