summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2009-10-27 07:51:34 (GMT)
committerBea Lam <bea.lam@nokia.com>2009-10-27 07:51:34 (GMT)
commit8f4b6a6cdd6243a4f099c5e8634d213629637709 (patch)
tree9838d5591a09246a2cea3507422c1a0d36b6be11 /tools
parent8df0b615766e6fa44a0ec45938f297a039d5060f (diff)
downloadQt-8f4b6a6cdd6243a4f099c5e8634d213629637709.zip
Qt-8f4b6a6cdd6243a4f099c5e8634d213629637709.tar.gz
Qt-8f4b6a6cdd6243a4f099c5e8634d213629637709.tar.bz2
Fix context so files can be saved in Inspector mode, and colour
Inspector output differently from appplication output.
Diffstat (limited to 'tools')
-rw-r--r--tools/qmldebugger/creatorplugin/inspectoroutputpane.cpp2
-rw-r--r--tools/qmldebugger/creatorplugin/qmlinspectormode.cpp4
-rw-r--r--tools/qmldebugger/creatorplugin/qmlinspectorplugin.cpp13
3 files changed, 9 insertions, 10 deletions
diff --git a/tools/qmldebugger/creatorplugin/inspectoroutputpane.cpp b/tools/qmldebugger/creatorplugin/inspectoroutputpane.cpp
index d3f9913..5023e3e 100644
--- a/tools/qmldebugger/creatorplugin/inspectoroutputpane.cpp
+++ b/tools/qmldebugger/creatorplugin/inspectoroutputpane.cpp
@@ -102,7 +102,9 @@ void InspectorOutputPane::addErrorOutput(RunControl *, const QString &text)
void InspectorOutputPane::addInspectorStatus(const QString &text)
{
+ m_textEdit->setTextColor(Qt::darkGreen);
m_textEdit->append(text);
m_textEdit->moveCursor(QTextCursor::End);
+ m_textEdit->setTextColor(Qt::black);
}
diff --git a/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp b/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp
index 9367b19..aec661c 100644
--- a/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp
+++ b/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp
@@ -168,7 +168,7 @@ void QmlInspectorMode::connectionStateChanged()
switch (m_conn->state()) {
default:
case QAbstractSocket::UnconnectedState:
- emit statusMessage(tr("[Inspector] disconnected\n\n"));
+ emit statusMessage(tr("[Inspector] disconnected.\n\n"));
m_addressEdit->setEnabled(true);
m_portSpinBox->setEnabled(true);
break;
@@ -180,7 +180,7 @@ void QmlInspectorMode::connectionStateChanged()
break;
case QAbstractSocket::ConnectedState:
{
- emit statusMessage(tr("[Inspector] connected\n"));
+ emit statusMessage(tr("[Inspector] connected.\n"));
m_addressEdit->setEnabled(false);
m_portSpinBox->setEnabled(false);
diff --git a/tools/qmldebugger/creatorplugin/qmlinspectorplugin.cpp b/tools/qmldebugger/creatorplugin/qmlinspectorplugin.cpp
index c743974..5108c35 100644
--- a/tools/qmldebugger/creatorplugin/qmlinspectorplugin.cpp
+++ b/tools/qmldebugger/creatorplugin/qmlinspectorplugin.cpp
@@ -55,18 +55,15 @@ bool QmlInspectorPlugin::initialize(const QStringList &arguments, QString *error
Core::ICore *core = Core::ICore::instance();
Core::UniqueIDManager *uidm = core->uniqueIDManager();
- QList<int> modeContext;
- modeContext.append(uidm->uniqueIdentifier(QmlInspector::Constants::C_INSPECTOR));
-
- QList<int> inspectorContext;
- inspectorContext.append(uidm->uniqueIdentifier(Core::Constants::C_EDITORMANAGER));
- inspectorContext.append(uidm->uniqueIdentifier(QmlInspector::Constants::C_INSPECTOR));
- inspectorContext.append(uidm->uniqueIdentifier(Core::Constants::C_NAVIGATION_PANE));
+ QList<int> context;
+ context.append(uidm->uniqueIdentifier(QmlInspector::Constants::C_INSPECTOR));
+ context.append(uidm->uniqueIdentifier(Core::Constants::C_EDITORMANAGER));
+ context.append(uidm->uniqueIdentifier(Core::Constants::C_NAVIGATION_PANE));
m_inspectMode = new QmlInspectorMode(this);
connect(m_inspectMode, SIGNAL(startViewer()), SLOT(startViewer()));
connect(m_inspectMode, SIGNAL(stopViewer()), SLOT(stopViewer()));
- m_inspectMode->setContext(modeContext);
+ m_inspectMode->setContext(context);
addObject(m_inspectMode);
m_outputPane = new InspectorOutputPane;