Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-24 15:25:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replaced MessageBox dialogs with inline MessageWidget in

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

15
src/gui/DatabaseOpenWidget.cpp
View file

@ -35,6 +35,8 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
{
m_ui->setupUi(this);
m_ui->messageWidget->setHidden(true);
QFont font = m_ui->labelHeadline->font();
font.setBold(true);
font.setPointSize(font.pointSize() + 2);
@ -106,8 +108,8 @@ void DatabaseOpenWidget::openDatabase()
QFile file(m_filename);
if (!file.open(QIODevice::ReadOnly)) {
MessageBox::warning(this, tr("Error"), tr("Unable to open the database.").append("\n")
.append(file.errorString()));
m_ui->messageWidget->showMessageError(
tr("Unable to open the database.").append("\n").append(file.errorString()));
return;
}
if (m_db) {
@ -118,11 +120,14 @@ void DatabaseOpenWidget::openDatabase()
QApplication::restoreOverrideCursor();
if (m_db) {
if (m_ui->messageWidget->isVisible()) {
m_ui->messageWidget->animatedHide();
}
Q_EMIT editFinished(true);
}
else {
MessageBox::warning(this, tr("Error"), tr("Unable to open the database.").append("\n")
.append(reader.errorString()));
m_ui->messageWidget->showMessageError(tr("Unable to open the database.")
.append("\n").append(reader.errorString()));
m_ui->editPassword->clear();
}
}
@ -142,7 +147,7 @@ CompositeKey DatabaseOpenWidget::databaseKey()
QString keyFilename = m_ui->comboKeyFile->currentText();
QString errorMsg;
if (!key.load(keyFilename, &errorMsg)) {
MessageBox::warning(this, tr("Error"), tr("Can't open key file").append(":\n").append(errorMsg));
m_ui->messageWidget->showMessageError(tr("Can't open key file").append(":\n").append(errorMsg));
return CompositeKey();
}
masterKey.addKey(key);