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

QmlDesigner: Show qrc mapping in debug view

Browse Source 
Change-Id: I0fcf35877042e1c3c53258f3a44ce76bd18e727d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2017-05-24 12:32:35 +02:00
parent dfce06c64d
commit ed42cae6e6
5 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/components/debugview/debugview.cpp
View File

@@ -395,7 +395,10 @@ void DebugView::instancesChildrenChanged(const QVector<ModelNode> & nodeList)
void DebugView::customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data)
{
if (isDebugViewEnabled()) {
if (identifier == "PuppetStatus" && data.count() == 1) {
m_debugViewWidget->setPuppetStatus(data.first().toString());
} else if (isDebugViewEnabled()) {
QTextStream message;
QString string;
message.setString(&string);

5
src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp
View File

@@ -87,6 +87,11 @@ void DebugViewWidget::addLogInstanceMessage(const QString &topic, const QString
}
}
void DebugViewWidget::setPuppetStatus(const QString &text)
{
m_ui.instanceStatus->setPlainText(text);
}
void DebugViewWidget::setDebugViewEnabled(bool b)
{
if (m_ui.enabledCheckBox->isChecked() != b)

1
src/plugins/qmldesigner/components/debugview/debugviewwidget.h
View File

@@ -42,6 +42,7 @@ public:
void addLogMessage(const QString &topic, const QString &message, bool highlight = false);
void addErrorMessage(const QString &topic, const QString &message);
void addLogInstanceMessage(const QString &topic, const QString &message, bool highlight = false);
void setPuppetStatus(const QString &text);
void setDebugViewEnabled(bool b);

20
src/plugins/qmldesigner/components/debugview/debugviewwidget.ui
View File

@@ -29,7 +29,7 @@
<item row="0" column="0">
<widget class="QTabWidget" name="instanceLog_2">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@@ -130,7 +130,7 @@
<property name="spacing">
<number>2</number>
</property>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QPlainTextEdit" name="instanceLog">
<property name="readOnly">
<bool>true</bool>
@@ -187,6 +187,22 @@
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QPlainTextEdit" name="instanceStatus">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>42</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">

4
src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
View File

@@ -32,6 +32,7 @@
#include <qmldesignerplugin.h>
#endif
#include <nodeinstanceview.h>
#include <projectexplorer/kit.h>
#include <projectexplorer/project.h>
@@ -461,6 +462,9 @@ QProcessEnvironment PuppetCreator::processEnvironment() const
if (!m_qrcMapping.isEmpty()) {
environment.set(QLatin1String("QMLDESIGNER_RC_PATHS"), m_qrcMapping);
}
#ifndef QMLDESIGNER_TEST
QmlDesignerPlugin::instance()->viewManager().nodeInstanceView()->emitCustomNotification("PuppetStatus", {}, {QVariant(m_qrcMapping)});
#endif
QStringList importPaths = m_model->importPaths();