diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-12-09 11:32:48 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-12-13 13:15:18 +0000 |
| commit | 43dbed991937dcc582a2d9626eb4b1d492ab3c5d (patch) | |
| tree | df276219a11ac05f1e819c1cd71f20e9e9c6f7dc /src/plugins/debugger/console/console.cpp | |
| parent | 697b612a88a4d8da66988e484f595823668db8ef (diff) | |
| download | qt-creator-43dbed991937dcc582a2d9626eb4b1d492ab3c5d.tar.gz | |
Revert "Debugger: Remove 'Context' label in debugger console"
As we can have a context again now, we should be able to show it.
This reverts commit 8679a7caa6d5eedd062e6d194ae3a5e74976f88e.
Task-number: QTCREATORBUG-17177
Change-Id: I221628dc91af839be867cc1bf8dfe5d5163fd321
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/debugger/console/console.cpp')
| -rw-r--r-- | src/plugins/debugger/console/console.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp index d75e7caa8b..a4849b9d0e 100644 --- a/src/plugins/debugger/console/console.cpp +++ b/src/plugins/debugger/console/console.cpp @@ -144,6 +144,8 @@ Console::Console() m_spacer = new QWidget(m_consoleWidget); m_spacer->setMinimumWidth(30); + m_statusLabel = new QLabel(m_consoleWidget); + readSettings(); connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested, this, &Console::writeSettings); @@ -162,7 +164,8 @@ QWidget *Console::outputWidget(QWidget *) QList<QWidget *> Console::toolBarWidgets() const { - return { m_showDebugButton, m_showWarningButton, m_showErrorButton, m_spacer }; + return { m_showDebugButton, m_showWarningButton, m_showErrorButton, + m_spacer, m_statusLabel }; } int Console::priorityInStatusBar() const @@ -230,6 +233,11 @@ void Console::readSettings() m_showErrorButtonAction->readSettings(settings); } +void Console::setContext(const QString &context) +{ + m_statusLabel->setText(context); +} + void Console::writeSettings() const { QSettings *settings = Core::ICore::settings(); @@ -241,6 +249,8 @@ void Console::writeSettings() const void Console::setScriptEvaluator(const ScriptEvaluator &evaluator) { m_scriptEvaluator = evaluator; + if (!m_scriptEvaluator) + setContext(QString()); } void Console::printItem(ConsoleItem::ItemType itemType, const QString &text) |