#
#
# patch "src/view/MenuBar.cpp"
#  from [d692716f0818ddbd8c293b124940d8fef2c4d1df]
#    to [f5c8517f4f69b3e4d36bbea93da38528840cc5be]
# 
# patch "src/view/MenuBar.h"
#  from [c42750b1680d2710ea70d5a365e6bf73b36d5c98]
#    to [e36f45a2a082967672a019d83431d8a6c0c8f8dd]
# 
# patch "src/view/WorkspaceMenuBar.cpp"
#  from [7f8026a44fa642d0bc6ef70be9694c4074e445f2]
#    to [411ab43b97d6437785a9cea40c9aa45cae30eb2b]
# 
# patch "src/view/WorkspaceMenuBar.h"
#  from [37f078fffd28f79bcdf6960b71884577cebea6f3]
#    to [11e5106fd77b83b3bbb9a5f5d970e0709c53a2db]
#
============================================================
--- src/view/MenuBar.cpp	d692716f0818ddbd8c293b124940d8fef2c4d1df
+++ src/view/MenuBar.cpp	f5c8517f4f69b3e4d36bbea93da38528840cc5be
@@ -20,6 +20,7 @@
 
 #include "MenuBar.h"
 #include "Settings.h"
+#include "vocab.h"
 
 #include <QApplication>
 #include <QFileDialog>
@@ -68,12 +69,16 @@ MenuBar::MenuBar(QWidget * parent) : QMe
     //
     // The Window menu
     //
-    actionBring_all_to_front = new QAction(tr("Bring all to front"), this);
+    actionRaise_all_windows = new QAction(tr("Raise all windows"), this);
 
     menuWindow = new QMenu(tr("Window"), this);
-
-    menuWindow->addAction(actionBring_all_to_front);
+    menuWindow->addAction(actionRaise_all_windows);
     menuWindow->addSeparator();
+    // all opened windows are placed before this named separator -
+    // by defining that this separator is invisible, it should not disturb
+    // the look of the rendered menu
+    actionWindowSeparator = menuWindow->addSeparator();
+    actionWindowSeparator->setVisible(false);
 
     // The Help menu
     //
@@ -133,8 +138,8 @@ MenuBar::MenuBar(QWidget * parent) : QMe
     );
 
     connect(
-        actionBring_all_to_front, SIGNAL(triggered()),
-        this, SIGNAL(bringAllWindowsToFront())
+        actionRaise_all_windows, SIGNAL(triggered()),
+        this, SIGNAL(raiseAllWindows())
     );
 }
 
@@ -232,6 +237,10 @@ void MenuBar::updateWindowList(const QSt
         QAction * act = actions.at(i);
         if (act->data().isValid())
         {
+            disconnect(
+                act, SIGNAL(triggered()),
+                this, SLOT(activateOtherWindow())
+            );
             menuWindow->removeAction(act);
         }
     }
@@ -240,12 +249,14 @@ void MenuBar::updateWindowList(const QSt
     // active here, but this needs central work in the App
     for (int i=0, j=windowTitles.size(); i<j; i++)
     {
-        QAction * act = menuWindow->addAction(
-            tr("&%1 %2").arg(i + 1).arg(windowTitles.at(i)),
-            this,
-            SLOT(activateOtherWindow())
+        QAction * act = new QAction(tr("&%1 %2").arg(i + 1).arg(windowTitles.at(i)), this);
+        act->setData(i);
+        connect(
+            act, SIGNAL(triggered()),
+            this, SLOT(activateOtherWindow())
         );
-        act->setData(i);
+        menuWindow->insertAction(actionWindowSeparator, act);
+
     }
 }
 
============================================================
--- src/view/MenuBar.h	c42750b1680d2710ea70d5a365e6bf73b36d5c98
+++ src/view/MenuBar.h	e36f45a2a082967672a019d83431d8a6c0c8f8dd
@@ -42,7 +42,7 @@ signals:
     void checkForApplicationUpdates();
     void closeWindow();
     void activateWindow(int);
-    void bringAllWindowsToFront();
+    void raiseAllWindows();
 
 protected:
     QAction * actionOpen_Database;
@@ -51,7 +51,8 @@ protected:
     QAction * actionCheck_for_updates;
     QAction * actionClose;
     QAction * actionQuit;
-    QAction * actionBring_all_to_front;
+    QAction * actionRaise_all_windows;
+    QAction * actionWindowSeparator;
     QAction * actionAbout_Qt;
     QAction * actionAbout_guitone;
 
============================================================
--- src/view/WorkspaceMenuBar.cpp	7f8026a44fa642d0bc6ef70be9694c4074e445f2
+++ src/view/WorkspaceMenuBar.cpp	411ab43b97d6437785a9cea40c9aa45cae30eb2b
@@ -100,6 +100,7 @@ WorkspaceMenuBar::WorkspaceMenuBar(QWidg
 
     menuView->addAction(actionHide_ignored_files);
     menuView->addAction(actionExpand_tree);
+    menuView->addSeparator();
     menuView->addAction(menuShow->menuAction());
 
     //
@@ -163,6 +164,13 @@ WorkspaceMenuBar::WorkspaceMenuBar(QWidg
         actionFind_unaccounted_renames, SIGNAL(triggered()),
         this, SIGNAL(showUnaccountedRenames())
     );
+
+    //
+    // the dock widget menu
+    //
+    menuDockWidgets = new QMenu(tr("Panels"), this);
+    menuWindow->addSeparator();
+    menuWindow->addAction(menuDockWidgets->menuAction());
 }
 
 WorkspaceMenuBar::~WorkspaceMenuBar() {}
@@ -211,3 +219,8 @@ void WorkspaceMenuBar::toggleHideIgnored
     actionHide_ignored_files->setData(QVariant(!hide));
 }
 
+void WorkspaceMenuBar::addDockWidgetAction(QAction * act)
+{
+    menuDockWidgets->addAction(act);
+}
+
============================================================
--- src/view/WorkspaceMenuBar.h	37f078fffd28f79bcdf6960b71884577cebea6f3
+++ src/view/WorkspaceMenuBar.h	11e5106fd77b83b3bbb9a5f5d970e0709c53a2db
@@ -30,6 +30,8 @@ public:
     WorkspaceMenuBar(QWidget *);
     ~WorkspaceMenuBar();
 
+    void addDockWidgetAction(QAction * action);
+
 signals:
     void hideIgnoredFiles(bool);
     void expandTree(bool);
@@ -63,6 +65,7 @@ protected:
     QMenu * menuView;
     QMenu * menuShow;
     QMenu * menuWorkspace;
+    QMenu * menuDockWidgets;
 
 private slots:
     void toggleExpandTree();