From d2d0594c633e54833ab6a566d374a94ba0fa4c92 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Fri, 16 Feb 2018 14:44:32 +0100 Subject: [PATCH] FalkonSchemeHandler: Redirect falkon:reportbug to KDE bugzilla --- src/lib/data/html.qrc | 1 - src/lib/data/html/reportbug.html | 54 ------------------- .../schemehandlers/falkonschemehandler.cpp | 44 ++------------- .../schemehandlers/falkonschemehandler.h | 1 - 4 files changed, 4 insertions(+), 96 deletions(-) delete mode 100644 src/lib/data/html/reportbug.html diff --git a/src/lib/data/html.qrc b/src/lib/data/html.qrc index 881882f00..5d7297f91 100644 --- a/src/lib/data/html.qrc +++ b/src/lib/data/html.qrc @@ -2,7 +2,6 @@ html/about.html html/copyright - html/reportbug.html html/start.html html/speeddial.html html/jquery.js diff --git a/src/lib/data/html/reportbug.html b/src/lib/data/html/reportbug.html deleted file mode 100644 index 7d97bdd08..000000000 --- a/src/lib/data/html/reportbug.html +++ /dev/null @@ -1,54 +0,0 @@ - - -%TITLE% - - - - -
- -

%REPORT-ISSUE%

-

%PLUGINS-TEXT%

- -

- - - - - - - - - - - -
%EMAIL%*:
%TYPE%:
%DESCRIPTION%:
-

-

* %E-MAIL-OPTIONAL%

- -
- diff --git a/src/lib/network/schemehandlers/falkonschemehandler.cpp b/src/lib/network/schemehandlers/falkonschemehandler.cpp index 0925c098c..bb7edd0ff 100644 --- a/src/lib/network/schemehandlers/falkonschemehandler.cpp +++ b/src/lib/network/schemehandlers/falkonschemehandler.cpp @@ -51,7 +51,7 @@ void FalkonSchemeHandler::requestStarted(QWebEngineUrlRequestJob *job) } QStringList knownPages; - knownPages << "about" << "reportbug" << "start" << "speeddial" << "config" << "restore"; + knownPages << "about" << "start" << "speeddial" << "config" << "restore"; if (knownPages.contains(job->requestUrl().path())) job->reply(QByteArrayLiteral("text/html"), new FalkonSchemeReply(job)); @@ -73,6 +73,9 @@ bool FalkonSchemeHandler::handleRequest(QWebEngineUrlRequestJob *job) mApp->destroyRestoreManager(); job->redirect(QUrl(QSL("falkon:start"))); return true; + } else if (job->requestUrl().path() == QL1S("reportbug")) { + job->redirect(QUrl(Qz::BUGSADDRESS)); + return true; } return false; @@ -100,9 +103,6 @@ void FalkonSchemeReply::loadPage() if (m_pageName == QLatin1String("about")) { stream << aboutPage(); } - else if (m_pageName == QLatin1String("reportbug")) { - stream << reportbugPage(); - } else if (m_pageName == QLatin1String("start")) { stream << startPage(); } @@ -140,42 +140,6 @@ qint64 FalkonSchemeReply::writeData(const char *data, qint64 len) return 0; } -QString FalkonSchemeReply::reportbugPage() -{ - static QString bPage; - - if (!bPage.isEmpty()) { - return bPage; - } - - bPage.append(QzTools::readAllFileContents(":html/reportbug.html")); - bPage.replace(QLatin1String("%TITLE%"), tr("Report Issue")); - bPage.replace(QLatin1String("%REPORT-ISSUE%"), tr("Report Issue")); - bPage.replace(QLatin1String("%PLUGINS-TEXT%"), tr("If you are experiencing problems with Falkon, please try to disable" - " all extensions first.
If this does not fix it, then please fill out this form: ")); - bPage.replace(QLatin1String("%EMAIL%"), tr("Your E-mail")); - bPage.replace(QLatin1String("%TYPE%"), tr("Issue type")); - bPage.replace(QLatin1String("%DESCRIPTION%"), tr("Issue description")); - bPage.replace(QLatin1String("%SEND%"), tr("Send")); - bPage.replace(QLatin1String("%E-MAIL-OPTIONAL%"), tr("E-mail is optional
Note: Please read how to make a " - "bug report here first.").arg("https://github.com/QupZilla/qupzilla/wiki/Bug-Reports target=_blank")); - bPage.replace(QLatin1String("%FIELDS-ARE-REQUIRED%"), tr("Please fill out all required fields!")); - - bPage.replace(QLatin1String("%INFO_OS%"), QzTools::operatingSystemLong()); - bPage.replace(QLatin1String("%INFO_APP%"), -#ifdef FALKON_GIT_REVISION - QString("%1 (%2)").arg(Qz::VERSION, FALKON_GIT_REVISION) -#else - Qz::VERSION -#endif - ); - bPage.replace(QLatin1String("%INFO_QT%"), QString("%1 (built with %2)").arg(qVersion(), QT_VERSION_STR)); - bPage.replace(QLatin1String("%INFO_WEBKIT%"), QSL("QtWebEngine")), - bPage = QzTools::applyDirectionToPage(bPage); - - return bPage; -} - QString FalkonSchemeReply::startPage() { static QString sPage; diff --git a/src/lib/network/schemehandlers/falkonschemehandler.h b/src/lib/network/schemehandlers/falkonschemehandler.h index 7d7c7d42a..2ca4131b2 100644 --- a/src/lib/network/schemehandlers/falkonschemehandler.h +++ b/src/lib/network/schemehandlers/falkonschemehandler.h @@ -51,7 +51,6 @@ private slots: private: QString aboutPage(); - QString reportbugPage(); QString startPage(); QString speeddialPage(); QString restorePage();