#
#
# patch "src/view/DatabaseWindow.cpp"
#  from [05357135742834d671dae8674009e85b7fd16cb3]
#    to [f979e7fcc168d6a6a762afcd60f16681fe2f35b0]
# 
# patch "src/view/DatabaseWindow.h"
#  from [91aa73341472bca7539a9f07bb78bf200b6d8f7e]
#    to [7f0562511c36acfb89b99df42f8550d5f3e4dda3]
# 
# patch "src/view/MainWindow.cpp"
#  from [55ec09e783a95509ef496b395d4891337143e663]
#    to [fe207b1086e4eb480420911be8e395ef7bd905c7]
#
============================================================
--- src/view/DatabaseWindow.cpp	05357135742834d671dae8674009e85b7fd16cb3
+++ src/view/DatabaseWindow.cpp	f979e7fcc168d6a6a762afcd60f16681fe2f35b0
@@ -25,6 +25,7 @@
 #include "Settings.h"
 
 #include <QMessageBox>
+#include <QHBoxLayout>
 
 DatabaseWindow::DatabaseWindow() : MainWindow() {}
 
@@ -67,11 +68,16 @@ void DatabaseWindow::setup()
 
 void DatabaseWindow::setup()
 {
+    QWidget * centralWidget = new QWidget(this);
+    QHBoxLayout * layout = new QHBoxLayout(centralWidget);
+
     loadedDatabase = new QLabel(tr("nothing loaded"), this);
     loadedDatabase->setTextFormat(Qt::PlainText);
     loadedDatabase->setAlignment(Qt::AlignCenter);
 
-    setCentralWidget(loadedDatabase);
+    layout->addWidget(loadedDatabase);
+
+    setCentralWidget(centralWidget);
 }
 
 void DatabaseWindow::load(const QString & path)
============================================================
--- src/view/DatabaseWindow.h	91aa73341472bca7539a9f07bb78bf200b6d8f7e
+++ src/view/DatabaseWindow.h	7f0562511c36acfb89b99df42f8550d5f3e4dda3
@@ -25,7 +25,6 @@
 #include "vocab.h"
 
 #include <QLabel>
-#include <QHBoxLayout>
 
 class DatabaseWindow : public MainWindow
 {
============================================================
--- src/view/MainWindow.cpp	55ec09e783a95509ef496b395d4891337143e663
+++ src/view/MainWindow.cpp	fe207b1086e4eb480420911be8e395ef7bd905c7
@@ -62,6 +62,11 @@ void MainWindow::init()
     );
 
     connect(
+        this, SIGNAL(windowClosed(MainWindow *)),
+        APP, SLOT(windowClosed(MainWindow *))
+    );
+
+    connect(
         menuBar, SIGNAL(loadWorkspace(const QString &)),
         APP, SLOT(loadWorkspace(const QString &))
     );
@@ -104,6 +109,9 @@ void MainWindow::closeEvent(QCloseEvent 
 void MainWindow::closeEvent(QCloseEvent * event)
 {
     event->accept();
+    // TODO: save the window layout here...
+    // FIXME: what if certain dialogs do not want to be closed?
+    dialogManager->closeAllDialogs();
     emit windowClosed(this);
 }