debugger: rework construction of initial dockwidget arrangement

This is now also postponed to the first switch to debug mode.

diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 3230b85..ec79f48 100644 (file)
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -76,6 +76,7 @@ const char * const DOCKWIDGET_WATCHERS   = "Debugger.Docks.LocalsAndWatchers";
 
 const char * const DOCKWIDGET_QML_INSPECTOR = "Debugger.Docks.QmlInspector";
 const char * const DOCKWIDGET_QML_SCRIPTCONSOLE = "Debugger.Docks.ScriptConsole";
+const char * const DOCKWIDGET_DEFAULT_AREA = "Debugger.Docks.DefaultArea";
 
 namespace Internal {
     enum { debug = 0 };

diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 7bd5305..fd9e717 100644 (file)
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -280,9 +280,9 @@ void DebuggerMainWindow::onModeChanged(IMode *mode)
     d->hideInactiveWidgets();
 
     if (mode->id() != Constants::MODE_DEBUG)
-        //|| DebuggerPlugin::instance()->hasSnapshots())
        return;
 
+    readSettings();
     updateActiveLanguages();
 }
 
@@ -434,7 +434,7 @@ QDockWidget *DebuggerMainWindow::createDockWidget(const DebuggerLanguage &langua
 //             << "VISIBLE BY DEFAULT" << ((d->m_activeDebugLanguages & language) ? "true" : "false");
     QDockWidget *dockWidget = addDockForWidget(widget);
     dockWidget->setObjectName(widget->objectName());
-    addDockWidget(Qt::TopDockWidgetArea, dockWidget);
+    addDockWidget(Qt::BottomDockWidgetArea, dockWidget);
     d->m_dockWidgets.append(dockWidget);
 
     if (!(d->m_activeDebugLanguages & language))
@@ -589,17 +589,21 @@ void DebuggerMainWindow::readSettings()
         d->m_dockWidgetActiveStateQmlCpp.insert(key, settings->value(key));
     settings->endGroup();
 
-    // reset initial settings when there are none yet
-    DebuggerLanguages langs = d->m_activeDebugLanguages;
-    if (d->m_dockWidgetActiveStateCpp.isEmpty()) {
-        d->m_activeDebugLanguages = CppLanguage;
-        d->resetDebuggerLayout();
-    }
-    if (d->m_dockWidgetActiveStateQmlCpp.isEmpty()) {
-        d->m_activeDebugLanguages = QmlLanguage;
-        d->resetDebuggerLayout();
+    // Reset initial settings when there are none yet.
+    if (d->isQmlActive()) {
+        if (d->m_dockWidgetActiveStateQmlCpp.isEmpty()) {
+            d->m_activeDebugLanguages = DebuggerLanguage(QmlLanguage|CppLanguage);
+            d->setSimpleDockWidgetArrangement();
+            d->m_dockWidgetActiveStateCpp = saveSettings();
+        }
+    } else {
+        if (d->m_dockWidgetActiveStateCpp.isEmpty()) {
+            d->m_activeDebugLanguages = CppLanguage;
+            d->setSimpleDockWidgetArrangement();
+            d->m_dockWidgetActiveStateCpp = saveSettings();
+        }
     }
-    d->m_activeDebugLanguages = langs;
+    writeSettings();
 }
 
 void DebuggerMainWindowPrivate::resetDebuggerLayout()
@@ -660,6 +664,15 @@ void DebuggerMainWindowPrivate::setSimpleDockWidgetArrangement()
         q->removeDockWidget(dockWidget);
     }
 
+    foreach (QDockWidget *dockWidget, m_dockWidgets) {
+        int area = Qt::BottomDockWidgetArea;
+        QVariant p = dockWidget->property(DOCKWIDGET_DEFAULT_AREA);
+        if (p.isValid())
+            area = Qt::DockWidgetArea(p.toInt());
+        q->addDockWidget(Qt::DockWidgetArea(area), dockWidget);
+        dockWidget->hide();
+    }
+
     QDockWidget *breakDock = q->dockWidget(DOCKWIDGET_BREAK);
     QDockWidget *stackDock = q->dockWidget(DOCKWIDGET_STACK);
     QDockWidget *watchDock = q->dockWidget(DOCKWIDGET_WATCHERS);
@@ -684,73 +697,55 @@ void DebuggerMainWindowPrivate::setSimpleDockWidgetArrangement()
     QTC_ASSERT(registerDock, return);
     QTC_ASSERT(sourceFilesDock, return);
 
