diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
index 781b836fd..fcc029ab6 100644
--- a/src/gui/DatabaseOpenWidget.cpp
+++ b/src/gui/DatabaseOpenWidget.cpp
@@ -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);
diff --git a/src/gui/DatabaseOpenWidget.ui b/src/gui/DatabaseOpenWidget.ui
index 4aae5faf2..f658d568a 100644
--- a/src/gui/DatabaseOpenWidget.ui
+++ b/src/gui/DatabaseOpenWidget.ui
@@ -10,10 +10,13 @@
250
-
+
8
+ -
+
+
-
@@ -144,6 +147,12 @@
QLineEdit
+
+ MessageWidget
+ QWidget
+
+ 1
+
checkPassword