From a710181388f7525b703c88aaa69fcd4c6d1c0d37 Mon Sep 17 00:00:00 2001
From: Pedro Alves <devel@pgalves.com>
Date: Mon, 19 Jan 2015 23:14:59 +0000
Subject: [PATCH] Replaced MessageBox dialogs with inline MessageWidget in
 DatabaseOpenWidget.

---
 src/gui/DatabaseOpenWidget.cpp | 15 ++++++++++-----
 src/gui/DatabaseOpenWidget.ui  | 11 ++++++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

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 @@
     <height>250</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,0,1,0,0,3">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0,0,1,0,0,3">
    <property name="spacing">
     <number>8</number>
    </property>
+   <item>
+    <widget class="MessageWidget" name="messageWidget" native="true"/>
+   </item>
    <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
@@ -144,6 +147,12 @@
    <extends>QLineEdit</extends>
    <header>gui/PasswordEdit.h</header>
   </customwidget>
+  <customwidget>
+   <class>MessageWidget</class>
+   <extends>QWidget</extends>
+   <header>gui/MessageWidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>checkPassword</tabstop>