alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Plasma::WebView has been ported to KGraphicsWebView. http://reviewboard.kde.org/r/2990/

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1091982
This commit is contained in:
Davide Bettio 2010-02-17 23:59:14 +00:00
parent 69ca0bd767
commit d982f20609
5 changed files with 280 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -82,6 +82,7 @@ set(plasma_LIB_SRCS
framesvg.cpp
plasma.cpp
popupapplet.cpp
private/animablegraphicswebview.cpp
private/applethandle.cpp
private/associatedapplicationmanager.cpp
private/datacontainer_p.cpp

156
private/animablegraphicswebview.cpp Normal file
View File

@ -0,0 +1,156 @@
/*
* Copyright 2006-2007 Aaron Seigo <aseigo@kde.org>
* Copyright 2010 Davide Bettio <davide.bettio@kdemail.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "animablegraphicswebview_p.h"
#include <QtGui/QApplication>
#include <QtWebKit/QWebFrame>
#include <kwebpage.h>
using namespace Plasma;
AnimableGraphicsWebView::AnimableGraphicsWebView(QGraphicsItem * parent)
: KGraphicsWebView(parent)
{
m_dragToScroll = false;
}
void AnimableGraphicsWebView::setDragToScroll(bool enable)
{
m_dragToScroll = enable;
}
bool AnimableGraphicsWebView::dragToScroll() const
{
return m_dragToScroll;
}
QSizeF AnimableGraphicsWebView::contentsSize() const
{
if (!page()) {
return QSizeF();
} else {
return page()->mainFrame()->contentsSize();
}
}
void AnimableGraphicsWebView::setScrollPosition(const QPointF &position)
{
if (!page()) {
return;
} else {
page()->mainFrame()->setScrollPosition(position.toPoint());
}
}
QPointF AnimableGraphicsWebView::scrollPosition() const
{
if (!page() || !page()->mainFrame()) {
return QPointF();
} else {
return page()->mainFrame()->scrollPosition();
}
}
QRectF AnimableGraphicsWebView::viewportGeometry() const
{
QRectF result;
if (!page()) {
return result;
} else {
return page()->mainFrame()->geometry();
}
}
void AnimableGraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
if (!page()) {
KGraphicsWebView::mouseMoveEvent(event);
return;
}
if (m_dragToScroll) {
return;
}
QMouseEvent me(QEvent::MouseMove, event->pos().toPoint(), event->button(),
event->buttons(), event->modifiers());
page()->event(&me);
if (me.isAccepted()) {
event->accept();
}
}
void AnimableGraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
if (!page()) {
KGraphicsWebView::mousePressEvent(event);
return;
}
m_lastScrollPosition = scrollPosition();
setFocus();
QMouseEvent me(QEvent::MouseButtonPress, event->pos().toPoint(),
event->button(), event->buttons(), event->modifiers());
page()->event(&me);
if (me.isAccepted() && !m_dragToScroll) {
event->accept();
}
}
void AnimableGraphicsWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
if (!page()) {
KGraphicsWebView::mouseReleaseEvent(event);
return;
}
QMouseEvent me(QEvent::MouseButtonRelease, event->pos().toPoint(),
event->button(),event->buttons(), event->modifiers());
if (!m_dragToScroll || (scrollPosition() - m_lastScrollPosition).manhattanLength() < QApplication::startDragDistance()) {
page()->event(&me);
}
if (me.isAccepted() && !m_dragToScroll) {
event->accept();
}
}
void AnimableGraphicsWebView::wheelEvent(QGraphicsSceneWheelEvent *event)
{
if (!page()) {
KGraphicsWebView::wheelEvent(event);
return;
}
QWheelEvent we(event->pos().toPoint(), event->delta(), event->buttons(),
event->modifiers(), event->orientation());
page()->event(&we);
event->setAccepted(!m_dragToScroll);
}
#include "animablegraphicswebview_p.moc"

66
private/animablegraphicswebview_p.h Normal file
View File

@ -0,0 +1,66 @@
/*
* Copyright 2006-2007 Aaron Seigo <aseigo@kde.org>
* Copyright 2010 Davide Bettio <davide.bettio@kdemail.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef ANIMABLEWEBVIEW_P_H
#define ANIMABLEWEBVIEW_P_H
#include <QtGui/QGraphicsSceneContextMenuEvent>
#include <QtGui/QGraphicsSceneDragDropEvent>
#include <QtGui/QGraphicsSceneMouseEvent>
#include <QtGui/QGraphicsSceneWheelEvent>
#include <QtGui/QGraphicsView>
#include <kgraphicswebview.h>
namespace Plasma
{
class AnimableGraphicsWebView : public KGraphicsWebView
{
Q_OBJECT
Q_PROPERTY(QPointF scrollPosition READ scrollPosition WRITE setScrollPosition)
Q_PROPERTY(QSizeF contentsSize READ contentsSize)
Q_PROPERTY(QRectF viewportGeometry READ viewportGeometry)
public:
AnimableGraphicsWebView(QGraphicsItem * parent = 0);
QPointF scrollPosition() const;
void setScrollPosition(const QPointF &position);
QSizeF contentsSize() const;
QRectF viewportGeometry() const;
void setDragToScroll(bool enable);
bool dragToScroll() const;
protected:
void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
void mousePressEvent(QGraphicsSceneMouseEvent *event);
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
void wheelEvent(QGraphicsSceneWheelEvent *event);
private:
bool m_dragToScroll;
QPointF m_lastScrollPosition;
};
}
#endif

356
widgets/webview.cpp
View File

@ -1,5 +1,6 @@
/*
* Copyright 2006-2007 Aaron Seigo <aseigo@kde.org>
* Copyright 2010 Davide Bettio <davide.bettio@kdemail.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -18,27 +19,23 @@
*/
#include <QtGui/QApplication>
#include <QtGui/QGraphicsSceneContextMenuEvent>
#include <QtGui/QGraphicsSceneDragDropEvent>
#include <QtGui/QGraphicsSceneMouseEvent>
#include <QtGui/QGraphicsSceneWheelEvent>
#include <QtGui/QGraphicsView>
#include <QtGui/QKeyEvent>
#include <QtGui/QStyleOptionGraphicsItem>
#include <fixx11h.h>
#include <QtWebKit/QWebFrame>
#include <QtWebKit/QWebPage>
#include <QtCore/QTimer>
#include <kdebug.h>
#include <kwebpage.h>
#include <kgraphicswebview.h>
#include <kio/accessmanager.h>
#include <accessmanager.h>
#include "animator.h"
#include "plasma.h"
#include "widgets/webview.h"
#include "private/animablegraphicswebview_p.h"
namespace Plasma
{
@ -47,40 +44,40 @@ class WebViewPrivate
{
public:
WebViewPrivate(WebView *parent)
: q(parent),
dragToScroll(false)
: q(parent)
{
}
void loadingFinished(bool success);
void updateRequested(const QRect &dirtyRect);
void scrollRequested(int dx, int dy, const QRect &scrollRect);
void dragTimeoutExpired();
WebView *q;
QWebPage *page;
AnimableGraphicsWebView *webView;
bool loaded;
bool dragToScroll;
QPointF lastScrollPosition;
};
WebView::WebView(QGraphicsItem *parent)
: QGraphicsWidget(parent),
d(new WebViewPrivate(this))
{
d->page = 0;
d->loaded = false;
setAcceptTouchEvents(true);
Plasma::Animator::self()->registerScrollingManager(this);
setAcceptsHoverEvents(true);
setFlags(QGraphicsItem::ItemIsFocusable);
QWebPage *page = new KWebPage(this);
page->setNetworkAccessManager(new KIO::AccessManager(page));
d->webView = new AnimableGraphicsWebView(this);
d->webView->setDragToScroll(false);
QPalette palette = qApp->palette();
palette.setBrush(QPalette::Base, Qt::transparent);
page->setPalette(palette);
setPage(page);
d->webView->page()->setPalette(palette);
Plasma::Animator::self()->registerScrollingManager(d->webView);
connect(d->webView, SIGNAL(loadProgress(int)),
this, SIGNAL(loadProgress(int)));
connect(d->webView, SIGNAL(loadFinished(bool)),
this, SLOT(loadingFinished(bool)));
}
WebView::~WebView()
@ -91,420 +88,197 @@ WebView::~WebView()
void WebView::setUrl(const KUrl &url)
{
d->loaded = false;
if (d->page) {
d->page->mainFrame()->load(url);
}
d->webView->load(url);
}
KUrl WebView::url() const
{
return d->page ? d->page->mainFrame()->url() : KUrl();
return d->webView->url();
}
void WebView::setHtml(const QByteArray &html, const KUrl &baseUrl)
{
d->loaded = false;
if (d->page) {
d->page->mainFrame()->setContent(html, QString(), baseUrl);
}
d->webView->setContent(html, QString(), baseUrl);
}
void WebView::setHtml(const QString &html, const KUrl &baseUrl)
{
d->loaded = false;
if (d->page) {
d->page->mainFrame()->setHtml(html, baseUrl);
}
d->webView->setHtml(html, baseUrl);
}
QString WebView::html() const
{
return d->page ? d->page->mainFrame()->toHtml() : QByteArray();
return d->webView->page()->mainFrame()->toHtml();
}
QRectF WebView::geometry() const
{
if (d->loaded && d->page) {
return QRectF(pos(), d->page->mainFrame()->geometry().size());
if (d->loaded) {
return QRectF(pos(), d->webView->page()->mainFrame()->geometry().size());
} else {
return QGraphicsWidget::geometry();
}
return QGraphicsWidget::geometry();
}
QSizeF WebView::contentsSize() const
{
if (!d->page) {
return QSizeF();
} else {
return d->page->mainFrame()->contentsSize();
}
return d->webView->page()->mainFrame()->contentsSize();
}
void WebView::setScrollPosition(const QPointF &position)
{
if (!d->page) {
return;
} else {
d->page->mainFrame()->setScrollPosition(position.toPoint());
}
d->webView->setScrollPosition(position);
}
QPointF WebView::scrollPosition() const
{
if (!d->page) {
return QPointF();
} else {
return d->page->mainFrame()->scrollPosition();
}
return d->webView->scrollPosition();
}
QRectF WebView::viewportGeometry() const
{
QRectF result;
if (!d->page) {
return result;
} else {
return d->page->mainFrame()->geometry();
}
return d->webView->page()->mainFrame()->geometry();
}
qreal WebView::zoomFactor() const
{
if (!d->page) {
return 1;
} else {
return d->page->mainFrame()->zoomFactor();
}
return d->webView->zoomFactor();
}
void WebView::setZoomFactor(const qreal zoom)
{
if (!d->page) {
return;
} else {
d->page->mainFrame()->setZoomFactor(zoom);
}
d->webView->setZoomFactor(zoom);
}
void WebView::setPage(QWebPage *page)
{
if (page == d->page) {
return;
}
if (d->page) {
if (d->page->parent() == this) {
delete d->page;
} else {
disconnect(d->page, 0, this, 0);
}
}
d->page = page;
//FIXME: QWebPage _requires_ a QWidget view to not crash in places such as
// WebCore::PopupMenu::show() due to hostWindow()->platformPageClient() == NULL
// because QWebPage::d->client is NULL
d->page->setView(viewFor(this));
if (d->page) {
connect(d->page, SIGNAL(loadProgress(int)),
this, SIGNAL(loadProgress(int)));
connect(d->page, SIGNAL(loadFinished(bool)),
this, SLOT(loadingFinished(bool)));
connect(d->page, SIGNAL(repaintRequested(const QRect&)),
this, SLOT(updateRequested(const QRect&)));
connect(d->page, SIGNAL(scrollRequested(int, int, const QRect &)),
this, SLOT(scrollRequested(int, int, const QRect &)));
}
d->webView->setPage(page);
}
QWebPage *WebView::page() const
{
return d->page;
return d->webView->page();
}
QWebFrame *WebView::mainFrame() const
{
return d->page ? d->page->mainFrame() : 0;
return d->webView->page()->mainFrame();
}
void WebView::setDragToScroll(bool drag)
{
d->dragToScroll = drag;
d->webView->setDragToScroll(drag);
}
bool WebView::dragToScroll()
{
return d->dragToScroll;
return d->webView->dragToScroll();
}
void WebView::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
Q_UNUSED(widget)
if (d->loaded && d->page) {
//kDebug() << "painting page";
d->page->mainFrame()->render(painter, option->rect);
}
QGraphicsWidget::paint(painter, option, widget);
}
void WebView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
if (!d->page) {
QGraphicsWidget::mouseMoveEvent(event);
return;
}
if (d->dragToScroll) {
return;
}
QMouseEvent me(QEvent::MouseMove, event->pos().toPoint(), event->button(),
event->buttons(), event->modifiers());
d->page->event(&me);
if (me.isAccepted()) {
event->accept();
}
QGraphicsWidget::mouseMoveEvent(event);
}
void WebView::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
{
if (!d->page) {
QGraphicsWidget::hoverMoveEvent(event);
return;
}
QMouseEvent me(QEvent::MouseMove, event->pos().toPoint(), Qt::NoButton, Qt::NoButton, Qt::NoModifier);
d->page->event(&me);
if (me.isAccepted()) {
event->accept();
}
QGraphicsWidget::hoverMoveEvent(event);
}
void WebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
if (!d->page) {
QGraphicsWidget::mousePressEvent(event);
return;
}
d->lastScrollPosition = scrollPosition();
setFocus();
QMouseEvent me(QEvent::MouseButtonPress, event->pos().toPoint(),
event->button(), event->buttons(), event->modifiers());
// d->page->event(event);
d->page->event(&me);
if (me.isAccepted() && !d->dragToScroll) {
event->accept();
}
QGraphicsWidget::mousePressEvent(event);
}
void WebView::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
{
if (!d->page) {
QGraphicsWidget::mouseDoubleClickEvent(event);
return;
}
QMouseEvent me(QEvent::MouseButtonDblClick, event->pos().toPoint(),
event->button(), event->buttons(), event->modifiers());
d->page->event(&me);
if (me.isAccepted()) {
event->accept();
}
QGraphicsWidget::mouseDoubleClickEvent(event);
}
void WebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
if (!d->page) {
QGraphicsWidget::mouseReleaseEvent(event);
return;
}
QMouseEvent me(QEvent::MouseButtonRelease, event->pos().toPoint(),
event->button(),event->buttons(), event->modifiers());
if (!d->dragToScroll || (scrollPosition() - d->lastScrollPosition).manhattanLength() < QApplication::startDragDistance()) {
d->page->event(&me);
}
if (me.isAccepted() && !d->dragToScroll) {
event->accept();
}
QGraphicsWidget::mouseReleaseEvent(event);
}
void WebView::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
{
if (!d->page) {
QGraphicsWidget::contextMenuEvent(event);
return;
}
QContextMenuEvent ce(static_cast<QContextMenuEvent::Reason>(event->reason()),
event->pos().toPoint(), event->screenPos());
if (d->page->swallowContextMenuEvent(&ce)) {
event->accept();
} else {
d->page->updatePositionDependentActions(event->pos().toPoint());
d->page->event(&ce);
if (ce.isAccepted()) {
event->accept();
}
}
QGraphicsWidget::contextMenuEvent(event);
}
void WebView::wheelEvent(QGraphicsSceneWheelEvent *event)
{
if (!d->page) {
QGraphicsWidget::wheelEvent(event);
return;
}
QWheelEvent we(event->pos().toPoint(), event->delta(), event->buttons(),
event->modifiers(), event->orientation());
d->page->event(&we);
event->setAccepted(!d->dragToScroll);
QGraphicsWidget::wheelEvent(event);
}
void WebView::keyPressEvent(QKeyEvent * event)
{
if (!d->page) {
QGraphicsWidget::keyPressEvent(event);
return;
}
d->page->event(event);
if (!event->isAccepted()) {
QGraphicsWidget::keyPressEvent(event);
}
QGraphicsWidget::keyPressEvent(event);
}
void WebView::keyReleaseEvent(QKeyEvent * event)
{
if (!d->page) {
QGraphicsWidget::keyReleaseEvent(event);
return;
}
d->page->event(event);
if (!event->isAccepted()) {
QGraphicsWidget::keyPressEvent(event);
}
QGraphicsWidget::keyReleaseEvent(event);
}
void WebView::focusInEvent(QFocusEvent * event)
{
if (d->page) {
d->page->event(event);
}
QGraphicsWidget::focusInEvent(event);
}
void WebView::focusOutEvent(QFocusEvent * event)
{
if (d->page) {
d->page->event(event);
}
QGraphicsWidget::focusOutEvent(event);
}
void WebView::dragEnterEvent(QGraphicsSceneDragDropEvent * event)
{
if (!d->page) {
QGraphicsWidget::dragEnterEvent(event);
return;
}
QDragEnterEvent de(event->pos().toPoint(), event->possibleActions(), event->mimeData(),
event->buttons(), event->modifiers());
d->page->event(&de);
if (de.isAccepted()) {
event->accept();
}
QGraphicsWidget::dragEnterEvent(event);
}
void WebView::dragLeaveEvent(QGraphicsSceneDragDropEvent * event)
{
if (!d->page) {
QGraphicsWidget::dragLeaveEvent(event);
return;
}
QDragLeaveEvent de;
d->page->event(&de);
if (de.isAccepted()) {
event->accept();
}
QGraphicsWidget::dragLeaveEvent(event);
}
void WebView::dragMoveEvent(QGraphicsSceneDragDropEvent * event)
{
if (!d->page) {
QGraphicsWidget::dragMoveEvent(event);
return;
}
// Ok, so the docs say "don't make a QDragMoveEvent yourself" but we're just
// replicating it here, not really creating a new one. hopefully we get away with it ;)
QDragMoveEvent de(event->pos().toPoint(), event->possibleActions(), event->mimeData(),
event->buttons(), event->modifiers());
d->page->event(&de);
if (de.isAccepted()) {
event->accept();
}
QGraphicsWidget::dragMoveEvent(event);
}
void WebView::dropEvent(QGraphicsSceneDragDropEvent * event)
{
if (!d->page) {
QGraphicsWidget::dropEvent(event);
return;
}
QDragMoveEvent de(event->pos().toPoint(), event->possibleActions(), event->mimeData(),
event->buttons(), event->modifiers());
d->page->event(&de);
if (de.isAccepted()) {
event->accept();
}
QGraphicsWidget::dropEvent(event);
}
QVariant WebView::itemChange(GraphicsItemChange change, const QVariant &value)
{
if (change == QGraphicsItem::ItemSceneHasChanged && d->page) {
if (change == QGraphicsItem::ItemSceneHasChanged) {
//FIXME: QWebPage _requires_ a QWidget view to not crash in places such as
// WebCore::PopupMenu::show() due to hostWindow()->platformPageClient() == NULL
// because QWebPage::d->client is NULL
d->page->setView(viewFor(this));
d->webView->page()->setView(viewFor(this));
} else {
return QGraphicsWidget::itemChange(change, value);
}
return QGraphicsWidget::itemChange(change, value);
}
void WebView::setGeometry(const QRectF &geometry)
{
QGraphicsWidget::setGeometry(geometry);
d->page->setViewportSize(geometry.size().toSize());
d->webView->setGeometry(QRectF(0, 0, geometry.width(), geometry.height()));
}
QSizeF WebView::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
{
if (which == Qt::PreferredSize) {
return d->page->mainFrame()->contentsSize();
return d->webView->page()->mainFrame()->contentsSize();
} else {
return QGraphicsWidget::sizeHint(which, constraint);
}
@ -518,22 +292,6 @@ void WebViewPrivate::loadingFinished(bool success)
q->update();
}
void WebViewPrivate::updateRequested(const QRect &dirtyRect)
{
if (loaded && page) {
q->update(QRectF(dirtyRect.topLeft().x(), dirtyRect.topLeft().y(),
dirtyRect.width(), dirtyRect.height()));
}
}
void WebViewPrivate::scrollRequested(int dx, int dy, const QRect &scrollRect)
{
Q_UNUSED(dx)
Q_UNUSED(dy)
updateRequested(scrollRect);
}
} // namespace Plasma
#include "webview.moc"

2
widgets/webview.h
View File

@ -216,8 +216,6 @@ class PLASMA_EXPORT WebView : public QGraphicsWidget
private:
Q_PRIVATE_SLOT(d, void loadingFinished(bool success))
Q_PRIVATE_SLOT(d, void updateRequested(const QRect& dirtyRect))
Q_PRIVATE_SLOT(d, void scrollRequested(int dx, int dy, const QRect &scrollRect))
WebViewPrivate * const d;
friend class WebViewPrivate;