#
#
# patch "res/forms/icon_help.ui"
#  from [7f8918b02a06b6492f07a0d40a26562a35e35187]
#    to [bc8b532f1d74e345beda2c9f0a555fdb43fe2bca]
# 
# patch "res/forms/nodeinfo.ui"
#  from [b4d5c81b4c49819097fd46bc7e84e24cdff03753]
#    to [e50b8c7c5a8cf15e4be3423288036cb5d2fa3611]
# 
# patch "src/view/WorkspaceWindow.cpp"
#  from [8fc4a170d11e051a165b0118859d550c3f0509df]
#    to [068884043bdd39dc9ba6a7ae5f55ddace57b1121]
# 
# patch "src/view/panels/DatabaseVariables.cpp"
#  from [a3d0ea6257c7a5f4754b652db1fcde62eea842e7]
#    to [11a11c5cd6207a1b072a892df7e115f648b28875]
#
============================================================
--- res/forms/icon_help.ui	7f8918b02a06b6492f07a0d40a26562a35e35187
+++ res/forms/icon_help.ui	bc8b532f1d74e345beda2c9f0a555fdb43fe2bca
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>448</width>
-    <height>684</height>
+    <width>242</width>
+    <height>448</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -101,7 +101,8 @@ committable changes</string>
            </sizepolicy>
           </property>
           <property name="text" >
-           <string>Item has changed contents and attributes</string>
+           <string>Item has changed contents
+and attributes</string>
           </property>
          </widget>
         </item>
@@ -241,8 +242,9 @@ committable changes</string>
            </sizepolicy>
           </property>
           <property name="text" >
-           <string>Item is invalid (file type on disk is different
-from the recorded type)</string>
+           <string>Item is invalid (file type on
+disk is different from the
+recorded type)</string>
           </property>
          </widget>
         </item>
@@ -251,6 +253,19 @@ from the recorded type)</string>
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
============================================================
--- res/forms/nodeinfo.ui	b4d5c81b4c49819097fd46bc7e84e24cdff03753
+++ res/forms/nodeinfo.ui	e50b8c7c5a8cf15e4be3423288036cb5d2fa3611
@@ -5,16 +5,10 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>161</width>
-    <height>405</height>
+    <width>158</width>
+    <height>419</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
@@ -51,8 +45,11 @@
            </size>
           </property>
           <property name="text" >
-           <string/>
+           <string>X</string>
           </property>
+          <property name="alignment" >
+           <set>Qt::AlignCenter</set>
+          </property>
          </widget>
         </item>
         <item>
@@ -173,6 +170,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
============================================================
--- src/view/WorkspaceWindow.cpp	8fc4a170d11e051a165b0118859d550c3f0509df
+++ src/view/WorkspaceWindow.cpp	068884043bdd39dc9ba6a7ae5f55ddace57b1121
@@ -32,6 +32,7 @@ WorkspaceWindow::WorkspaceWindow() : Dat
     proxyModelFileList(0), invWatcher(0)
 {
     setObjectName("WorkspaceWindow");
+    setDockOptions(QMainWindow::ForceTabbedDocks);
 }
 
 WorkspaceWindow::~WorkspaceWindow()
@@ -278,6 +279,9 @@ void WorkspaceWindow::setup()
     dynamic_cast<DatabaseMenuBar *>(menuBar)
         ->addDockWidgetAction(nodeInfo->toggleViewAction());
 
+    addDockWidget(Qt::LeftDockWidgetArea, iconHelp);
+    addDockWidget(Qt::LeftDockWidgetArea, nodeInfo);
+
     connect(
         nodeInfo, SIGNAL(showSelectRevision(const QString &)),
         dialogManager, SLOT(showSelectRevision(const QString &))
============================================================
--- src/view/panels/DatabaseVariables.cpp	a3d0ea6257c7a5f4754b652db1fcde62eea842e7
+++ src/view/panels/DatabaseVariables.cpp	11a11c5cd6207a1b072a892df7e115f648b28875
@@ -64,7 +64,7 @@ DatabaseVariables::DatabaseVariables(QWi
     );
 
     setWindowTitle(tr("Database variables"));
-    setFloating(true);
+    //setFloating(true);
     setAllowedAreas(Qt::BottomDockWidgetArea);
 }