2006-10-20 Nikolas Zimmermann <zimmermann@kde.org>

        Reviewed and landed by Anders.

        Adapt to FrameQtClient changes, and provide some kind of status
        information to the KPart wheter we're loading or not (started/completed signaling).

        * WebKitPart/CMakeLists.txt:
        * WebKitPart/WebKitPart.cpp:
        (WebKitPart::WebKitPart):
        (WebKitPart::~WebKitPart):
        (WebKitPart::openUrl):
        (WebKitPart::initView):
        * WebKitPart/WebKitPart.h:
        * WebKitPart/WebKitPartBrowserExtension.cpp: Added.
        (WebKitPartBrowserExtension::WebKitPartBrowserExtension):
        (WebKitPartBrowserExtension::~WebKitPartBrowserExtension):
        * WebKitPart/WebKitPartBrowserExtension.h: Added.
        * WebKitPart/WebKitPartClient.cpp:
        (WebKitPartClient::WebKitPartClient):
        (WebKitPartClient::loadFinished):
        * WebKitPart/WebKitPartClient.h:
        * WebKitPart/WebKitPartInterface.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17167 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index 5e0910ec8ec5139a482ae9905712c51170ed3bde..8f1e00b74787e723d9e316c67cb16b11c76c0bc5 100644 (file)
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -1,3 +1,27 @@
+2006-10-20  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed and landed by Anders.
+
+        Adapt to FrameQtClient changes, and provide some kind of status
+        information to the KPart wheter we're loading or not (started/completed signaling).
+
+        * WebKitPart/CMakeLists.txt:
+        * WebKitPart/WebKitPart.cpp:
+        (WebKitPart::WebKitPart):
+        (WebKitPart::~WebKitPart):
+        (WebKitPart::openUrl):
+        (WebKitPart::initView):
+        * WebKitPart/WebKitPart.h:
+        * WebKitPart/WebKitPartBrowserExtension.cpp: Added.
+        (WebKitPartBrowserExtension::WebKitPartBrowserExtension):
+        (WebKitPartBrowserExtension::~WebKitPartBrowserExtension):
+        * WebKitPart/WebKitPartBrowserExtension.h: Added.
+        * WebKitPart/WebKitPartClient.cpp:
+        (WebKitPartClient::WebKitPartClient):
+        (WebKitPartClient::loadFinished):
+        * WebKitPart/WebKitPartClient.h:
+        * WebKitPart/WebKitPartInterface.h:
+
 2006-10-02  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by eseidel.  Landed by eseidel.

