diff --git a/src/other/aboutdialog.cpp b/src/other/aboutdialog.cpp
index 52caeaf25..2bf6ebda1 100644
--- a/src/other/aboutdialog.cpp
+++ b/src/other/aboutdialog.cpp
@@ -22,6 +22,8 @@
#include "webpage.h"
#include "qtwin.h"
+#include "pagethumbnailer.h"
+
AboutDialog::AboutDialog(QWidget* parent) :
QDialog(parent),
ui(new Ui::AboutDialog)
@@ -38,6 +40,10 @@ AboutDialog::AboutDialog(QWidget* parent) :
connect(ui->authorsButton, SIGNAL(clicked()), this, SLOT(buttonClicked()));
showAbout();
+
+ PageThumbnailer* p = new PageThumbnailer(this);
+ p->setUrl(QUrl("http://qupzilla.co.cc"));
+ p->start();
}
void AboutDialog::buttonClicked()
diff --git a/src/tools/pagethumbnailer.cpp b/src/tools/pagethumbnailer.cpp
index 56dc0ba3b..ca28069a2 100644
--- a/src/tools/pagethumbnailer.cpp
+++ b/src/tools/pagethumbnailer.cpp
@@ -19,22 +19,23 @@ QObject* CleanPluginFactory::create(const QString &mimeType, const QUrl &url, co
Q_UNUSED(argumentNames)
Q_UNUSED(argumentValues)
- return 0;
+ return new QObject;
}
PageThumbnailer::PageThumbnailer(QObject* parent)
: QObject(parent)
, m_page(new QWebPage(this))
- , m_size(QSize(210, 130))
+ , m_size(QSize(231, 130))
{
NetworkManagerProxy* m_networkProxy = new NetworkManagerProxy();
m_networkProxy->setPrimaryNetworkAccessManager(mApp->networkManager());
m_page->setNetworkAccessManager(m_networkProxy);
- m_page->setPluginFactory(new CleanPluginFactory);
-
m_page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
m_page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
+
+ // HD Ready :-D
+ // Every page should fit in this resolution
m_page->setViewportSize(QSize(1280, 720));
}
@@ -52,6 +53,13 @@ void PageThumbnailer::setUrl(const QUrl &url)
}
}
+void PageThumbnailer::setEnableFlash(bool enable)
+{
+ if (!enable) {
+ m_page->setPluginFactory(new CleanPluginFactory);
+ }
+}
+
void PageThumbnailer::start()
{
if (!m_page) {
@@ -74,6 +82,8 @@ void PageThumbnailer::createThumbnail()
emit thumbnailCreated(QPixmap::fromImage(scaledImage));
+ QPixmap::fromImage(scaledImage).save("/home/david/pic.png");
+
delete m_page;
m_page = 0;
}
diff --git a/src/tools/pagethumbnailer.h b/src/tools/pagethumbnailer.h
index a5d2c4b7c..d4ce3e70b 100644
--- a/src/tools/pagethumbnailer.h
+++ b/src/tools/pagethumbnailer.h
@@ -25,6 +25,7 @@ public:
void setSize(const QSize &size);
void setUrl(const QUrl &url);
+ void setEnableFlash(bool enable);
void start();
diff --git a/src/webview/webview.cpp b/src/webview/webview.cpp
index 4181b5211..851796760 100644
--- a/src/webview/webview.cpp
+++ b/src/webview/webview.cpp
@@ -55,7 +55,7 @@ WebView::WebView(QupZilla* mainClass, WebTab* webTab)
, m_rssChecked(false)
// , m_loadingTimer(0)
{
- m_networkProxy = new NetworkManagerProxy(this);
+ m_networkProxy = new NetworkManagerProxy(p_QupZilla);
m_networkProxy->setPrimaryNetworkAccessManager(mApp->networkManager());
m_networkProxy->setPage(m_page) ;
m_networkProxy->setView(this);
diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts
index 485ac4fe3..291c06cb8 100644
--- a/translations/cs_CZ.ts
+++ b/translations/cs_CZ.ts
@@ -14,49 +14,49 @@
Autoři
-
-
+
+
Authors and Contributors
Autoři a Spolupracovníci
-
-
+
+
< About QupZilla
< O QupZille
-
+
<p><b>Application version %1</b><br/>
<p><b>Verze aplikace %1</b><br/>
-
+
<b>WebKit version %1</b></p>
<b>Verze WebKitu %1</b></p>
-
+
<p>© %1 %2<br/>All rights reserved.<br/>
<p>© %1 %2<br/>Všechna práva vyhrazena.<br/>
-
+
<small>Build time: %1 </small></p>
<small>Datum sestavení: %1</small></p>
-
+
<p><b>Main developers:</b><br/>%1 <%2></p>
<p><b>Hlavní vývojáři:</b><br/>%1 <%2></p>
-
+
<p><b>Contributors:</b><br/>%1</p>
<p><b>Přispěvatelé</b><br/>%1</p>
-
+
<p><b>Translators:</b><br/>%1</p>
<p><b>Překladatelé</b><br/>%1</p>
@@ -1707,10 +1707,6 @@ nebyl nalezen!
SSL Certificate Error!
Chyba zabezpečení!
-
- The page you trying to access has following errors in SSL Certificate:
- Stránka kterou se snažíte navštívit zaslala SSL Certifikát s těmito chybami:
-
<b>Organization: </b>
@@ -1731,10 +1727,6 @@ nebyl nalezen!
<b>Error: </b>
<b>Chyba: </b>
-
- Would you like to make exception for this certificate?
- Chcete udělit vyjímku tomuto certifikátu?
-
The page you are trying to access has the following errors in the SSL certificate:
diff --git a/translations/de_DE.ts b/translations/de_DE.ts
index 8fb33dfaa..43626bc92 100644
--- a/translations/de_DE.ts
+++ b/translations/de_DE.ts
@@ -14,49 +14,49 @@
Autoren
-
-
+
+
Authors and Contributors
Autoren und Mitwirkende
-
-
+
+
< About QupZilla
< Über QupZilla
-
+
<p><b>Application version %1</b><br/>
<p><b>QupZilla Version: %1</b><br/>
-
+
<b>WebKit version %1</b></p>
<b>WebKit Version: %1</b></p>
-
+
<p>© %1 %2<br/>All rights reserved.<br/>
<p>© %1 %2<br/>Alle Rechte vorbehalten.<br/>
-
+
<small>Build time: %1 </small></p>
<small>Kompiliert am: %1 </small></p>
-
+
<p><b>Main developers:</b><br/>%1 <%2></p>
<p><b>Hauptentwickler:</b><br/>%1 <%2></p>
-
+
<p><b>Contributors:</b><br/>%1</p>
<p><b>Mitwirkende:</b><br/>%1</p>
-
+
<p><b>Translators:</b><br/>%1</p>
<p><b>Übersetzer:</b><br/>%1</p>
@@ -1707,10 +1707,6 @@
SSL Certificate Error!
SSL Zertifikatsfehler!
-
- The page you trying to access has following errors in SSL Certificate:
- Beim Laden dieser Seite sind folgende SSL Zertifikatsfehler aufgetreten::
-
<b>Organization: </b>
@@ -1731,10 +1727,6 @@
<b>Error: </b>
<b>Fehler: </b>
-
- Would you like to make exception for this certificate?
- Möchten Sie eine Ausnahme für dieses Zertifkat zulassen?
-
The page you are trying to access has the following errors in the SSL certificate:
diff --git a/translations/es.ts b/translations/es.ts
index 996629005..48366863b 100644
--- a/translations/es.ts
+++ b/translations/es.ts
@@ -14,49 +14,49 @@
Autores
-
-
+
+
Authors and Contributors
Autores y contribuidores
-
-
+
+
< About QupZilla
< Acerca de QupZilla
-
+
<p><b>Application version %1</b><br/>
<p><b>Versión de la aplicación %1</b><br/>
-
+
<b>WebKit version %1</b></p>
<b>Versión WebKit %1</b></p>
-
+
<p>© %1 %2<br/>All rights reserved.<br/>
<p>© %1 %2<br/>Todos los derechos reservados.<br/>
-
+
<small>Build time: %1 </small></p>
<small>Fecha de compilación: %1 </small></p>
-
+
<p><b>Main developers:</b><br/>%1 <%2></p>
<p><b>Desarrolladores principales:</b><br/>%1 <%2></p>
-
+
<p><b>Contributors:</b><br/>%1</p>
<p><b>Contribuidores:</b><br/>%1</p>
-
+
<p><b>Translators:</b><br/>%1</p>
<p><b>Traductores:</b><br/>%1</p>
@@ -1706,10 +1706,6 @@
SSL Certificate Error!
¡Error del certificad SSL!
-
- The page you trying to access has following errors in SSL Certificate:
- La página a la que intenta acceder tiene los siguientes errores en el certificado SSL:
-
<b>Organization: </b>
@@ -1730,10 +1726,6 @@
<b>Error: </b>
<b>Error: </b>
-
- Would you like to make exception for this certificate?
- ¿Le gustaría hacer una excepción para este certificado?
-
The page you are trying to access has the following errors in the SSL certificate:
diff --git a/translations/it_IT.ts b/translations/it_IT.ts
index 402b79001..66ce04673 100644
--- a/translations/it_IT.ts
+++ b/translations/it_IT.ts
@@ -14,49 +14,49 @@
Autori
-
-
+
+
Authors and Contributors
Autori e Collaboratori
-
-
+
+
< About QupZilla
< A proposito di QupZilla
-
+
<p><b>Application version %1</b><br/>
<p><b>Versione dell'applicazione %1</b><br/>
-
+
<b>WebKit version %1</b></p>
<b>Versione di WebKit %1</b></p>
-
+
<p>© %1 %2<br/>All rights reserved.<br/>
<p>© %1 %2<br/>Tutti i diritti riservati.<br/>
-
+
<small>Build time: %1 </small></p>
<small>Data della build: %1 </small></p>
-
+
<p><b>Main developers:</b><br/>%1 <%2></p>
<p><b>Sviluppatori principali:</b><br/>%1 <%2></p>
-
+
<p><b>Contributors:</b><br/>%1</p>
<p><b>Collaboratori:</b><br/>%1</p>
-
+
<p><b>Translators:</b><br/>%1</p>
<p><b>Traduttori:</b><br/>%1</p>
@@ -1706,10 +1706,6 @@
SSL Certificate Error!
Errore Certificato SSL!
-
- The page you trying to access has following errors in SSL Certificate:
- La pagina a cui si tenta di accedere ha i seguenti errori nei certificati SSL:
-
<b>Organization: </b>
@@ -1730,10 +1726,6 @@
<b>Error: </b>
<b>Errore: </b>
-
- Would you like to make exception for this certificate?
- Vuoi fare un'eccezione per questo certificato?
-
The page you are trying to access has the following errors in the SSL certificate:
diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts
index af8e23fe5..d388bdf0f 100644
--- a/translations/nl_NL.ts
+++ b/translations/nl_NL.ts
@@ -14,49 +14,49 @@
Auteurs
-
-
+
+
Authors and Contributors
Auteurs en bijdragers
-
-
+
+
< About QupZilla
< Over QupZilla
-
+
<p><b>Application version %1</b><br/>
<p><b>Programma-versie %1</b><br/>
-
+
<b>WebKit version %1</b></p>
<b>WebKit-versie %1</b></p>
-
+
<p>© %1 %2<br/>All rights reserved.<br/>
<p>© %1 %2<br/>Alle rechten voorbehouden.<br/>
-
+
<small>Build time: %1 </small></p>
<small>Bouwtijd: %1</small></p>
-
+
<p><b>Main developers:</b><br/>%1 <%2></p>
<p><b>Hoofdontwikkelaars:</b><br/>%1 <%2></p>
-
+
<p><b>Contributors:</b><br/>%1</p>
<p><b>Bijdragers</b><br/>%1</p>
-
+
<p><b>Translators:</b><br/>%1</p>
<p><b>Vertalers:</b><br/>%1</p>
@@ -1707,10 +1707,6 @@ werd niet gevonden!
SSL Certificate Error!
SSL-certificaatfout!
-
- The page you trying to access has following errors in SSL Certificate:
- De pagina die u probeert te bereiken bevat de volgende fouten in SSL-certificaat:
-
<b>Organization: </b>
@@ -1731,10 +1727,6 @@ werd niet gevonden!
<b>Error: </b>
<b>Fout: </b>
-
- Would you like to make exception for this certificate?
- Wilt u een uitzondering maken voor dit certificaat?
-
The page you are trying to access has the following errors in the SSL certificate:
diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts
index 263bdd125..575162871 100644
--- a/translations/sk_SK.ts
+++ b/translations/sk_SK.ts
@@ -14,49 +14,49 @@
Autori
-
-
+
+
Authors and Contributors
Autori a prispievatelia
-
-
+
+
< About QupZilla
< O QupZille
-
+
<p><b>Application version %1</b><br/>
<p><b>Verzia programu %1</b><br/>
-
+
<b>WebKit version %1</b></p>
<b>Verzia WebKitu %1</b></p>
-
+
<p>© %1 %2<br/>All rights reserved.<br/>
<p>© %1 %2<br/>Všetky práva vyhradené.<br/>
-
+
<small>Build time: %1 </small></p>
<small>Dátum zostavenia: %1 </small></p>
-
+
<p><b>Main developers:</b><br/>%1 <%2></p>
<p><b>Hlavní vývojári:</b><br/>%1 <%2></p>
-
+
<p><b>Contributors:</b><br/>%1</p>
<p><b>Prispievatelia:</b><br/>%1</p>
-
+
<p><b>Translators:</b><br/>%1</p>
<p><b>Prekladatelia:</b><br/>%1</p>
@@ -236,7 +236,7 @@
Username
-
+ Užívateľ
@@ -280,7 +280,7 @@
Hide Passwords
-
+ Skryť heslá
@@ -308,7 +308,7 @@
Do you want QupZilla to remember password for <b>%1</b> on %2?
-
+ Chcete, aby si QupZilla zapamätala heslo pre <b>%1</b> na %2?
@@ -1122,7 +1122,7 @@
Native System Notification
-
+ Nativné systémové oznámenie
@@ -1706,10 +1706,6 @@
SSL Certificate Error!
Chyba SSL certifikátu!
-
- The page you trying to access has following errors in SSL Certificate:
- Stránka na ktorú sa pokušáte pristúpiť má nasledujúce chyby v SSL certifikáte:
-
<b>Organization: </b>
@@ -1730,19 +1726,15 @@
<b>Error: </b>
<b>Chyba: </b>
-
- Would you like to make exception for this certificate?
- Chcete urobiť vynímku pre tento certifikát?
-
The page you are trying to access has the following errors in the SSL certificate:
-
+ Stránka, ktorú sa snažíte zobraziť obsahuje nasledujúce chyby v SSL certifikáte:
Would you like to make an exception for this certificate?
-
+ Chcete prideliť výnimku tomuto certifikátu?
diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
index f83e37cf3..4f7576e13 100644
--- a/translations/zh_CN.ts
+++ b/translations/zh_CN.ts
@@ -14,49 +14,49 @@
作者
-
-
+
+
Authors and Contributors
作者及贡献者
-
-
+
+
< About QupZilla
关于作者
-
+
<p><b>Application version %1</b><br/>
程序版本 %1
-
+
<b>WebKit version %1</b></p>
Webkit版本 %1
-
+
<p>© %1 %2<br/>All rights reserved.<br/>
-
+
<small>Build time: %1 </small></p>
-
+
<p><b>Main developers:</b><br/>%1 <%2></p>
-
+
<p><b>Contributors:</b><br/>%1</p>
贡献人员 %1
-
+
<p><b>Translators:</b><br/>%1</p>
翻译人员 %1
@@ -1704,10 +1704,6 @@
SSL Certificate Error!
SSL证书错误!
-
- The page you trying to access has following errors in SSL Certificate:
- 您试图访问的页面有以下SSL证书中的错误:
-
<b>Organization: </b>
@@ -1728,10 +1724,6 @@
<b>Error: </b>
<b>错误：</b>
-
- Would you like to make exception for this certificate?
- 你想使这个证书的例外?
-
The page you are trying to access has the following errors in the SSL certificate: