diff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-01-05 15:57:11 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-01-05 15:57:11 (GMT) |
| commit | f504079157860a09ba222ea38f1bd799bdb8a1f7 (patch) | |
| tree | 5f6a21ba0954c7de5d161ade226caa45464d08d6 /Swift | |
| parent | b01f65e011503a76c5f3ef6272f7ff77afb2bd7e (diff) | |
| download | swift-contrib-f504079157860a09ba222ea38f1bd799bdb8a1f7.zip swift-contrib-f504079157860a09ba222ea38f1bd799bdb8a1f7.tar.bz2 | |
Add more cert file types for the login cert dialog filter
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtLoginWindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp index 43abd91..fc99633 100644 --- a/Swift/QtUI/QtLoginWindow.cpp +++ b/Swift/QtUI/QtLoginWindow.cpp @@ -335,71 +335,71 @@ void QtLoginWindow::loginClicked() { 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 (eagleMode_) { /* Mustn't remember logins */ username_->clearEditText(); password_->setText(""); } } else { onCancelLoginRequest(); } } void QtLoginWindow::setLoginAutomatically(bool loginAutomatically) { loginAutomatically_->setChecked(loginAutomatically); } void QtLoginWindow::handleCertficateChecked(bool checked) { if (checked) { - certificateFile_ = QFileDialog::getOpenFileName(this, tr("Select an authentication certificate"), QString(), QString("*.cert")); + certificateFile_ = QFileDialog::getOpenFileName(this, tr("Select an authentication certificate"), QString(), QString("*.cert;*.p12;*.pfx")); if (certificateFile_.isEmpty()) { certificateButton_->setChecked(false); } } else { certificateFile_ = ""; } } void QtLoginWindow::handleAbout() { if (!aboutDialog_) { aboutDialog_ = new QtAboutWidget(); aboutDialog_->show(); } else { aboutDialog_->show(); aboutDialog_->raise(); aboutDialog_->activateWindow(); } } void QtLoginWindow::handleShowXMLConsole() { uiEventStream_->send(boost::shared_ptr<RequestXMLConsoleUIEvent>(new RequestXMLConsoleUIEvent())); } void QtLoginWindow::handleShowFileTransferOverview() { uiEventStream_->send(boost::make_shared<RequestFileTransferListUIEvent>()); } void QtLoginWindow::handleToggleSounds(bool enabled) { uiEventStream_->send(boost::shared_ptr<ToggleSoundsUIEvent>(new ToggleSoundsUIEvent(enabled))); } void QtLoginWindow::handleToggleNotifications(bool enabled) { uiEventStream_->send(boost::shared_ptr<ToggleNotificationsUIEvent>(new ToggleNotificationsUIEvent(enabled))); |
Swift