diff --git a/bin/locale/cs_CZ.qm b/bin/locale/cs_CZ.qm index 70786de99..7ca94bd49 100644 Binary files a/bin/locale/cs_CZ.qm and b/bin/locale/cs_CZ.qm differ diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp index bdc85852a..821cd7084 100644 --- a/src/app/qupzilla.cpp +++ b/src/app/qupzilla.cpp @@ -625,8 +625,8 @@ void QupZilla::aboutToShowHelpMenu() m_menuHelp->addAction(QIcon(":/icons/menu/qt.png"), tr("About &Qt"), qApp, SLOT(aboutQt())); m_menuHelp->addAction(QIcon(":/icons/qupzilla.png"), tr("&About QupZilla"), this, SLOT(aboutQupZilla())); m_menuHelp->addSeparator(); - m_menuHelp->addAction(QIcon(":/icons/menu/informations.png"), tr("Informations about application"), this, SLOT(loadActionUrl()))->setData(QUrl("qupzilla:about")); - m_menuHelp->addAction(tr("Report &Bug"), this, SLOT(reportBug())); + m_menuHelp->addAction(QIcon(":/icons/menu/informations.png"), tr("Informations about application"), this, SLOT(loadActionUrlInNewTab()))->setData(QUrl("qupzilla:about")); + m_menuHelp->addAction(tr("Report &Issue"), this, SLOT(loadActionUrlInNewTab()))->setData(QUrl("qupzilla:reportbug")); } void QupZilla::aboutToShowToolsMenu() @@ -757,6 +757,13 @@ void QupZilla::loadActionUrl() } } +void QupZilla::loadActionUrlInNewTab() +{ + if (QAction* action = qobject_cast(sender())) { + m_tabWidget->addView(action->data().toUrl()); + } +} + void QupZilla::loadAddress(const QUrl &url) { weView()->load(url); diff --git a/src/app/qupzilla.h b/src/app/qupzilla.h index f7a3561f3..c902d7a6d 100644 --- a/src/app/qupzilla.h +++ b/src/app/qupzilla.h @@ -124,6 +124,7 @@ public slots: void showBookmarksToolbar(); void loadActionUrl(); + void loadActionUrlInNewTab(); void bookmarkPage(); void loadAddress(const QUrl &url); void showSource(const QString& selectedHtml = ""); diff --git a/src/data/html.qrc b/src/data/html.qrc index 3fa3eb42c..abdd9026e 100644 --- a/src/data/html.qrc +++ b/src/data/html.qrc @@ -7,5 +7,6 @@ html/about.html html/box-border.png html/copyright + html/reportbug.html diff --git a/src/data/html/reportbug.html b/src/data/html/reportbug.html new file mode 100644 index 000000000..a7bcfdca1 --- /dev/null +++ b/src/data/html/reportbug.html @@ -0,0 +1,87 @@ + +%TITLE% + + + + + +
+ +

%REPORT-ISSUE%

+

%PLUGINS-TEXT%

+ +

+ + + + + + + + +
%EMAIL%*:
%TYPE%:
%PRIORITY%:
%DESCRIPTION%:
+

+

* %E-MAIL-OPTIONAL%

+ +
+ diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index eafcc23c2..5363a4a1e 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -28,7 +28,7 @@ QupZillaSchemeReply::QupZillaSchemeReply(const QNetworkRequest &req, QObject *pa setUrl(req.url()); m_pageName = req.url().path(); - if (m_pageName == "about") { + if (m_pageName == "about" || m_pageName == "reportbug") { m_buffer.open(QIODevice::ReadWrite); setError(QNetworkReply::NoError, tr("No Error")); @@ -39,12 +39,14 @@ QupZillaSchemeReply::QupZillaSchemeReply(const QNetworkRequest &req, QObject *pa QTimer::singleShot(0, this, SLOT(delayedFinish())); } } -#include + void QupZillaSchemeReply::loadPage() { QTextStream stream(&m_buffer); if (m_pageName == "about") stream << aboutPage(); + else if (m_pageName == "reportbug") + stream << reportbugPage(); stream.flush(); m_buffer.reset(); @@ -76,6 +78,30 @@ qint64 QupZillaSchemeReply::readData(char *data, qint64 maxSize) return m_buffer.read(data, maxSize); } +QString QupZillaSchemeReply::reportbugPage() +{ + QString page; + page.append(qz_readAllFileContents(":html/reportbug.html")); + page.replace("%FAVICON%", qz_pixmapToByteArray(QPixmap(":icons/qupzilla.png"))); + page.replace("%BOX-BORDER%", qz_pixmapToByteArray(QPixmap(":html/box-border.png"))); + + page.replace("%TITLE%", tr("Report issue")); + page.replace("%REPORT-ISSUE%", tr("Report issue")); + page.replace("%PLUGINS-TEXT%", tr("If You are experiencing problems with QupZilla, please try first disable" + " all plugins.
If it won't help, then please fill this form: ")); + page.replace("%EMAIL%", tr("Your E-mail")); + page.replace("%TYPE%", tr("Issue type")); + page.replace("%PRIORITY%", tr("Priority")); + page.replace("%LOW%", tr("Low")); + page.replace("%NORMAL%", tr("Normal")); + page.replace("%HIGH%", tr("High")); + page.replace("%DESCRIPTION%", tr("Issue description")); + page.replace("%SEND%", tr("Send")); + page.replace("%E-MAIL-OPTIONAL%", tr("E-mail is optional")); + page.replace("%FIELDS-ARE-REQUIRED%", tr("Please fill all required fields!")); + return page; +} + QString QupZillaSchemeReply::aboutPage() { QString page; diff --git a/src/network/qupzillaschemehandler.h b/src/network/qupzillaschemehandler.h index 0c3d49559..f69bfa89f 100644 --- a/src/network/qupzillaschemehandler.h +++ b/src/network/qupzillaschemehandler.h @@ -40,6 +40,7 @@ private slots: private: QString aboutPage(); + QString reportbugPage(); QBuffer m_buffer; QString m_pageName; diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index c0ee5310a..1afc9c65e 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -2529,11 +2529,6 @@ nebyl nalezen! Clear list Vyčistit seznam - - - Report &Bug - Nahlásit &bug - About &Qt @@ -2549,6 +2544,11 @@ nebyl nalezen! Informations about application Informace o aplikaci + + + Report &Issue + Nahlásit &problém + &Web Search @@ -2646,86 +2646,147 @@ nebyl nalezen! + Report issue + Nahlásit problém + + + + If You are experiencing problems with QupZilla, please try first disable all plugins. <br/>If it won't help, then please fill this form: + Pokud máte problém s používáním QupZilly, zakažte prosím všechny doplňky. <br/> Pokud problém přetrvává, vyplňte tento formulář: + + + + Your E-mail + Váš e-mail + + + + Issue type + Typ problému + + + + Priority + Priorita + + + + Low + Nízká + + + + Normal + Normální + + + + High + Vysoká + + + + Issue description + Popis problému + + + + Send + Odeslat + + + + E-mail is optional + e-mail je nepovinný + + + + Please fill all required fields! + Vyplňte prosím všechna povinná pole! + + + + About QupZilla O QupZille - + Informations about version Informace o verzi - + Browser Identification Identifikace prohlížeče - + Paths Cesty - + Copyright Copyright - + Linux Linux - + Windows Windows - + Version Verze - + WebKit version Verze WebKitu - + Build time Sestaveno - + Platform Platforma - + Settings Nastavení - + Saved session Uložené relace - + Pinned tabs Připíchnuté panely - + Themes Témata - + Plugins Doplňky - + Translations Překlady diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index 8d77ddd77..018feff8c 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -2530,11 +2530,6 @@ p, li { white-space: pre-wrap; } Clear list Vyčistiť list - - - Report &Bug - Nahlásiť &chybu - About &Qt @@ -2550,6 +2545,11 @@ p, li { white-space: pre-wrap; } Informations about application + + + Report &Issue + + &Web Search @@ -2647,86 +2647,147 @@ p, li { white-space: pre-wrap; } - About QupZilla - O QupZille - - - - Informations about version + Report issue - - Browser Identification + + If You are experiencing problems with QupZilla, please try first disable all plugins. <br/>If it won't help, then please fill this form: - Paths + Your E-mail - Copyright + Issue type + + + + + Priority + + + + + Low + + + + + Normal - Linux + High + + + + + Issue description + + + + + Send + E-mail is optional + + + + + Please fill all required fields! + + + + + + About QupZilla + O QupZille + + + + Informations about version + + + + + Browser Identification + + + + + Paths + + + + + Copyright + + + + + Linux + + + + Windows - + Version - + WebKit version - + Build time - + Platform - + Settings Nastavenia - + Saved session - + Pinned tabs - + Themes Témy - + Plugins Doplnky - + Translations