From 235473cac883a5f1192ca83f0f2102d69a7ca229 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 14 Oct 2009 21:25:34 +0200 Subject: we are using KDE proxy settings (via KIO) So we no more need our dialogs and error retrieving :) --- src/CMakeLists.txt | 2 - src/mainwindow.cpp | 1 - src/networkaccessmanager.cpp | 135 ------------------------------------------- src/networkaccessmanager.h | 11 ---- src/password.ui | 66 --------------------- src/proxy.ui | 59 ------------------- 6 files changed, 274 deletions(-) delete mode 100644 src/password.ui delete mode 100644 src/proxy.ui diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8b7e6f78..daae3f44 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,8 +30,6 @@ SET( rekonq_SRCS KDE4_ADD_UI_FILES( rekonq_SRCS - password.ui - proxy.ui settings_general.ui settings_fonts.ui settings_webkit.ui diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index c0008cba..69831f97 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -494,7 +494,6 @@ void MainWindow::slotUpdateConfiguration() defaultSettings->setUserStyleSheetUrl(ReKonfig::userCSS()); // ====== load Settings on main classes - Application::networkAccessManager()->loadSettings(); Application::historyManager()->loadSettings(); } diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index 1cdc6700..38f4c8c4 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -35,78 +35,21 @@ // Auto Includes #include "rekonq.h" -// Ui Includes -#include "ui_password.h" -#include "ui_proxy.h" - // KDE Includes -#include #include -#include // Qt Includes -#include -#include - -#include -#include - -#include #include NetworkAccessManager::NetworkAccessManager(QObject *parent) : AccessManager(parent) { - connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), - SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*))); - connect(this, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)), - SLOT(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*))); - -#ifndef QT_NO_OPENSSL - connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList&)), - SLOT(slotSSLErrors(QNetworkReply*, const QList&))); -#endif - - // load AccessManager Settings - loadSettings(); - // resetting disk cache resetDiskCache(); } -void NetworkAccessManager::loadSettings() -{ - // Grab proxy settings from KDE settings - if (KProtocolManager::useProxy()) - { - QString proxyAddress = KProtocolManager::proxyFor("http"); - - if(!proxyAddress.isEmpty()) - { - KUrl proxyUrl(proxyAddress); - QNetworkProxy::ProxyType proxyType = QNetworkProxy::NoProxy; - - // See what kind of proxy we have here - if(proxyUrl.protocol() == "socks") - { - proxyType = QNetworkProxy::Socks5Proxy; - } - else - { - proxyType = QNetworkProxy::HttpProxy; - } - - QNetworkProxy proxy(proxyType, proxyUrl.host(), (quint16)proxyUrl.port(), - proxyUrl.user(), proxyUrl.pass()); - - setProxy(proxy); - } - } -} - - void NetworkAccessManager::resetDiskCache() { if(!cache()) @@ -119,81 +62,3 @@ void NetworkAccessManager::resetDiskCache() cache()->clear(); } } - - -void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *auth) -{ - MainWindow *mainWindow = Application::instance()->mainWindow(); - - QPointer dialog = new KDialog(mainWindow, Qt::Sheet); - dialog->setButtons(KDialog::Ok | KDialog::Cancel); - - Ui::passwordWidget passwordWidget; - QWidget widget; - passwordWidget.setupUi(&widget); - - dialog->setMainWidget(&widget); - - passwordWidget.iconLabel->setText(QString()); - passwordWidget.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32)); - //FIXME Replace the text below with an explanation of what exactly %1 and %2 mean - QString introMessage = i18nc("%1=stuff %2=stuff2", "Enter username and password for %1 at %2", - Qt::escape(reply->url().toString()), - Qt::escape(reply->url().toString()) ); - passwordWidget.introLabel->setText(introMessage); - passwordWidget.introLabel->setWordWrap(true); - - if (dialog->exec() == KDialog::Ok) - { - auth->setUser(passwordWidget.userNameLineEdit->text()); - auth->setPassword(passwordWidget.passwordLineEdit->text()); - } - dialog->deleteLater(); -} - - -void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth) -{ - MainWindow *mainWindow = Application::instance()->mainWindow(); - - QPointer dialog = new KDialog(mainWindow, Qt::Sheet); - dialog->setButtons(KDialog::Ok | KDialog::Cancel); - - Ui::proxyWidget proxyWdg; - QWidget widget; - proxyWdg.setupUi(&widget); - - dialog->setMainWidget(&widget); - - proxyWdg.iconLabel->setText(QString()); - proxyWdg.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32)); - //FIXME Connect to proxy %1 using what? Best solution would be adding a %2 after the "using:" part and explain %1 and %2 in an i18nc call - QString introMessage = i18n("Connect to proxy %1 using:", Qt::escape(proxy.hostName()) ); - proxyWdg.introLabel->setText(introMessage); - proxyWdg.introLabel->setWordWrap(true); - - if (dialog->exec() == KDialog::Ok) - { - auth->setUser(proxyWdg.userNameLineEdit->text()); - auth->setPassword(proxyWdg.passwordLineEdit->text()); - } - dialog->deleteLater(); -} - - -#ifndef QT_NO_OPENSSL -void NetworkAccessManager::slotSSLErrors(QNetworkReply *reply, const QList &error) -{ - MainWindow *mainWindow = Application::instance()->mainWindow(); - - QStringList errorStrings; - for (int i = 0; i < error.count(); ++i) - errorStrings += error.at(i).errorString(); - QString errors = errorStrings.join(QLatin1String("\n")); - int ret = KMessageBox::warningContinueCancel(mainWindow, - i18n("SSL Errors:\n\n") + reply->url().toString() + "\n\n" + QString(errors) + "\n\n"); - - if (ret == KMessageBox::Yes) - reply->ignoreSslErrors(); -} -#endif diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h index cfe98806..6cade7fe 100644 --- a/src/networkaccessmanager.h +++ b/src/networkaccessmanager.h @@ -42,17 +42,6 @@ class NetworkAccessManager : public AccessManager public: NetworkAccessManager(QObject *parent = 0); void resetDiskCache(); - -public slots: - void loadSettings(); - -private slots: - void authenticationRequired(QNetworkReply *reply, QAuthenticator *auth); - void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth); - -#ifndef QT_NO_OPENSSL - void slotSSLErrors(QNetworkReply *reply, const QList &error); -#endif }; #endif // NETWORKACCESSMANAGER_H diff --git a/src/password.ui b/src/password.ui deleted file mode 100644 index 81d1e321..00000000 --- a/src/password.ui +++ /dev/null @@ -1,66 +0,0 @@ - - - passwordWidget - - - - 0 - 0 - 343 - 193 - - - - - - - - - DUMMY ICON - - - - - - - - 0 - 0 - - - - INTRO TEXT DUMMY - - - - - - - - - Username: - - - - - - - - - - Password: - - - - - - - QLineEdit::Password - - - - - - - - diff --git a/src/proxy.ui b/src/proxy.ui deleted file mode 100644 index 4e64f357..00000000 --- a/src/proxy.ui +++ /dev/null @@ -1,59 +0,0 @@ - - - proxyWidget - - - - 0 - 0 - 264 - 153 - - - - - - - ICON - - - - - - - Connect to proxy - - - true - - - - - - - Username: - - - - - - - - - - Password: - - - - - - - QLineEdit::Password - - - - - - - - -- cgit v1.2.1