summaryrefslogtreecommitdiff
path: root/src/webpage.h
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-07-26 18:51:13 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-07-26 18:51:13 +0200
commitc2cf251dfe808e1a4e336dbf1cddc645d63c2e2f (patch)
treef038c3a38a7532cf15f1d988ac4ad9b6954228e3 /src/webpage.h
parentFixing a bit GooWiki actions and updating TODO (diff)
downloadrekonq-c2cf251dfe808e1a4e336dbf1cddc645d63c2e2f.tar.xz
A lot of fixes here:
- CTRL + click browsing - mouse wheel gestures - cleaning a bit web* classes This has been possible restoring some code from rekonq 0.1 web classes implementation.
Diffstat (limited to 'src/webpage.h')
-rw-r--r--src/webpage.h37
1 files changed, 29 insertions, 8 deletions
diff --git a/src/webpage.h b/src/webpage.h
index cdfb8f00..6a74c7bf 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -50,21 +50,42 @@ public slots:
protected:
WebPage *createWindow(WebWindowType type);
virtual WebPage *newWindow(WebWindowType type);
-
- QString chooseFile(QWebFrame *frame, const QString &suggestedFile);
- void javaScriptAlert(QWebFrame *frame, const QString &msg);
- bool javaScriptConfirm(QWebFrame *frame, const QString &msg);
- bool javaScriptPrompt(QWebFrame *frame, const QString &msg, const QString &defaultValue, QString *result);
+ virtual bool acceptNavigationRequest(QWebFrame *frame,
+ const QNetworkRequest &request,
+ NavigationType type);
+
+ QString chooseFile(QWebFrame *frame,
+ const QString &suggestedFile);
+
+ void javaScriptAlert(QWebFrame *frame,
+ const QString &msg);
+
+ bool javaScriptConfirm(QWebFrame *frame,
+ const QString &msg);
+
+ bool javaScriptPrompt(QWebFrame *frame,
+ const QString &msg,
+ const QString &defaultValue, QString *result);
+
+ QObject *createPlugin(const QString &classId,
+ const QUrl &url,
+ const QStringList &paramNames,
+ const QStringList &paramValues);
- QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
-
-protected Q_SLOTS:
+
+protected Q_SLOTS:
virtual void slotHandleUnsupportedContent(QNetworkReply *reply);
virtual void slotDownloadRequested(const QNetworkRequest &request);
private:
+ friend class WebView;
+
void viewErrorPage(QNetworkReply *);
+
+ // keyboard/mouse modifiers
+ Qt::KeyboardModifiers m_keyboardModifiers;
+ Qt::MouseButtons m_pressedButtons;
};
#endif