-    foreach (QDockWidget *dockWidget, m_dockWidgets) {
-        if (dockWidget == outputDock /*|| dockWidget == m_consoleDock*/)
-            q->addDockWidget(Qt::TopDockWidgetArea, dockWidget);
-        else
-            q->addDockWidget(Qt::BottomDockWidgetArea, dockWidget);
-        dockWidget->hide();
-    }
-
     if (m_activeDebugLanguages.testFlag(Debugger::CppLanguage)
             && m_activeDebugLanguages.testFlag(Debugger::QmlLanguage)) {
-        // cpp + qml
-        foreach (QDockWidget *dockWidget, m_dockWidgets) {
-            if (dockWidget == outputDock)
-                q->addDockWidget(Qt::TopDockWidgetArea, dockWidget);
-            else
-                q->addDockWidget(Qt::BottomDockWidgetArea, dockWidget);
-
-            if (dockWidget == qmlInspectorDock)
-                dockWidget->show();
-            else
-                dockWidget->hide();
-        }
 
+        // cpp + qml
         stackDock->show();
         watchDock->show();
         breakDock->show();
-        threadsDock->show();
-        snapshotsDock->show();
-        qmlInspectorDock->show();
+        if (qmlInspectorDock)
+            qmlInspectorDock->show();
 
         q->splitDockWidget(q->toolBarDockWidget(), stackDock, Qt::Vertical);
-        q->splitDockWidget(stackDock, watchDock, Qt::Horizontal);
-        q->tabifyDockWidget(watchDock, breakDock);
-        q->tabifyDockWidget(watchDock, qmlInspectorDock);
+        q->splitDockWidget(stackDock, breakDock, Qt::Horizontal);
+        q->tabifyDockWidget(stackDock, snapshotsDock);
+        q->tabifyDockWidget(stackDock, threadsDock);
+        if (qmlInspectorDock)
+            q->splitDockWidget(stackDock, qmlInspectorDock, Qt::Horizontal);
 
     } else {
 
+        stackDock->show();
+        breakDock->show();
+        watchDock->show();
+        threadsDock->show();
+        snapshotsDock->show();
+
         if ((m_activeDebugLanguages.testFlag(CppLanguage)
                 && !m_activeDebugLanguages.testFlag(QmlLanguage))
             || m_activeDebugLanguages == AnyLanguage) {
-            stackDock->show();
-            breakDock->show();
-            watchDock->show();
             threadsDock->show();
             snapshotsDock->show();
         } else {
-            stackDock->show();
-            breakDock->show();
-            watchDock->show();
             scriptConsoleDock->show();
-            if (qmlInspectorDock)
-                qmlInspectorDock->show();
+            //if (qmlInspectorDock)
+            //    qmlInspectorDock->show();
         }
         q->splitDockWidget(q->toolBarDockWidget(), stackDock, Qt::Vertical);
-        q->splitDockWidget(stackDock, watchDock, Qt::Horizontal);
-        q->tabifyDockWidget(watchDock, breakDock);
-        q->tabifyDockWidget(watchDock, modulesDock);
-        q->tabifyDockWidget(watchDock, registerDock);
-        q->tabifyDockWidget(watchDock, threadsDock);
-        q->tabifyDockWidget(watchDock, sourceFilesDock);
-        q->tabifyDockWidget(watchDock, snapshotsDock);
-        q->tabifyDockWidget(watchDock, scriptConsoleDock);
-        if (qmlInspectorDock)
-            q->tabifyDockWidget(watchDock, qmlInspectorDock);
+        q->splitDockWidget(stackDock, breakDock, Qt::Horizontal);
+        q->tabifyDockWidget(breakDock, modulesDock);
+        q->tabifyDockWidget(breakDock, registerDock);
+        q->tabifyDockWidget(breakDock, threadsDock);
+        q->tabifyDockWidget(breakDock, sourceFilesDock);
+        q->tabifyDockWidget(breakDock, snapshotsDock);
+        q->tabifyDockWidget(breakDock, scriptConsoleDock);
+        //if (qmlInspectorDock)
+        //    q->splitDockWidget(breakDock, qmlInspectorDock, Qt::Horizontal);
     }
 
     q->setTrackingEnabled(true);
+    q->update();
 }
 
 } // namespace Debugger

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index cbf2f69..76a49e6 100644 (file)
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2832,12 +2832,15 @@ void DebuggerPluginPrivate::extensionsInitialized()
     connect(dock->toggleViewAction(), SIGNAL(toggled(bool)),
         SLOT(sourceFilesDockToggled(bool)), Qt::QueuedConnection);
 
+    dock = m_mainWindow->createDockWidget(AnyLanguage, m_logWindow);
+    dock->setProperty(DOCKWIDGET_DEFAULT_AREA, Qt::TopDockWidgetArea);
+
     m_mainWindow->createDockWidget(CppLanguage, m_breakWindow);
     //m_mainWindow->createDockWidget(CppLanguage, m_consoleWindow);
-    m_mainWindow->createDockWidget(AnyLanguage, m_logWindow);
     m_mainWindow->createDockWidget(CppLanguage, m_snapshotWindow);
     m_mainWindow->createDockWidget(CppLanguage, m_stackWindow);
     m_mainWindow->createDockWidget(CppLanguage, m_threadsWindow);
+    m_mainWindow->createDockWidget(QmlLanguage, m_scriptConsoleWindow);
 
     QSplitter *localsAndWatchers = new Core::MiniSplitter(Qt::Vertical);
     localsAndWatchers->setObjectName(DOCKWIDGET_WATCHERS);
@@ -2849,10 +2852,10 @@ void DebuggerPluginPrivate::extensionsInitialized()
     localsAndWatchers->setStretchFactor(1, 1);
     localsAndWatchers->setStretchFactor(2, 1);
 
-    m_mainWindow->createDockWidget(CppLanguage, localsAndWatchers);
-    m_mainWindow->createDockWidget(QmlLanguage, m_scriptConsoleWindow);
+    dock = m_mainWindow->createDockWidget(CppLanguage, localsAndWatchers);
+    dock->setProperty(DOCKWIDGET_DEFAULT_AREA, Qt::RightDockWidgetArea);
 
-    m_mainWindow->readSettings();
+    //m_mainWindow->readSettings();
 
     m_debuggerSettings->readSettings();
     GdbOptionsPage::readGdbBinarySettings();