#
#
# patch "src/view/DatabaseWindow.cpp"
#  from [7eeadcb46e181fe43b4dbf79b4538fd6f97ec415]
#    to [05357135742834d671dae8674009e85b7fd16cb3]
# 
# patch "src/view/DatabaseWindow.h"
#  from [b1c482b6406ce306ad00e36bcb6f4dc0bca2a53e]
#    to [91aa73341472bca7539a9f07bb78bf200b6d8f7e]
# 
# patch "src/view/MainWindow.cpp"
#  from [aa0bfc636770c2323d09b534abce633bcb8ac822]
#    to [55ec09e783a95509ef496b395d4891337143e663]
# 
# patch "src/view/WorkspaceWindow.cpp"
#  from [ba67a6ea92fb4ea587a1ff29940d02a85f708348]
#    to [18a45e72cf0b8c25dcd442b4bf5dc6b73d8d813e]
# 
# patch "src/view/WorkspaceWindow.h"
#  from [1b969338dbb98e4147e4de5b161c6889e5cf2829]
#    to [2b924de7516c42847e65a9540d27a9d8eaedf3aa]
#
============================================================
--- src/view/DatabaseWindow.cpp	7eeadcb46e181fe43b4dbf79b4538fd6f97ec415
+++ src/view/DatabaseWindow.cpp	05357135742834d671dae8674009e85b7fd16cb3
@@ -67,16 +67,11 @@ void DatabaseWindow::setup()
 
 void DatabaseWindow::setup()
 {
-    layout = new QHBoxLayout();
-    layout->setSpacing(0);
-    layout->setContentsMargins(0, 0, 0, 0);
-
     loadedDatabase = new QLabel(tr("nothing loaded"), this);
     loadedDatabase->setTextFormat(Qt::PlainText);
     loadedDatabase->setAlignment(Qt::AlignCenter);
 
-    layout->addWidget(loadedDatabase);
-    setLayout(layout);
+    setCentralWidget(loadedDatabase);
 }
 
 void DatabaseWindow::load(const QString & path)
============================================================
--- src/view/DatabaseWindow.h	b1c482b6406ce306ad00e36bcb6f4dc0bca2a53e
+++ src/view/DatabaseWindow.h	91aa73341472bca7539a9f07bb78bf200b6d8f7e
@@ -42,7 +42,6 @@ protected:
 protected:
     DatabaseFile databaseFile;
     QLabel * loadedDatabase;
-    QHBoxLayout * layout;
 };
 
 #endif
============================================================
--- src/view/MainWindow.cpp	aa0bfc636770c2323d09b534abce633bcb8ac822
+++ src/view/MainWindow.cpp	55ec09e783a95509ef496b395d4891337143e663
@@ -96,6 +96,8 @@ void MainWindow::init()
         menuBar, SLOT(updateWindowList(const QStringList &))
     );
 
+    // common layout tasks
+    setMenuBar(menuBar);
     setup();
 }
 
============================================================
--- src/view/WorkspaceWindow.cpp	ba67a6ea92fb4ea587a1ff29940d02a85f708348
+++ src/view/WorkspaceWindow.cpp	18a45e72cf0b8c25dcd442b4bf5dc6b73d8d813e
@@ -64,9 +64,8 @@ void WorkspaceWindow::setup()
 
 void WorkspaceWindow::setup()
 {
-    layout = new QHBoxLayout(this);
-    layout->setSpacing(0);
-    layout->setContentsMargins(0, 0, 0, 0);
+    statusBar = new QStatusBar(this);
+    setStatusBar(statusBar);
 
     mainSplitter = new Splitter(this);
     mainSplitter->setObjectName("workspace.mainSplitter");
@@ -148,8 +147,7 @@ void WorkspaceWindow::setup()
     mainSplitter->addWidget(treeView);
     mainSplitter->addWidget(listSplitter);
 
-    layout->addWidget(mainSplitter);
-    setLayout(layout);
+    setCentralWidget(mainSplitter);
 
     mainSplitter->init();
     listSplitter->init();
============================================================
--- src/view/WorkspaceWindow.h	1b969338dbb98e4147e4de5b161c6889e5cf2829
+++ src/view/WorkspaceWindow.h	2b924de7516c42847e65a9540d27a9d8eaedf3aa
@@ -31,6 +31,8 @@
 #include "AttributesView.h"
 #include "Splitter.h"
 
+#include <QStatusBar>
+
 class WorkspaceWindow: public DatabaseWindow
 {
     Q_OBJECT
@@ -51,6 +53,7 @@ protected:
     InventoryView  * treeView;
     InventoryView  * listView;
     AttributesView * attrView;
+    QStatusBar * statusBar;
 
     Inventory           * invModel;
     GetAttributes       * attrModel;