From 9e7e0285bbc4592bc52780b1f6b15aa9009defb2 Mon Sep 17 00:00:00 2001 From: nowrep Date: Wed, 4 Jan 2012 19:02:33 +0100 Subject: [PATCH] Added support for printing page through javascript window.print() --- FAQ | 4 ++-- src/data/icons/lineedit.psd | Bin 31410 -> 0 bytes src/src.pro | 1 - src/webview/webpage.cpp | 6 ++++++ src/webview/webpage.h | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 src/data/icons/lineedit.psd diff --git a/FAQ b/FAQ index bb6ed5dfe..e6b7142ec 100644 --- a/FAQ +++ b/FAQ @@ -2,7 +2,7 @@ FAQ Q: Profile data storage location Q: Cannot find page bookmarked with clicking on star icon. -Q: Errors when visiting secured (https) sites. +Q: Errors when visiting secured (https) sites or downloading EasyList. Q: Cannot save bookmarks and history. Q: Using a lot of % CPU. Q: Search engines are not saved through restarts. @@ -27,7 +27,7 @@ A: When you add a bookmark from the star icon, it is automatically added Q: I am getting a lot of SSL errors when visiting secured (https) pages. - Why does this happen? + Also I cannot update EasyList. Why does this happen? ---------------------------------------------------------------------------------- A: Your system CA certificates list is probably too small or even missing. You can check this in SSL Manager (Tools ->Preferences -> Privacy -> SSL Manager). diff --git a/src/data/icons/lineedit.psd b/src/data/icons/lineedit.psd deleted file mode 100644 index d8de8c80e93023cf0bcca8c2bc4a23274b6ff3dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31410 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 DEVz_g diff --git a/src/src.pro b/src/src.pro index b8fbbcf98..7f8010b48 100644 --- a/src/src.pro +++ b/src/src.pro @@ -7,7 +7,6 @@ QT += core gui webkit sql network script TARGET = qupzilla TEMPLATE = app -VERSION = 1.00.rc1 DESTDIR = ../bin OBJECTS_DIR = ../build diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp index c878d665d..0bce7fa81 100644 --- a/src/webview/webpage.cpp +++ b/src/webview/webpage.cpp @@ -56,6 +56,7 @@ WebPage::WebPage(WebView* parent, QupZilla* mainClass) connect(m_view, SIGNAL(urlChanged(QUrl)), this, SLOT(urlChanged(QUrl))); connect(mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(addJavaScriptObject())); + connect(this, SIGNAL(printRequested(QWebFrame*)), this, SLOT(printFrame(QWebFrame*))); m_runningLoop = 0; } @@ -126,6 +127,11 @@ void WebPage::watchedFileChanged(const QString &file) } } +void WebPage::printFrame(QWebFrame *frame) +{ + p_QupZilla->printPage(frame); +} + //void WebPage::loadingStarted() //{ // m_adBlockedEntries.clear(); diff --git a/src/webview/webpage.h b/src/webview/webpage.h index 75ed3388e..4a6720da3 100644 --- a/src/webview/webpage.h +++ b/src/webview/webpage.h @@ -88,6 +88,7 @@ private slots: void addJavaScriptObject(); void watchedFileChanged(const QString &file); + void printFrame(QWebFrame* frame); private: virtual bool supportsExtension(Extension extension) const { return (extension == ErrorPageExtension); }