summaryrefslogtreecommitdiff
path: root/kwebapp/webpage.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-06-05 09:30:27 +0200
committerAndrea Diamantini <adjam7@gmail.com>2012-06-08 00:39:46 +0200
commit39aff7ccefc90164390a97164419c0610ee0f360 (patch)
tree5180c7b16309bdd829f86135dd5db336c0214898 /kwebapp/webpage.cpp
parentRestore previous Referer management (diff)
downloadrekonq-39aff7ccefc90164390a97164419c0610ee0f360.tar.xz
kwebapp improvements
- added password widget - improved contextual menus - added rekonq statusbar messages There are a lot of changes here, but they are quite safe as the code is somewhat duplicated by the original classes in rekonq I know the situation is suboptimal, but we need to wait for next development period to properly fix it
Diffstat (limited to 'kwebapp/webpage.cpp')
-rw-r--r--kwebapp/webpage.cpp61
1 files changed, 33 insertions, 28 deletions
diff --git a/kwebapp/webpage.cpp b/kwebapp/webpage.cpp
index f1f3c38d..cdca10bd 100644
--- a/kwebapp/webpage.cpp
+++ b/kwebapp/webpage.cpp
@@ -1,23 +1,27 @@
-/*
- * This file is part of the KDE project.
- * Copyright (C) 2011 by Andrea Diamantini <adjam7@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) version 3, or any
- * later version accepted by the membership of KDE e.V. (or its
- * successor approved by the membership of KDE e.V.), which shall
- * act as a proxy defined in Section 6 of version 3 of the license.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
// Self Includes
@@ -33,21 +37,22 @@
WebPage::WebPage(QObject *parent)
: KWebPage(parent)
- , _selfLoading(false)
+ , _selfLoading(true)
{
connect(this, SIGNAL(loadFinished(bool)), this, SLOT(disableSelfLoading()));
+
+ connect(this, SIGNAL(unsupportedContent(QNetworkReply*)), this, SLOT(downloadResponse(QNetworkReply*)));
+ connect(this, SIGNAL(downloadRequested(QNetworkRequest)), this, SLOT(downloadRequest(QNetworkRequest)));
}
bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type)
{
- if (_selfLoading)
- {
- return KWebPage::acceptNavigationRequest(frame, request, type);
- }
-
- (void)new KRun(request.url(), view(), 0);
- return false;
+ return KWebPage::acceptNavigationRequest(frame, request, type);
+
+ // FIXME
+// (void)new KRun(request.url(), view(), 0);
+// return false;
}