From 245509053d7fd6427b8d7170ab088917b7fe70f0 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 5 Apr 2009 18:13:13 +0200 Subject: Ported Authentication Ui to Kdialog shining.. ;) --- src/CMakeLists.txt | 2 +- src/mainwindow.cpp | 3 -- src/networkaccessmanager.cpp | 44 +++++++++-------- src/password.ui | 69 +++++++++++++++++++++++++++ src/passworddialog.ui | 111 ------------------------------------------- src/proxy.ui | 100 +++++++++++--------------------------- 6 files changed, 122 insertions(+), 207 deletions(-) create mode 100644 src/password.ui delete mode 100644 src/passworddialog.ui diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 88224670..585702f2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,7 +24,7 @@ KDE4_ADD_UI_FILES( rekonq_SRCS cookies.ui cookiesexceptions.ui history.ui - passworddialog.ui + password.ui proxy.ui settings_general.ui settings_fonts.ui diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e25373e9..b028913f 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -37,9 +37,6 @@ #include "mainview.h" #include "bookmarks.h" -// UI Includes -#include "ui_passworddialog.h" - // KDE Includes #include #include diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index 3c15bcf5..028dfabb 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -31,7 +31,7 @@ #include "rekonq.h" // Ui Includes -#include "ui_passworddialog.h" +#include "ui_password.h" #include "ui_proxy.h" // KDE Includes @@ -104,24 +104,25 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent { MainWindow *mainWindow = Application::instance()->mainWindow(); - QDialog dialog(mainWindow); - dialog.setWindowFlags(Qt::Sheet); + KDialog dialog(mainWindow,Qt::Sheet); - Ui::PasswordDialog passwordDialog; - passwordDialog.setupUi(&dialog); + Ui::passwordWidget passwordWidget; + passwordWidget.setupUi(&dialog); - passwordDialog.iconLabel->setText(QString()); - passwordDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32)); + dialog.setButtons( KDialog::Ok | KDialog::Cancel ); + + passwordWidget.iconLabel->setText(QString()); + passwordWidget.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32)); QString introMessage = i18n("Enter username and password for ") + Qt::escape(reply->url().toString()) + i18n(" at ") + Qt::escape(reply->url().toString()) + ""; - passwordDialog.introLabel->setText(introMessage); - passwordDialog.introLabel->setWordWrap(true); + passwordWidget.introLabel->setText(introMessage); + passwordWidget.introLabel->setWordWrap(true); if (dialog.exec() == QDialog::Accepted) { - auth->setUser(passwordDialog.userNameLineEdit->text()); - auth->setPassword(passwordDialog.passwordLineEdit->text()); + auth->setUser(passwordWidget.userNameLineEdit->text()); + auth->setPassword(passwordWidget.passwordLineEdit->text()); } } @@ -129,23 +130,24 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox { MainWindow *mainWindow = Application::instance()->mainWindow(); - QDialog dialog(mainWindow); - dialog.setWindowFlags(Qt::Sheet); + KDialog dialog(mainWindow, Qt::Sheet); + + Ui::proxyWidget proxyWdg; + proxyWdg.setupUi(&dialog); - Ui::ProxyDialog proxyDialog; - proxyDialog.setupUi(&dialog); + dialog.setButtons( KDialog::Ok | KDialog::Cancel ); - proxyDialog.iconLabel->setText(QString()); - proxyDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32)); + proxyWdg.iconLabel->setText(QString()); + proxyWdg.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32)); QString introMessage = i18n("Connect to proxy ") + Qt::escape(proxy.hostName()) + i18n(" using:"); - proxyDialog.introLabel->setText(introMessage); - proxyDialog.introLabel->setWordWrap(true); + proxyWdg.introLabel->setText(introMessage); + proxyWdg.introLabel->setWordWrap(true); if (dialog.exec() == QDialog::Accepted) { - auth->setUser(proxyDialog.userNameLineEdit->text()); - auth->setPassword(proxyDialog.passwordLineEdit->text()); + auth->setUser(proxyWdg.userNameLineEdit->text()); + auth->setPassword(proxyWdg.passwordLineEdit->text()); } } diff --git a/src/password.ui b/src/password.ui new file mode 100644 index 00000000..028e1683 --- /dev/null +++ b/src/password.ui @@ -0,0 +1,69 @@ + + + passwordWidget + + + + 0 + 0 + 343 + 193 + + + + Form + + + + + + + + DUMMY ICON + + + + + + + + 0 + 0 + + + + INTRO TEXT DUMMY + + + + + + + + + Username: + + + + + + + + + + Password: + + + + + + + QLineEdit::Password + + + + + + + + diff --git a/src/passworddialog.ui b/src/passworddialog.ui deleted file mode 100644 index 7c166586..00000000 --- a/src/passworddialog.ui +++ /dev/null @@ -1,111 +0,0 @@ - - PasswordDialog - - - - 0 - 0 - 399 - 148 - - - - Authentication Required - - - - - - - - DUMMY ICON - - - - - - - - 0 - 0 - - - - INTRO TEXT DUMMY - - - - - - - - - Username: - - - - - - - - - - Password: - - - - - - - QLineEdit::Password - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - PasswordDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - PasswordDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/src/proxy.ui b/src/proxy.ui index 62a8be62..e7440862 100644 --- a/src/proxy.ui +++ b/src/proxy.ui @@ -1,104 +1,62 @@ - - ProxyDialog - - + + + proxyWidget + + 0 0 - 369 - 144 + 264 + 153 - - Proxy Authentication + + Form - - - - + + + + ICON - - - + + + Connect to proxy - + true - - - + + + Username: - - + + - - - + + + Password: - - - + + + QLineEdit::Password - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - buttonBox - accepted() - ProxyDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - ProxyDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - + -- cgit v1.2.1