mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 13:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Replace MessageBox dialogs that don't require user interaction with

Browse source 
inline MessageWidget in ChangeMasterKeyWidget.
This commit is contained in:
Pedro Alves 2015-01-19 23:27:57 +00:00 • committed by Janek Bevendorff
parent a710181388
commit 3c4af1a194
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gui/ChangeMasterKeyWidget.cpp
View file

@ -30,6 +30,8 @@ ChangeMasterKeyWidget::ChangeMasterKeyWidget(QWidget* parent)
{
m_ui->setupUi(this);
m_ui->messageWidget->setHidden(true);
connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(generateKey()));
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject()));
m_ui->togglePasswordButton->setIcon(filePath()->onOffIcon("actions", "password-show"));
@ -52,7 +54,7 @@ void ChangeMasterKeyWidget::createKeyFile()
QString errorMsg;
bool created = FileKey::create(fileName, &errorMsg);
if (!created) {
MessageBox::warning(this, tr("Error"), tr("Unable to create Key File : ") + errorMsg);
m_ui->messageWidget->showMessageError(tr("Unable to create Key File : ").append(errorMsg));
}
else {
m_ui->keyFileCombo->setEditText(fileName);
@ -110,7 +112,7 @@ void ChangeMasterKeyWidget::generateKey()
m_key.addKey(PasswordKey(m_ui->enterPasswordEdit->text()));
}
else {
MessageBox::warning(this, tr("Error"), tr("Different passwords supplied."));
m_ui->messageWidget->showMessageError(tr("Different passwords supplied."));
m_ui->enterPasswordEdit->setText("");
m_ui->repeatPasswordEdit->setText("");
return;