FancyMainWindow: Use auto-hiding dock title bars

Instead of the manual hard-to-discover "Locked" action

Change-Id: I08e3b65d3e620adfa1439a8de6e028ecfbdec16d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

2 files changed, 2 insertions, 13 deletions

diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 3d5aeaec0e..c06a3c5e68 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -313,16 +313,8 @@ void DebuggerMainWindowPrivate::createViewsMenuItems()
     cmd->setAttribute(Command::CA_Hide);
     m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
 
-    cmd = Core::ActionManager::registerAction(q->menuSeparator1(),
-        "Debugger.Views.Separator1", debugcontext);
-    cmd->setAttribute(Command::CA_Hide);
-    m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
-    cmd = Core::ActionManager::registerAction(q->toggleLockedAction(),
-        "Debugger.Views.ToggleLocked", debugcontext);
-    cmd->setAttribute(Command::CA_Hide);
-    m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
-    cmd = Core::ActionManager::registerAction(q->menuSeparator2(),
-        "Debugger.Views.Separator2", debugcontext);
+    cmd = Core::ActionManager::registerAction(q->menuSeparator(),
+        "Debugger.Views.Separator", debugcontext);
     cmd->setAttribute(Command::CA_Hide);
     m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
     cmd = Core::ActionManager::registerAction(q->resetLayoutAction(),
@@ -464,8 +456,6 @@ QWidget *DebuggerMainWindow::createContents(IMode *mode)
     setDockNestingEnabled(true);
     connect(this, SIGNAL(resetLayout()),
         d, SLOT(resetDebuggerLayout()));
-    connect(toggleLockedAction(), SIGNAL(triggered()),
-        d, SLOT(updateDockWidgetSettings()));
 
     QBoxLayout *editorHolderLayout = new QVBoxLayout;
     editorHolderLayout->setMargin(0);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 5a3dbd662b..7fb961d810 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2626,7 +2626,6 @@ void DebuggerPluginPrivate::createNewDock(QWidget *widget)
 {
     QDockWidget *dockWidget =
         m_mainWindow->createDockWidget(CppLanguage, widget);
-    dockWidget->setWindowTitle(widget->windowTitle());
     dockWidget->setFeatures(QDockWidget::DockWidgetClosable);
     dockWidget->show();
 }