web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename webpage and webview to swisswebpage and swissswebview to be more specific; refs #115

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-02-09 09:22:33 +00:00
parent 66f3cad774
commit 7bb38a75f4
7 changed files with 100 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qbrowserlib/qmake.pro.in
View File

@@ -36,7 +36,7 @@ TRANSLATIONS = @srcdir@/qbrowserlib_en.ts \
SOURCES =
HEADERS = @srcdir@/webview.hxx @srcdir@/webpage.hxx \
HEADERS = @srcdir@/swisswebview.hxx @srcdir@/swisswebpage.hxx \
@srcdir@/pluginfactory.hxx @srcdir@/saveorrun.hxx
FORMS = @srcdir@/saveorrun.ui

29
src/qbrowserlib/webpage.hxx → src/qbrowserlib/swisswebpage.hxx
View File

@@ -5,8 +5,10 @@
// 1 2 3 4 5 6 7 8
// 45678901234567890123456789012345678901234567890123456789012345678901234567890
#ifndef __WEBPAGE_HXX__
#define __WEBPAGE_HXX__
#ifndef __SWISSWEBPAGE_HXX__
#define __SWISSWEBPAGE_HXX__
#include <qbrowserlib/pluginfactory.hxx>
#include <QtWebKit/QWebPage>
#include <QtCore/QProcessEnvironment>
@@ -16,18 +18,31 @@
#define LOG qDebug()<<__PRETTY_FUNCTION__
#endif
class WebPage: public QWebPage {
//! QWebPage with additional features and better default behaviour.
/*! SwissWebPage is designed to be used by SwissWebView.
This QWebPage supports the folloing additional features:
- Handling of plugins through PluginFactory
- Processing of unsupportedContent
- Delegation of all links
- Signals @ref newPage if a new window should be created
- Set useragent from environment variable @c SWISS_USERAGENT */
class SwissWebPage: public QWebPage {
Q_OBJECT;
signals:
void newPage(WebPage*);
void newPage(SwissWebPage*);
public:
WebPage(QObject *parent = 0): QWebPage(parent) {}
SwissWebPage(QObject *parent = 0): QWebPage(parent) {
setPluginFactory(new PluginFactory);
setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
setForwardUnsupportedContent(true);
}
protected:
virtual QWebPage* createWindow(WebWindowType type) {
switch (type) {
case QWebPage::WebBrowserWindow:
case QWebPage::WebModalDialog: {
WebPage *page(new WebPage);
SwissWebPage *page(new SwissWebPage);
newPage(page);
return page;
} break;
@@ -36,7 +51,7 @@ class WebPage: public QWebPage {
}
virtual QString userAgentForUrl(const QUrl& url) const {
QString add(QProcessEnvironment::systemEnvironment()
.value("SWISSSURFER_USERAGENT"));
.value("SWISS_USERAGENT"));
return QWebPage::userAgentForUrl(url)+(add.size()?" "+add:QString());
}
QObject* createPlugin(const QString& classid, const QUrl& url,

64
src/qbrowserlib/swisswebview.hxx Normal file
View File

@@ -0,0 +1,64 @@
/*! @file
@id $Id$
*/
// 1 2 3 4 5 6 7 8
// 45678901234567890123456789012345678901234567890123456789012345678901234567890
#ifndef SWISSWEBVIEW_HXX
#define SWISSWEBVIEW_HXX
#include <qbrowserlib/swisswebpage.hxx>
#include <QtWebKit>
#include <QtDesigner/QDesignerExportWidget>
#include <memory>
//! QWebViev class with additional features.
/*! This QWebView class contains a @ref SwissWebPage and adds a new
signal @refs newView that sends the view whenever the a new view
(new window, new tab) must be opened.
\copydetails SwissWebView::newView(SwissWebView*)
*/
class QDESIGNER_WIDGET_EXPORT SwissWebView: public QWebView {
Q_OBJECT;
signals:
//! Signals that a new window (or tab) must be opened
/*! @note You @b must connect to @ref newView and assign the new
@ref SwissWebView instance to a partent widget or at least
delete it, otherwise you'll have a memory leak! */
void newView(SwissWebView*);
public:
//! Default construction, creates new @ref SwissWebView
SwissWebView(QWidget *parent=0): QWebView(parent) {
//! @bugfix, gcc does not yet support constructor calling
x(new SwissWebPage);
}
//! Construction with externally allocated @ref SwissWebPage
/*! SwissWebView takes ownership of SwissWebPage. */
SwissWebView(SwissWebPage* webpage) {
//! @bugfix, gcc does not yet support constructor calling
x(webpage);
}
private:
//! @bugfix, gcc does not yet support constructor calling
/*! @see http://en.wikipedia.org/wiki/C++11#Object_construction_improvement
*/
void x(SwissWebPage* webpage) {
webpage->setParent(this);
setPage(webpage);
// create a new SwissWebView when a new SwissWebPage has been created
assert(connect(page(), SIGNAL(newPage(SwissWebPage*)),
SLOT(newPage(SwissWebPage*))));
}
private slots:
void newPage(SwissWebPage* p) {
// memory will be lost if signal is not handled and SwissWebView
// is not assigned
newView(new SwissWebView(p));
}
};
#endif

49
src/qbrowserlib/webview.hxx
View File

@@ -1,49 +0,0 @@
/*! @file
@id $Id$
*/
// 1 2 3 4 5 6 7 8
// 45678901234567890123456789012345678901234567890123456789012345678901234567890
#ifndef WEBVIEW_HXX
#define WEBVIEW_HXX
#include <qbrowserlib/webpage.hxx>
#include <qbrowserlib/pluginfactory.hxx>
#include <QtWebKit>
#include <QtDesigner/QDesignerExportWidget>
#include <memory>
class QDESIGNER_WIDGET_EXPORT WebView: public QWebView {
Q_OBJECT;
signals:
void newView(WebView*);
public:
WebView(WebPage* webpage) {
x(webpage); //! @bugfix, gcc does not yet support constructor calling
}
WebView(QWidget *parent=0): QWebView(parent) {
x(new WebPage); //! @bugfix, gcc does not yet support constructor calling
}
private:
//! @bugfix, gcc does not yet support constructor calling
/*! @see http://en.wikipedia.org/wiki/C++11#Object_construction_improvement
*/
void x(WebPage* webpage) {
webpage->setParent(this);
setPage(webpage);
page()->setPluginFactory(new PluginFactory);
page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
page()->setForwardUnsupportedContent(true);
assert(connect(page(), SIGNAL(newPage(WebPage*)),
SLOT(newPage(WebPage*))));
}
private slots:
void newPage(WebPage* p) {
newView(new WebView(p));
}
};
#endif