From ed42cae6e67982f261103f72e41ade116ce08ad1 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 24 May 2017 12:32:35 +0200
Subject: [PATCH] QmlDesigner: Show qrc mapping in debug view

Change-Id: I0fcf35877042e1c3c53258f3a44ce76bd18e727d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../components/debugview/debugview.cpp        |  5 ++++-
 .../components/debugview/debugviewwidget.cpp  |  5 +++++
 .../components/debugview/debugviewwidget.h    |  1 +
 .../components/debugview/debugviewwidget.ui   | 20 +++++++++++++++++--
 .../designercore/instances/puppetcreator.cpp  |  4 ++++
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp
index 486f0d7b576..261b7ed978c 100644
--- a/src/plugins/qmldesigner/components/debugview/debugview.cpp
+++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp
@@ -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);
diff --git a/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp b/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp
index 920ab50de5c..e7c2ceac7b3 100644
--- a/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp
+++ b/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp
@@ -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)
diff --git a/src/plugins/qmldesigner/components/debugview/debugviewwidget.h b/src/plugins/qmldesigner/components/debugview/debugviewwidget.h
index ad71227e125..12629b4c92b 100644
--- a/src/plugins/qmldesigner/components/debugview/debugviewwidget.h
+++ b/src/plugins/qmldesigner/components/debugview/debugviewwidget.h
@@ -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);
 
diff --git a/src/plugins/qmldesigner/components/debugview/debugviewwidget.ui b/src/plugins/qmldesigner/components/debugview/debugviewwidget.ui
index fc29e365669..8c88df3ec5c 100644
--- a/src/plugins/qmldesigner/components/debugview/debugviewwidget.ui
+++ b/src/plugins/qmldesigner/components/debugview/debugviewwidget.ui
@@ -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">
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
index 68bdf338c66..90f72c5d737 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
@@ -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();