diff --git a/WebKitQt/WebKitPart/CMakeLists.txt b/WebKitQt/WebKitPart/CMakeLists.txt
index 85bf594658bceb6ac04504642b442d903b151e05..55094bb5e28bc784b7e9de27efcffe703dd840f8 100644 (file)
--- a/WebKitQt/WebKitPart/CMakeLists.txt
+++ b/WebKitQt/WebKitPart/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories (
 
 add_definitions (-Wno-undef -Wno-unused-parameter)
 
-set (WebKitPart_SRCS WebKitFactory.cpp WebKitPart.cpp WebKitPartInterface.cpp WebKitPartClient.cpp)
+set (WebKitPart_SRCS WebKitFactory.cpp WebKitPart.cpp WebKitPartBrowserExtension.cpp WebKitPartInterface.cpp WebKitPartClient.cpp)
 
 qt4_add_dbus_adaptor (WebKitPart_SRCS org.kde.WebKitPart.xml WebKitPartInterface.h WebKitPartInterface)
 

diff --git a/WebKitQt/WebKitPart/WebKitPart.cpp b/WebKitQt/WebKitPart/WebKitPart.cpp
index 54b184d30a7d4b49c802746476bfdba787db489a..e699445a856465749eab1ffa87bb586e95d621da 100644 (file)
--- a/WebKitQt/WebKitPart/WebKitPart.cpp
+++ b/WebKitQt/WebKitPart/WebKitPart.cpp
@@ -28,10 +28,13 @@
 #include "config.h"
 #include "WebKitPart.h"
 
+#include <QDebug>
+
 #include "Page.h"
 #include "FrameQt.h"
 #include "WebKitFactory.h"
 #include "WebKitPartClient.h"
+#include "WebKitPartBrowserExtension.h"
 
 using namespace WebCore;
 
@@ -42,8 +45,9 @@ WebKitPart::WebKitPart(QWidget* parentWidget, QObject* parentObject, GUIProfile
     , m_client(0)
 {
     setInstance(WebKitFactory::instance(), prof == BrowserViewGUI && !parentPart());
-
     initView(parentWidget, prof);
+
+    m_extension = new WebKitPartBrowserExtension(this);
 }
 
 WebKitPart::~WebKitPart()
@@ -52,6 +56,7 @@ WebKitPart::~WebKitPart()
         delete m_frame->page();
 
     delete m_client;
+    delete m_extension;
 }
 
 bool WebKitPart::openFile()
@@ -61,6 +66,7 @@ bool WebKitPart::openFile()
 
 bool WebKitPart::openUrl(const KUrl& url)
 {
+    emit started(0);
     return m_frame->openURL(KURL(url.toEncoded()));
 }
 
@@ -86,7 +92,7 @@ void WebKitPart::initView(QWidget* parentWidget, GUIProfile prof)
     else if (prof == BrowserViewGUI)
         setXMLFile("WebKitPartBrowser.rc");
 
-    m_client = new WebKitPartClient();
+    m_client = new WebKitPartClient(this);
  
     // Initialize WebCore in Qt platform mode...
     Page* page = new Page();

diff --git a/WebKitQt/WebKitPart/WebKitPart.h b/WebKitQt/WebKitPart/WebKitPart.h
index 9a35842f3fba6a51582a2c57e95482cd1a8fe11f..6472d448d8fd4bdb1d2ce12c3b70a12b5d3a0017 100644 (file)
--- a/WebKitQt/WebKitPart/WebKitPart.h
+++ b/WebKitQt/WebKitPart/WebKitPart.h
@@ -39,6 +39,7 @@ namespace WebCore {
 }
 
 class WebKitPartClient;
+class WebKitPartBrowserExtension;
 
 class WebKitPart : public KParts::ReadOnlyPart
 {
@@ -99,6 +100,7 @@ private:
     WTF::RefPtr<WebCore::FrameView> m_frameView;
 
     WebKitPartClient* m_client;
+    WebKitPartBrowserExtension* m_extension;
 };
 
 #endif

diff --git a/WebKitQt/WebKitPart/WebKitPartClient.cpp b/WebKitQt/WebKitPart/WebKitPartClient.cpp
index 795b40321a797bd18cc0dc8742057aafedc3de6f..2c89e7e43629f8ea2806604cf60f0f64218725d8 100644 (file)
--- a/WebKitQt/WebKitPart/WebKitPartClient.cpp
+++ b/WebKitQt/WebKitPart/WebKitPartClient.cpp
@@ -32,8 +32,9 @@
 
 using namespace WebCore;
 
-WebKitPartClient::WebKitPartClient()
+WebKitPartClient::WebKitPartClient(WebKitPart* part)
     : FrameQtClientDefault()
+    , m_part(part)
 {
 }
 
@@ -41,4 +42,9 @@ WebKitPartClient::~WebKitPartClient()
 {
 }
 
+void WebKitPartClient::loadFinished() const
+{
+    emit m_part->completed();
+}
+
 // vim: ts=4 sw=4 et

diff --git a/WebKitQt/WebKitPart/WebKitPartClient.h b/WebKitQt/WebKitPart/WebKitPartClient.h
index c46ad2d7963d2c67da92859779fcad495d9bfbc3..8874334019a366bf7a01e7a278aabe63b0489fa5 100644 (file)
--- a/WebKitQt/WebKitPart/WebKitPartClient.h
+++ b/WebKitQt/WebKitPart/WebKitPartClient.h
@@ -30,11 +30,17 @@
 
 #include "FrameQt.h"
 
+class WebKitPart;
 class WebKitPartClient : public WebCore::FrameQtClientDefault
 {
 public:
-    WebKitPartClient();
+    WebKitPartClient(WebKitPart*);
     virtual ~WebKitPartClient();
+
+    virtual void loadFinished() const;
+
+private:
+    WebKitPart* m_part;
 };
 
 #endif

diff --git a/WebKitQt/WebKitPart/WebKitPartInterface.h b/WebKitQt/WebKitPart/WebKitPartInterface.h
index cac18980bbc3d8e3cfd090b1337c5eb3b3428c6f..a0113706993e5c5e29396f61385c8ef4b0ac55db 100644 (file)
--- a/WebKitQt/WebKitPart/WebKitPartInterface.h
+++ b/WebKitQt/WebKitPart/WebKitPartInterface.h
@@ -33,6 +33,7 @@
 class KUrl;
 class WebKitPart;
 
+// Exposed to DBUS.
 class WebKitPartInterface : public QObject
 {
 Q_OBJECT