#
#
# patch "src/view/DatabaseWindow.cpp"
#  from [9111aaf608c115961d13c447c6a81c3c2867c23a]
#    to [7eeadcb46e181fe43b4dbf79b4538fd6f97ec415]
# 
# patch "src/view/DatabaseWindow.h"
#  from [1b4b76c38099becf797509ae2471004b770d23c7]
#    to [b1c482b6406ce306ad00e36bcb6f4dc0bca2a53e]
# 
# patch "src/view/MainWindow.cpp"
#  from [6aead2e79ddaec512ae6adc523cb9bf09b590745]
#    to [aa0bfc636770c2323d09b534abce633bcb8ac822]
# 
# patch "src/view/MainWindow.h"
#  from [eef7c4f68baef84f8f204f4115bff8ffb2971481]
#    to [11442617d19c644fd50a46ccebf34bd2048c2052]
# 
# patch "src/view/WorkspaceWindow.cpp"
#  from [c009c6ce4f634f601fdebbe200d415ccd1f04b81]
#    to [84e4e071bfc21347ab5e142af43ee5af2e903d42]
# 
# patch "src/view/WorkspaceWindow.h"
#  from [9162df49506291a252d81490767df79e7050b859]
#    to [1b969338dbb98e4147e4de5b161c6889e5cf2829]
#
============================================================
--- src/view/DatabaseWindow.cpp	9111aaf608c115961d13c447c6a81c3c2867c23a
+++ src/view/DatabaseWindow.cpp	7eeadcb46e181fe43b4dbf79b4538fd6f97ec415
@@ -62,6 +62,11 @@ void DatabaseWindow::init()
         dialogManager, SLOT(showKeyManagement())
     );
 
+    MainWindow::init();
+}
+
+void DatabaseWindow::setup()
+{
     layout = new QHBoxLayout();
     layout->setSpacing(0);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -72,8 +77,6 @@ void DatabaseWindow::init()
 
     layout->addWidget(loadedDatabase);
     setLayout(layout);
-    
-    MainWindow::init();
 }
 
 void DatabaseWindow::load(const QString & path)
============================================================
--- src/view/DatabaseWindow.h	1b4b76c38099becf797509ae2471004b770d23c7
+++ src/view/DatabaseWindow.h	b1c482b6406ce306ad00e36bcb6f4dc0bca2a53e
@@ -35,6 +35,7 @@ public:
     ~DatabaseWindow();
 
     virtual void init();
+    virtual void setup();
     //! throws GuitoneException
     virtual void load(const QString &);
 
============================================================
--- src/view/MainWindow.cpp	6aead2e79ddaec512ae6adc523cb9bf09b590745
+++ src/view/MainWindow.cpp	aa0bfc636770c2323d09b534abce633bcb8ac822
@@ -40,12 +40,12 @@ void MainWindow::init()
     {
         menuBar = new MenuBar(this);
     }
-    
+
     if (!dialogManager)
     {
         dialogManager = new DialogManager(this);
     }
-    
+
     connect(
         menuBar, SIGNAL(showAbout()),
         dialogManager, SLOT(showAbout())
@@ -95,6 +95,8 @@ void MainWindow::init()
         APP, SIGNAL(updateWindowList(const QStringList &)),
         menuBar, SLOT(updateWindowList(const QStringList &))
     );
+
+    setup();
 }
 
 void MainWindow::closeEvent(QCloseEvent * event)
============================================================
--- src/view/MainWindow.h	eef7c4f68baef84f8f204f4115bff8ffb2971481
+++ src/view/MainWindow.h	11442617d19c644fd50a46ccebf34bd2048c2052
@@ -32,6 +32,7 @@ public:
     MainWindow();
     ~MainWindow();
     virtual void init();
+    virtual void setup() = 0;
     virtual void load(const QString &) = 0;
 
 signals:
============================================================
--- src/view/WorkspaceWindow.cpp	c009c6ce4f634f601fdebbe200d415ccd1f04b81
+++ src/view/WorkspaceWindow.cpp	84e4e071bfc21347ab5e142af43ee5af2e903d42
@@ -38,12 +38,12 @@ void WorkspaceWindow::init()
     {
         menuBar = new WorkspaceMenuBar(this);
     }
-    
+
     if (!dialogManager)
     {
         dialogManager = new WorkspaceDialogManager(this);
     }
-    
+
     connect(
         menuBar, SIGNAL(showUpdateWorkspace()),
         dialogManager, SLOT(showUpdateWorkspace())
@@ -59,7 +59,11 @@ void WorkspaceWindow::init()
         this, SLOT(checkForUnaccountedRenames())
     );
 
-    // layout stuff
+    DatabaseWindow::init();
+}
+
+void WorkspaceWindow::setup()
+{
     layout = new QHBoxLayout(this);
     layout->setSpacing(0);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -201,8 +205,6 @@ void WorkspaceWindow::init()
     listView->setType(InventoryView::FileList);
 
     attrView->setModel(attrModel);
-
-    DatabaseWindow::init();
 }
 
 void WorkspaceWindow::load(const QString & path)
@@ -300,3 +302,14 @@ void WorkspaceWindow::readAttributes(con
     attrModel->readAttributes(item->getPath());
 }
 
+void WorkspaceWindow::invalidWorkspaceFormat(const QString & error)
+{
+    QMessageBox::critical(
+        this,
+        tr("Error"),
+        tr("Unable to read workspace format:\n%1").arg(error),
+        QMessageBox::Ok, 0, 0
+    );
+    close();
+}
+
============================================================
--- src/view/WorkspaceWindow.h	9162df49506291a252d81490767df79e7050b859
+++ src/view/WorkspaceWindow.h	1b969338dbb98e4147e4de5b161c6889e5cf2829
@@ -39,6 +39,7 @@ public:
     ~WorkspaceWindow();
 
     virtual void init();
+    virtual void setup();
     //! throws GuitoneException
     virtual void load(const QString &);
 
@@ -56,12 +57,10 @@ protected:
     InventoryProxyModel * proxyModelFolderTree;
     InventoryProxyModel * proxyModelFileList;
 
-private:
+private slots:
     void readAttributes(const QModelIndex &);
     void invalidWorkspaceFormat(const QString &);
     void openFile(const QString &);
-
-private slots:
     void checkForUnaccountedRenames();
 };