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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/scriptengines/webkit
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-01-04 1:53:12
Message-ID: 1262569992.624292.29152.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1069668 by aseigo:

view and page were synonymous, which was nonesensical. make page() return the \
associated QWebPage. ++clarity;


 M  +2 -2      dashboardapplet.cpp  
 M  +7 -3      plasmawebapplet.cpp  
 M  +17 -16    webapplet.cpp  
 M  +2 -1      webapplet.h  


--- trunk/KDE/kdebase/workspace/plasma/generic/scriptengines/webkit/dashboardapplet.cpp \
#1069667:1069668 @@ -54,8 +54,8 @@
 {
     WebApplet::loadFinished(success);
     if (success) {
-        page()->resize(page()->mainFrame()->contentsSize());
-        applet()->resize(page()->mainFrame()->contentsSize());
+        view()->resize(view()->mainFrame()->contentsSize());
+        applet()->resize(view()->mainFrame()->contentsSize());
     }
 }
 
--- trunk/KDE/kdebase/workspace/plasma/generic/scriptengines/webkit/plasmawebapplet.cpp \
#1069667:1069668 @@ -23,6 +23,7 @@
 
 #include "plasmawebapplet.h"
 
+#include <QAction>
 #include <QWebPage>
 #include <QWebFrame>
 
@@ -157,6 +158,9 @@
         connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
                 this, SLOT(themeChanged()));
         makeStylesheet();
+        page()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, \
true); +        QAction *inspectAction = page()->action(QWebPage::InspectElement);
+        inspectAction->setText(i18n("Inspect this widget"));
         return true;
     }
 
@@ -178,7 +182,7 @@
                                   .arg(font.family())
                                   .arg(font.pointSize());
         m_temp.write(css.toUtf8());
-        page()->page()->settings()->setUserStyleSheetUrl(QUrl(m_temp.fileName()));
+        page()->settings()->setUserStyleSheetUrl(QUrl(m_temp.fileName()));
         m_temp.close();
     }
 }
@@ -206,8 +210,8 @@
         qreal right;
         qreal bottom;
         applet()->getContentsMargins(&left, &top, &right, &bottom);
-        page()->setPos(QPointF(left, top));
-        page()->resize(WebApplet::size() - QSizeF(left + right, top + bottom));
+        view()->setPos(QPointF(left, top));
+        view()->resize(WebApplet::size() - QSizeF(left + right, top + bottom));
         //kDebug() << WebApplet::size() << left << right << top << bottom << \
page()->size();  }
     callJsFunction("constraintsEvent", QVariantList() << (int)constraints);
--- trunk/KDE/kdebase/workspace/plasma/generic/scriptengines/webkit/webapplet.cpp \
#1069667:1069668 @@ -39,7 +39,7 @@
 {
 public:
     Private()
-        : page(0)
+        : view(0)
     {
     }
 
@@ -50,22 +50,22 @@
         Plasma::Applet *applet = q->applet();
         applet->setAcceptsHoverEvents(true);
 
-        page = new Plasma::WebView(applet);
-        QObject::connect(page, SIGNAL(loadFinished(bool)),
+        view = new Plasma::WebView(applet);
+        QObject::connect(view, SIGNAL(loadFinished(bool)),
                          q, SLOT(loadFinished(bool)));
-        QObject::connect(page->page(), SIGNAL(frameCreated(QWebFrame *)),
+        QObject::connect(view->page(), SIGNAL(frameCreated(QWebFrame *)),
                          q, SLOT(connectFrame(QWebFrame *)));
-        q->connectFrame(page->mainFrame());
+        q->connectFrame(view->mainFrame());
 
-        page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, \
                Qt::ScrollBarAlwaysOff);
-        page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
+        view->mainFrame()->setScrollBarPolicy(Qt::Horizontal, \
Qt::ScrollBarAlwaysOff); +        view->mainFrame()->setScrollBarPolicy(Qt::Vertical, \
Qt::ScrollBarAlwaysOff);  
-        QPalette palette = page->palette();
+        QPalette palette = view->palette();
         palette.setColor(QPalette::Base, Qt::transparent);
-        page->page()->setPalette(palette);
+        view->page()->setPalette(palette);
     }
 
-    Plasma::WebView *page;
+    Plasma::WebView *view;
     bool loaded;
 };
 
@@ -90,13 +90,14 @@
 
     if (webpage.isEmpty()) {
         kDebug() << "fail! no page";
-        delete d->page;
-        d->page = 0;
+        delete d->view;
+        d->view = 0;
         return false;
     }
+
     KUrl url(package()->filePath("html"));
     kDebug() << webpage << package()->path() << url;
-    d->page->mainFrame()->setHtml(dataFor(webpage), url);
+    d->view->mainFrame()->setHtml(dataFor(webpage), url);
     return true;
 }
 
@@ -111,7 +112,7 @@
 
 Plasma::WebView* WebApplet::view() const
 {
-    return d->page;
+    return d->view;
 }
 
 void WebApplet::loadFinished(bool success)
@@ -138,9 +139,9 @@
     return data;
 }
 
-Plasma::WebView* WebApplet::page()
+QWebPage *WebApplet::page()
 {
-    return d->page;
+    return d->view ? d->view->page() : 0;
 }
 
 bool WebApplet::loaded()
--- trunk/KDE/kdebase/workspace/plasma/generic/scriptengines/webkit/webapplet.h \
#1069667:1069668 @@ -28,6 +28,7 @@
 #include <Plasma/AppletScript>
 
 class QWebFrame;
+class QWebPage;
 
 namespace Plasma
 {
@@ -49,7 +50,7 @@
                                 const QStyleOptionGraphicsItem *option,
                                 const QRect &contentsRect);
     virtual QByteArray dataFor(const QString &str);
-    Plasma::WebView* page();
+    QWebPage *page();
     bool loaded();
 
 protected slots:


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