diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp index 3534dc13338..19b49711ab6 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.cpp +++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp @@ -68,7 +68,7 @@ DebugView::~DebugView() void DebugView::modelAttached(Model *model) { - log(tr("Model attached"), tr("Filename %1").arg(model->fileUrl().toLocalFile())); + log("::modelAttached:", QString("filename %1").arg(model->fileUrl().toLocalFile())); m_debugViewWidget->setDebugViewEnabled(isDebugViewEnabled()); if (isDebugViewEnabled()) qDebug() << tr("Debug view is enabled"); @@ -77,7 +77,7 @@ void DebugView::modelAttached(Model *model) void DebugView::modelAboutToBeDetached(Model *model) { - log(tr("Model detached"), tr("Filename %1").arg(model->fileUrl().toLocalFile())); + log("::modelAboutToBeDetached:", QString("filename %1").arg(model->fileUrl().toLocalFile())); AbstractView::modelAboutToBeDetached(model); } @@ -85,17 +85,17 @@ void DebugView::importsChanged(const QList &addedImports, const QList &propertyL foreach (const VariantProperty &property, propertyList) { message << property; } - log(tr("Variant properties changed:"), string); + log("::variantPropertiesChanged:", string); } } @@ -187,7 +187,7 @@ void DebugView::bindingPropertiesChanged(const QList &propertyL foreach (const BindingProperty &property, propertyList) { message << property; } - log(tr("Binding properties changed:"), string); + log("::Binding properties changed:", string); } } @@ -200,7 +200,7 @@ void DebugView::signalHandlerPropertiesChanged(const QVector &selectedNodes /*sel foreach (const VariantProperty &property, selectedNode.variantProperties()) { message << property; } - log(tr("Node selected:"), string); + log("::selectedNodesChanged:", string); } } @@ -245,7 +245,7 @@ void DebugView::propertiesRemoved(const QList &propertyList) foreach (const AbstractProperty &property, propertyList) { message << property; } - log(tr("Properties removed:"), string); + log("::propertiesRemoved:", string); } } @@ -260,20 +260,20 @@ void DebugView::auxiliaryDataChanged(const ModelNode &node, const PropertyName & message << name; message << data.toString(); - log(tr("Auxiliary data changed:"), string); + log("::auxiliaryDataChanged:", string); } } void DebugView::rewriterBeginTransaction() { if (isDebugViewEnabled()) - log(tr("Begin rewriter transaction"), QString(), true); + log("::rewriterBeginTransaction:", QString(), true); } void DebugView::rewriterEndTransaction() { if (isDebugViewEnabled()) - log(tr("End rewriter transaction"), QString(), true); + log("::rewriterEndTransaction:", QString(), true); } WidgetInfo DebugView::widgetInfo() @@ -304,7 +304,7 @@ void DebugView::instancePropertyChanged(const QList &completedNodeList) foreach (const ModelNode &modelNode, completedNodeList) { message << modelNode << lineBreak; if (QmlItemNode::isValidQmlItemNode(modelNode)) { - message << tr("parent: ") << QmlItemNode(modelNode).instanceParent() << lineBreak; + message << "parent: " << QmlItemNode(modelNode).instanceParent() << lineBreak; } } - logInstance(tr("Instance completed"), string); + logInstance(":instancesCompleted::", string); } } @@ -342,7 +342,7 @@ void DebugView::instanceInformationsChanged(const QMultiHash & nodeList) foreach (const ModelNode &modelNode, nodeList) { message << modelNode << lineBreak; if (QmlItemNode::isValidQmlItemNode(modelNode)) { - message << tr("parent: ") << QmlItemNode(modelNode).instanceParent() << lineBreak; + message << "parent: " << QmlItemNode(modelNode).instanceParent() << lineBreak; } } - logInstance(tr("Instance's children changed:"), string); + logInstance("::instancesChildrenChanged:", string); } } @@ -390,7 +390,7 @@ void DebugView::customNotification(const AbstractView *view, const QString &iden message << variant.toString(); } - log(tr("Custom notification:"), string); + log("::customNotification:", string); } } @@ -404,7 +404,7 @@ void DebugView::nodeSourceChanged(const ModelNode &modelNode, const QString &new message << modelNode; message << newNodeSource; - log(tr("Node source changed:"), string); + log("::nodeSourceChanged:", string); } } @@ -417,7 +417,7 @@ void DebugView::nodeRemoved(const ModelNode &removedNode, const NodeAbstractProp message << removedNode; - log(tr("Node removed:"), string); + log("::nodeRemoved:", string); } } diff --git a/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp b/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp index fa67c6ca763..637bdf8f435 100644 --- a/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp +++ b/src/plugins/qmldesigner/components/debugview/debugviewwidget.cpp @@ -67,16 +67,22 @@ void DebugViewWidget::addErrorMessage(const QString &topic, const QString &messa void DebugViewWidget::addLogInstanceMessage(const QString &topic, const QString &message, bool highlight) { if (highlight) { - m_ui.instanceLog->appendHtml(QStringLiteral("") - + topic - + QStringLiteral("
") - + message); + m_ui.instanceLog->appendHtml("" + + topic + + "
" + + "

" + + message + + "

" + + "
"); } else { - m_ui.instanceLog->appendHtml(QStringLiteral("") - + topic - + QStringLiteral("
") - + message); + m_ui.instanceLog->appendHtml("" + + topic + + "
" + + "

" + + message + + "

" + + "
"); } }