feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Remove 'Context' label in debugger console

Browse Source 
This was display only, with no impact on the console operation.

Change-Id: I1c6cab13a86b574d3912ea7fca2e0f14147b828c
Task-number: QTCREATORBUG-15831
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
This commit is contained in:
hjk
2016-04-13 16:00:04 +02:00
parent 9ca3614164
commit 8679a7caa6
3 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/console/console.cpp
View File

@@ -144,8 +144,6 @@ Console::Console()
m_spacer = new QWidget(m_consoleWidget); m_spacer = new QWidget(m_consoleWidget);
m_spacer->setMinimumWidth(30); m_spacer->setMinimumWidth(30);
m_statusLabel = new QLabel(m_consoleWidget);
readSettings(); readSettings();
connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested, connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested,
this, &Console::writeSettings); this, &Console::writeSettings);
@@ -164,8 +162,7 @@ QWidget *Console::outputWidget(QWidget *)
QList<QWidget *> Console::toolBarWidgets() const QList<QWidget *> Console::toolBarWidgets() const
{ {
return { m_showDebugButton, m_showWarningButton, m_showErrorButton, return { m_showDebugButton, m_showWarningButton, m_showErrorButton, m_spacer };
m_spacer, m_statusLabel };
} }
int Console::priorityInStatusBar() const int Console::priorityInStatusBar() const
@@ -233,11 +230,6 @@ void Console::readSettings()
m_showErrorButtonAction->readSettings(settings); m_showErrorButtonAction->readSettings(settings);
} }
void Console::setContext(const QString &context)
{
m_statusLabel->setText(context);
}
void Console::writeSettings() const void Console::writeSettings() const
{ {
QSettings *settings = Core::ICore::settings(); QSettings *settings = Core::ICore::settings();
@@ -249,8 +241,6 @@ void Console::writeSettings() const
void Console::setScriptEvaluator(const ScriptEvaluator &evaluator) void Console::setScriptEvaluator(const ScriptEvaluator &evaluator)
{ {
m_scriptEvaluator = evaluator; m_scriptEvaluator = evaluator;
if (!m_scriptEvaluator)
setContext(QString());
} }
void Console::printItem(ConsoleItem::ItemType itemType, const QString &text) void Console::printItem(ConsoleItem::ItemType itemType, const QString &text)

2
src/plugins/debugger/console/console.h
View File

@@ -74,7 +74,6 @@ public:
bool canNavigate() const; bool canNavigate() const;
void readSettings(); void readSettings();
void setContext(const QString &context);
void setScriptEvaluator(const ScriptEvaluator &evaluator); void setScriptEvaluator(const ScriptEvaluator &evaluator);
@@ -92,7 +91,6 @@ private:
Utils::SavedAction *m_showWarningButtonAction; Utils::SavedAction *m_showWarningButtonAction;
Utils::SavedAction *m_showErrorButtonAction; Utils::SavedAction *m_showErrorButtonAction;
QWidget *m_spacer; QWidget *m_spacer;
QLabel *m_statusLabel;
ConsoleItemModel *m_consoleItemModel; ConsoleItemModel *m_consoleItemModel;
ConsoleView *m_consoleView; ConsoleView *m_consoleView;
QWidget *m_consoleWidget; QWidget *m_consoleWidget;

2
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -1100,8 +1100,6 @@ void QmlEngine::updateCurrentContext()
else else
context = grandParentData->name; context = grandParentData->name;
} }
debuggerConsole()->setContext(tr("Context:") + QLatin1Char(' ') + context);
} }
void QmlEngine::executeDebuggerCommand(const QString &command, DebuggerLanguages languages) void QmlEngine::executeDebuggerCommand(const QString &command, DebuggerLanguages languages)