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 d8de8c80e..000000000 Binary files a/src/data/icons/lineedit.psd and /dev/null differ 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); }