[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/libs/webkitkde
From:       Michael David Howell <mhowell123 () gmail ! com>
Date:       2008-08-25 1:33:33
Message-ID: 1219628013.510927.14396.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 851957 by michaelhowell:

Note to self: commit from the root directory. SVN doesn't commit the whole repository \
from a subdirectory.



 M  +14 -2     webkitpart.cpp  
 M  +4 -5      webpage.cpp  


--- trunk/playground/libs/webkitkde/webkitpart.cpp #851956:851957
@@ -25,7 +25,6 @@
 #include "webkitpart.h"
 
 #include "webview.h"
-#include "kdewebkit/webkitglobal.h"
 
 #include <KDE/KParts/GenericFactory>
 #include <KDE/KParts/Plugin>
@@ -58,7 +57,20 @@
     m_webView = new WebView(this, widget());
     lay->addWidget(m_webView);
     lay->addWidget(m_webView->searchBar());
-    setComponentData(WebKitGlobal::componentData());
+
+    KAboutData* about = new KAboutData("webkitkde", 0, ki18n("Webkit HTML \
Component"), +                           /*version*/ "0.1", \
ki18n(/*shortDescription*/ ""), +                           KAboutData::License_LGPL,
+                           ki18n("(c) 2008, Urs Wolfer\n"
+                                 "(c) 2007 Trolltech ASA"));
+
+    about->addAuthor(ki18n("Laurent Montel"), KLocalizedString(), "montel@kde.org");
+    about->addAuthor(ki18n("Michael Howell"), KLocalizedString(), \
"mhowell123@gmail.com"); +    about->addAuthor(ki18n("Urs Wolfer"), \
KLocalizedString(), "uwolfer@kde.org"); +    about->addAuthor(ki18n("Dirk Mueller"), \
KLocalizedString(), "mueller@kde.org"); +    KComponentData componentData(about);
+    setComponentData(componentData);
+
     connect(m_webView, SIGNAL(loadStarted()),
             this, SLOT(loadStarted()));
     connect(m_webView, SIGNAL(loadFinished(bool)),
--- trunk/playground/libs/webkitkde/webpage.cpp #851956:851957
@@ -26,7 +26,6 @@
 #include "webkitpart.h"
 #include "webview.h"
 #include "network/knetworkaccessmanager.h"
-#include "kdewebkit/webkitglobal.h"
 #include "kdewebkit/settings/webkitsettings.h"
 
 #include <KDE/KParts/GenericFactory>
@@ -92,7 +91,7 @@
 {
     const QString host = mainFrame()->url().host();
 
-    if (WebKitGlobal::settings()->windowMovePolicy(host) == \
WebKitSettings::KJSWindowMoveAllow) { // Why doesn't this work? +    if \
(WebKitSettings::self()->windowMovePolicy(host) == \
                WebKitSettings::KJSWindowMoveAllow) { // Why doesn't this work?
         emit m_part->browserExtension()->moveTopLevelWidget(rect.x(), rect.y());
     }
 
@@ -113,7 +112,7 @@
         return;
     }
 
-    if (WebKitGlobal::settings()->windowResizePolicy(host) == \
WebKitSettings::KJSWindowResizeAllow) { +    if \
(WebKitSettings::self()->windowResizePolicy(host) == \
WebKitSettings::KJSWindowResizeAllow) {  kDebug() << "resizing to " << width << "x" \
                << height;
         emit m_part->browserExtension()->resizeTopLevelWidget(width, height);
     }
@@ -129,7 +128,7 @@
     if (bottom > sg.bottom())
         moveByY = - bottom + sg.bottom(); // always <0
     if ((moveByX || moveByY) &&
-      WebKitGlobal::settings()->windowMovePolicy(host) == \
WebKitSettings::KJSWindowMoveAllow) { +      \
WebKitSettings::self()->windowMovePolicy(host) == WebKitSettings::KJSWindowMoveAllow) \
                {
         emit m_part->browserExtension()->moveTopLevelWidget(view()->x() + moveByX, \
view()->y() + moveByY);  }
 }
@@ -148,7 +147,7 @@
 
 void WebPage::slotStatusBarMessage(const QString &message)
 {
-    if (WebKitGlobal::settings()->windowStatusPolicy(mainFrame()->url().host()) == \
WebKitSettings::KJSWindowStatusAllow) { +    if \
(WebKitSettings::self()->windowStatusPolicy(mainFrame()->url().host()) == \
WebKitSettings::KJSWindowStatusAllow) {  m_part->setStatusBarTextProxy(message);
     }
 }


[prev in list] [next in list] [prev in thread] [next in thread]