#
#
# patch "src/view/DatabaseWindow.cpp"
#  from [c176d576f38d08668e9f46f23963928547cf5642]
#    to [9111aaf608c115961d13c447c6a81c3c2867c23a]
# 
# patch "src/view/MainWindow.cpp"
#  from [5939804133e67de08c47753f3aafe3b532e4be97]
#    to [6aead2e79ddaec512ae6adc523cb9bf09b590745]
# 
# patch "src/view/MainWindow.h"
#  from [127ffbdb4f2cb9acdff89e965dc62bd8ac6496c8]
#    to [eef7c4f68baef84f8f204f4115bff8ffb2971481]
# 
# patch "src/view/TreeView.cpp"
#  from [c18f0e50936d8e496a60f9ced4f7f614fa6eea76]
#    to [9feec1fba9239a66bc5d3183c7a01641078f1e81]
# 
# patch "src/view/TreeView.h"
#  from [d49b1e7b44a689e5a7e8944a59244dfe34986a30]
#    to [e03e26c64090622a9c2355d1e443e3e77e53c112]
# 
# patch "src/view/WorkspaceWindow.cpp"
#  from [1e5be6c255d815256be609693b2e8434435bfdb9]
#    to [4ee4f092918fce0d9908526d08f7ca697dd75a76]
#
============================================================
--- src/view/DatabaseWindow.cpp	c176d576f38d08668e9f46f23963928547cf5642
+++ src/view/DatabaseWindow.cpp	9111aaf608c115961d13c447c6a81c3c2867c23a
@@ -26,8 +26,22 @@
 
 #include <QMessageBox>
 
-DatabaseWindow::DatabaseWindow() : MainWindow()
+DatabaseWindow::DatabaseWindow() : MainWindow() {}
+
+DatabaseWindow::~DatabaseWindow() {}
+
+void DatabaseWindow::init()
 {
+    if (!menuBar)
+    {
+        menuBar = new DatabaseMenuBar(this);
+    }
+
+    if (!dialogManager)
+    {
+        dialogManager = new DatabaseDialogManager(this);
+    }
+
     connect(
         dialogManager, SIGNAL(revisionCheckedOut(const QString &)),
         APP, SLOT(loadWorkspace(const QString &))
@@ -47,16 +61,7 @@ DatabaseWindow::DatabaseWindow() : MainW
         menuBar, SIGNAL(showKeyManagement()),
         dialogManager, SLOT(showKeyManagement())
     );
-}
 
-DatabaseWindow::~DatabaseWindow() {}
-
-void DatabaseWindow::init()
-{
-    cleanup();
-    menuBar = new DatabaseMenuBar(this);
-    dialogManager = new DatabaseDialogManager(this);
-
     layout = new QHBoxLayout();
     layout->setSpacing(0);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -67,6 +72,8 @@ void DatabaseWindow::init()
 
     layout->addWidget(loadedDatabase);
     setLayout(layout);
+    
+    MainWindow::init();
 }
 
 void DatabaseWindow::load(const QString & path)
============================================================
--- src/view/MainWindow.cpp	5939804133e67de08c47753f3aafe3b532e4be97
+++ src/view/MainWindow.cpp	6aead2e79ddaec512ae6adc523cb9bf09b590745
@@ -26,8 +26,26 @@
 #include <QCloseEvent>
 #include <QDesktopWidget>
 
-MainWindow::MainWindow() : QMainWindow()
+MainWindow::MainWindow() : QMainWindow(), menuBar(0), dialogManager(0) {}
+
+MainWindow::~MainWindow()
 {
+    if (menuBar)        delete menuBar;
+    if (dialogManager)  delete dialogManager;
+}
+
+void MainWindow::init()
+{
+    if (!menuBar)
+    {
+        menuBar = new MenuBar(this);
+    }
+    
+    if (!dialogManager)
+    {
+        dialogManager = new DialogManager(this);
+    }
+    
     connect(
         menuBar, SIGNAL(showAbout()),
         dialogManager, SLOT(showAbout())
@@ -79,24 +97,6 @@ MainWindow::MainWindow() : QMainWindow()
     );
 }
 
-MainWindow::~MainWindow()
-{
-    cleanup();
-}
-
-void MainWindow::cleanup()
-{
-    if (menuBar)        delete menuBar;
-    if (dialogManager)  delete dialogManager;
-}
-
-void MainWindow::init()
-{
-    cleanup();
-    menuBar = new MenuBar(this);
-    dialogManager = new DialogManager(this);
-}
-
 void MainWindow::closeEvent(QCloseEvent * event)
 {
     event->accept();
============================================================
--- src/view/MainWindow.h	127ffbdb4f2cb9acdff89e965dc62bd8ac6496c8
+++ src/view/MainWindow.h	eef7c4f68baef84f8f204f4115bff8ffb2971481
@@ -38,8 +38,6 @@ protected:
     void windowClosed(MainWindow *);
 
 protected:
-    void cleanup();
-
     MenuBar * menuBar;
     DialogManager * dialogManager;
 
============================================================
--- src/view/TreeView.cpp	c18f0e50936d8e496a60f9ced4f7f614fa6eea76
+++ src/view/TreeView.cpp	9feec1fba9239a66bc5d3183c7a01641078f1e81
@@ -55,7 +55,7 @@ void TreeView::saveHeaderViewState()
     Settings::saveHeaderViewState(header(), QString(objectName()).append("_header"));
 }
 
-void TreeView::setExpanded(bool expand)
+void TreeView::expandAllNodes(bool expand)
 {
     if (expand)
         expandAll();
============================================================
--- src/view/TreeView.h	d49b1e7b44a689e5a7e8944a59244dfe34986a30
+++ src/view/TreeView.h	e03e26c64090622a9c2355d1e443e3e77e53c112
@@ -35,7 +35,7 @@ public slots:
     void init();
 
 public slots:
-    void setExpanded(bool);
+    void expandAllNodes(bool);
 
 signals:
     void contextMenuRequested(const QModelIndexList &, const QPoint &);
============================================================
--- src/view/WorkspaceWindow.cpp	1e5be6c255d815256be609693b2e8434435bfdb9
+++ src/view/WorkspaceWindow.cpp	4ee4f092918fce0d9908526d08f7ca697dd75a76
@@ -34,10 +34,16 @@ void WorkspaceWindow::init()
 
 void WorkspaceWindow::init()
 {
-    cleanup();
-    menuBar = new WorkspaceMenuBar(this);
-    dialogManager = new WorkspaceDialogManager(this);
-
+    if (!menuBar)
+    {
+        menuBar = new WorkspaceMenuBar(this);
+    }
+    
+    if (!dialogManager)
+    {
+        dialogManager = new WorkspaceDialogManager(this);
+    }
+    
     connect(
         menuBar, SIGNAL(showUpdateWorkspace()),
         dialogManager, SLOT(showUpdateWorkspace())
@@ -129,7 +135,7 @@ void WorkspaceWindow::init()
 
     connect(
         menuBar, SIGNAL(expandTree(bool)),
-        treeView, SLOT(setExpanded(bool))
+        treeView, SLOT(expandAllNodes(bool))
     );
 
     listSplitter->addWidget(listView);
@@ -191,6 +197,8 @@ void WorkspaceWindow::init()
     treeView->setModel(proxyModelFolderTree);
     listView->setModel(proxyModelFileList);
     attrView->setModel(attrModel);
+    
+    DatabaseWindow::init();
 }
 
 void WorkspaceWindow::load(const QString & path)