From 89371d9c177c72609c3d514ee0ee32216f649a5b Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 6 Mar 2018 08:35:17 +0100
Subject: [PATCH] Debugger: Add a "Leave Debug Mode" button to the toolbar

Arguably wrong as a concept, but the issue keeps coming back.

Change-Id: Id0b084999884c1f018e3de60bb04c5288f7031ad
Task-number: QTCREATORBUG-1214
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/debugger/debuggermainwindow.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index f071700ea27..0c87b00a13d 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -34,6 +34,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/findplaceholder.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/modemanager.h>
 #include <coreplugin/navigationwidget.h>
 #include <coreplugin/outputpane.h>
 #include <coreplugin/rightpane.h>
@@ -43,6 +44,7 @@
 #include <utils/styledbar.h>
 #include <utils/qtcassert.h>
 #include <utils/proxyaction.h>
+#include <utils/utilsicons.h>
 
 #include <QAction>
 #include <QComboBox>
@@ -185,6 +187,10 @@ void DebuggerMainWindow::finalizeSetup()
     auto viewButton = new QToolButton;
     viewButton->setText(tr("&Views"));
 
+    auto closeButton = new QToolButton();
+    closeButton->setIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon());
+    closeButton->setToolTip(tr("Leave Debug Mode"));
+
     auto toolbar = new Utils::StyledBar;
     toolbar->setProperty("topBorder", true);
     auto hbox = new QHBoxLayout(toolbar);
@@ -196,6 +202,7 @@ void DebuggerMainWindow::finalizeSetup()
     hbox->addStretch(1);
     hbox->addWidget(new Utils::StyledSeparator);
     hbox->addWidget(viewButton);
+    hbox->addWidget(closeButton);
 
     connect(viewButton, &QAbstractButton::clicked, [this, viewButton] {
         QMenu menu;
@@ -203,6 +210,10 @@ void DebuggerMainWindow::finalizeSetup()
         menu.exec(viewButton->mapToGlobal(QPoint()));
     });
 
+    connect(closeButton, &QAbstractButton::clicked, [] {
+        ModeManager::activateMode(Core::Constants::MODE_EDIT);
+    });
+
     Context debugcontext(Debugger::Constants::C_DEBUGMODE);
 
     ActionContainer *viewsMenu = ActionManager::actionContainer(Core::Constants::M_WINDOW_VIEWS);