%1

From 170d0b123f2133c3a17ee4e53f5c3e1b9c905a7c Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 16 Dec 2009 03:02:51 +0100 Subject: notfound.html --> rekonqinfo.html cleanups --- src/data/CMakeLists.txt | 2 +- src/data/notfound.html | 63 ------------------------------------------------ src/data/rekonqinfo.html | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ src/protocolhandler.cpp | 6 ++--- src/webpage.cpp | 5 ++-- 5 files changed, 69 insertions(+), 70 deletions(-) delete mode 100644 src/data/notfound.html create mode 100644 src/data/rekonqinfo.html diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt index bf01a44d..0af92f5e 100644 --- a/src/data/CMakeLists.txt +++ b/src/data/CMakeLists.txt @@ -14,6 +14,6 @@ INSTALL( ) INSTALL( - FILES notfound.html home.html + FILES rekonqinfo.html home.html DESTINATION ${DATA_INSTALL_DIR}/rekonq/htmls ) diff --git a/src/data/notfound.html b/src/data/notfound.html deleted file mode 100644 index e347f53a..00000000 --- a/src/data/notfound.html +++ /dev/null @@ -1,63 +0,0 @@ - - - -%1 - - - - - - -

- - - diff --git a/src/data/rekonqinfo.html b/src/data/rekonqinfo.html new file mode 100644 index 00000000..e347f53a --- /dev/null +++ b/src/data/rekonqinfo.html @@ -0,0 +1,63 @@ + + + +%1 + + + + + + +

+ + + diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp index a9b14b6f..c66af403 100644 --- a/src/protocolhandler.cpp +++ b/src/protocolhandler.cpp @@ -136,9 +136,9 @@ QString ProtocolHandler::dirHandling(const KUrl &url) return errStr; } - // display "not found" page - QString notfoundFilePath = KStandardDirs::locate("data", "rekonq/htmls/notfound.html"); - QFile file(notfoundFilePath); + // display "rekonq info" page + QString infoFilePath = KStandardDirs::locate("data", "rekonq/htmls/rekonqinfo.html"); + QFile file(infoFilePath); bool isOpened = file.open(QIODevice::ReadOnly); if (!isOpened) diff --git a/src/webpage.cpp b/src/webpage.cpp index 1890e74c..1bc8c1c1 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -213,14 +213,13 @@ void WebPage::manageNetworkErrors(QNetworkReply* reply) QString WebPage::errorPage(QNetworkReply *reply) { // display "not found" page - QString notfoundFilePath = KStandardDirs::locate("data", "rekonq/htmls/notfound.html"); + QString notfoundFilePath = KStandardDirs::locate("data", "rekonq/htmls/rekonqinfo.html"); QFile file(notfoundFilePath); bool isOpened = file.open(QIODevice::ReadOnly); if (!isOpened) { - kWarning() << "Couldn't open the notfound.html file"; - return QString(""); + return QString("Couldn't open the rekonqinfo.html file"); } QString title = i18n("Error loading: %1", reply->url().path()); -- cgit v1.2.1