Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-10-29 10:59:11 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-10-29 10:59:11 (GMT) |
| commit | 06e40dd580e43e11e519acbb2d30156c18081f79 (patch) | |
| tree | 83503e4acac19c40c745c44504e3675894cb2dea /Swift/QtUI/QtLoginWindow.cpp | |
| parent | 7cb49cb679156151f19a556de76274c5a25e6de2 (diff) | |
| download | swift-06e40dd580e43e11e519acbb2d30156c18081f79.zip swift-06e40dd580e43e11e519acbb2d30156c18081f79.tar.bz2 | |
Make the --eagle-mode banner per-login, not per-run
Diffstat (limited to 'Swift/QtUI/QtLoginWindow.cpp')
| -rw-r--r-- | Swift/QtUI/QtLoginWindow.cpp | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp index 0db6071..87dd849 100644 --- a/Swift/QtUI/QtLoginWindow.cpp +++ b/Swift/QtUI/QtLoginWindow.cpp @@ -33,6 +33,7 @@ #include "Swift/Controllers/UIEvents/ToggleSoundsUIEvent.h" #include "Swift/Controllers/UIEvents/ToggleNotificationsUIEvent.h" #include "Swiften/Base/Platform.h" +#include "Swiften/Base/Paths.h" #include "QtAboutWidget.h" #include "QtSwiftUtil.h" @@ -41,7 +42,7 @@ namespace Swift{ -QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream) : QMainWindow(), forgetful_(false) { +QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream, bool eagleMode) : QMainWindow(), eagleMode_(eagleMode) { uiEventStream_ = uiEventStream; setWindowTitle("Swift"); @@ -202,18 +203,17 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream) : QMainWindow(), forg setInitialMenus(); uiEventStream_->onUIEvent.connect(boost::bind(&QtLoginWindow::handleUIEvent, this, _1)); - this->show(); -} -void QtLoginWindow::setRememberingAllowed(bool allowed) { - forgetful_ = true; - remember_->setEnabled(allowed); - loginAutomatically_->setEnabled(allowed); - xmlConsoleAction_->setEnabled(allowed); - if (!allowed) { + + remember_->setEnabled(!eagleMode_); + loginAutomatically_->setEnabled(!eagleMode_); + xmlConsoleAction_->setEnabled(!eagleMode_); + if (eagleMode_) { remember_->setChecked(false); loginAutomatically_->setChecked(false); } + + this->show(); } bool QtLoginWindow::eventFilter(QObject *obj, QEvent *event) { @@ -322,8 +322,30 @@ void QtLoginWindow::setIsLoggingIn(bool loggingIn) { void QtLoginWindow::loginClicked() { if (username_->isEnabled()) { + if (eagleMode_) { + QString clickThroughPath(P2QSTRING((Paths::getExecutablePath() / "eagle-banner.txt").string())); + QFile clickThroughFile(clickThroughPath); + if (clickThroughFile.exists() && clickThroughFile.open(QIODevice::ReadOnly)) { + QString banner; + while (!clickThroughFile.atEnd()) { + QByteArray line = clickThroughFile.readLine(); + banner += line + "\n"; + } + if (!banner.isEmpty()) { + QMessageBox msgBox; + msgBox.setWindowTitle(tr("Confirm terms of use")); + msgBox.setText(""); + msgBox.setInformativeText(banner); + msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); + msgBox.setDefaultButton(QMessageBox::No); + if (msgBox.exec() != QMessageBox::Yes) { + return; + } + } + } + } onLoginRequest(Q2PSTRING(username_->currentText()), Q2PSTRING(password_->text()), Q2PSTRING(certificateFile_), remember_->isChecked(), loginAutomatically_->isChecked()); - if (forgetful_) { /* Mustn't remember logins */ + if (eagleMode_) { /* Mustn't remember logins */ username_->clearEditText(); password_->setText(""); } |