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

QmlDesigner: Cleanup DebugView messages

Browse Source 
These messages are purely technical and relate to implementation
details. Therefore the strings should not be translated.
We keep the original method names.

Change-Id: I3f98aea7b9df3890bca097d1e6b77789204c8e19
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2016-12-01 10:25:26 +01:00
committed by Thomas Hartmann
parent f96851077a
commit 357cefe67c
2 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ DebugView::~DebugView()
void DebugView::modelAttached(Model *model) 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()); m_debugViewWidget->setDebugViewEnabled(isDebugViewEnabled());
if (isDebugViewEnabled()) if (isDebugViewEnabled())
qDebug() << tr("Debug view is enabled"); qDebug() << tr("Debug view is enabled");
@@ -77,7 +77,7 @@ void DebugView::modelAttached(Model *model)
void DebugView::modelAboutToBeDetached(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); AbstractView::modelAboutToBeDetached(model);
} }
@@ -85,17 +85,17 @@ void DebugView::importsChanged(const QList<Import> &addedImports, const QList<Im
{ {
if (isDebugViewEnabled()) { if (isDebugViewEnabled()) {
QString message; QString message;
message += tr("Added imports:") += lineBreak; message += QString("added imports:") += lineBreak;
foreach (const Import &import, addedImports) { foreach (const Import &import, addedImports) {
message += import.toImportString() += lineBreak; message += import.toImportString() += lineBreak;
} }
message += tr("Removed imports:") += lineBreak; message += QString("removed imports:") += lineBreak;
foreach (const Import &import, removedImports) { foreach (const Import &import, removedImports) {
message += import.toImportString() += lineBreak; message += import.toImportString() += lineBreak;
} }
log(tr("Imports changed:"), message); log("::importsChanged:", message);
} }
} }
@@ -106,7 +106,7 @@ void DebugView::nodeCreated(const ModelNode &createdNode)
QString string; QString string;
message.setString(&string); message.setString(&string);
message << createdNode; message << createdNode;
log(tr("Node created:"), message.readAll()); log("::nodeCreated:", message.readAll());
} }
} }
@@ -118,10 +118,10 @@ void DebugView::nodeAboutToBeRemoved(const ModelNode &removedNode)
message.setString(&string); message.setString(&string);
message << removedNode << lineBreak; message << removedNode << lineBreak;
foreach (const ModelNode &modelNode, removedNode.allSubModelNodes()) { foreach (const ModelNode &modelNode, removedNode.allSubModelNodes()) {
message << tr("Child node:") << modelNode << lineBreak; message << "child node:" << modelNode << lineBreak;
} }
log(tr("Node about to be removed:"), message.readAll()); log("::nodeAboutToBeRemoved:", message.readAll());
} }
} }
@@ -133,16 +133,16 @@ void DebugView::nodeReparented(const ModelNode &node, const NodeAbstractProperty
QString string; QString string;
message.setString(&string); message.setString(&string);
message << node; message << node;
message << tr("New parent property:"); message << "new parent property:";
message << lineBreak; message << lineBreak;
message << newPropertyParent; message << newPropertyParent;
message << tr("Old parent property:"); message << "old parent property:";
message << lineBreak; message << lineBreak;
message << oldPropertyParent; message << oldPropertyParent;
message << tr("Property change flag"); message << "property change flag";
message << lineBreak; message << lineBreak;
message << propertyChange; message << propertyChange;
log(tr("Node reparented:"), message.readAll()); log(tr("::nodeReparented:"), message.readAll());
} }
} }
@@ -153,9 +153,9 @@ void DebugView::nodeIdChanged(const ModelNode &node, const QString &newId, const
QString string; QString string;
message.setString(&string); message.setString(&string);
message << node; message << node;
message << tr("New id:") << ' ' << newId << lineBreak; message << QString("new id:") << ' ' << newId << lineBreak;
message << tr("Old id:") << ' ' << oldId << lineBreak; message << QString("old id:") << ' ' << oldId << lineBreak;
log(tr("Node id changed:"), string); log(tr("::nodeIdChanged:"), string);
} }
} }
@@ -173,7 +173,7 @@ void DebugView::variantPropertiesChanged(const QList<VariantProperty> &propertyL
foreach (const VariantProperty &property, propertyList) { foreach (const VariantProperty &property, propertyList) {
message << property; message << property;
} }
log(tr("Variant properties changed:"), string); log("::variantPropertiesChanged:", string);
} }
} }
@@ -187,7 +187,7 @@ void DebugView::bindingPropertiesChanged(const QList<BindingProperty> &propertyL
foreach (const BindingProperty &property, propertyList) { foreach (const BindingProperty &property, propertyList) {
message << property; message << property;
} }
log(tr("Binding properties changed:"), string); log("::Binding properties changed:", string);
} }
} }
@@ -200,7 +200,7 @@ void DebugView::signalHandlerPropertiesChanged(const QVector<SignalHandlerProper
foreach (const SignalHandlerProperty &property, propertyList) { foreach (const SignalHandlerProperty &property, propertyList) {
message << property; message << property;
} }
log(tr("Signal handler properties changed:"), string); log("::signalHandlerPropertiesChanged:", string);
} }
} }
@@ -213,7 +213,7 @@ void DebugView::rootNodeTypeChanged(const QString &type, int majorVersion, int m
message += QString::number(majorVersion); message += QString::number(majorVersion);
message += QStringLiteral(" "); message += QStringLiteral(" ");
message += QString::number(minorVersion); message += QString::number(minorVersion);
log(tr("Node id changed:"), message); log("::rootNodeTypeChanged:", message);
} }
} }
@@ -228,7 +228,7 @@ void DebugView::selectedNodesChanged(const QList<ModelNode> &selectedNodes /*sel
foreach (const VariantProperty &property, selectedNode.variantProperties()) { foreach (const VariantProperty &property, selectedNode.variantProperties()) {
message << property; message << property;
} }
log(tr("Node selected:"), string); log("::selectedNodesChanged:", string);
} }
} }
@@ -245,7 +245,7 @@ void DebugView::propertiesRemoved(const QList<AbstractProperty> &propertyList)
foreach (const AbstractProperty &property, propertyList) { foreach (const AbstractProperty &property, propertyList) {
message << property; 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 << name;
message << data.toString(); message << data.toString();
log(tr("Auxiliary data changed:"), string); log("::auxiliaryDataChanged:", string);
} }
} }
void DebugView::rewriterBeginTransaction() void DebugView::rewriterBeginTransaction()
{ {
if (isDebugViewEnabled()) if (isDebugViewEnabled())
log(tr("Begin rewriter transaction"), QString(), true); log("::rewriterBeginTransaction:", QString(), true);
} }
void DebugView::rewriterEndTransaction() void DebugView::rewriterEndTransaction()
{ {
if (isDebugViewEnabled()) if (isDebugViewEnabled())
log(tr("End rewriter transaction"), QString(), true); log("::rewriterEndTransaction:", QString(), true);
} }
WidgetInfo DebugView::widgetInfo() WidgetInfo DebugView::widgetInfo()
@@ -304,7 +304,7 @@ void DebugView::instancePropertyChanged(const QList<QPair<ModelNode, PropertyNam
message << pair.second; message << pair.second;
} }
logInstance(tr("Instance property change"), string); logInstance(":instancePropertyChanged::", string);
} }
} }
@@ -322,11 +322,11 @@ void DebugView::instancesCompleted(const QVector<ModelNode> &completedNodeList)
foreach (const ModelNode &modelNode, completedNodeList) { foreach (const ModelNode &modelNode, completedNodeList) {
message << modelNode << lineBreak; message << modelNode << lineBreak;
if (QmlItemNode::isValidQmlItemNode(modelNode)) { 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<ModelNode, Informat
message << informationChangedHash.value(modelNode); message << informationChangedHash.value(modelNode);
} }
logInstance(tr("Instance information change"), string); logInstance("::instanceInformationsChanged:", string);
} }
} }
@@ -365,11 +365,11 @@ void DebugView::instancesChildrenChanged(const QVector<ModelNode> & nodeList)
foreach (const ModelNode &modelNode, nodeList) { foreach (const ModelNode &modelNode, nodeList) {
message << modelNode << lineBreak; message << modelNode << lineBreak;
if (QmlItemNode::isValidQmlItemNode(modelNode)) { 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(); 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 << modelNode;
message << newNodeSource; 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; message << removedNode;
log(tr("Node removed:"), string); log("::nodeRemoved:", string);
} }
} }

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

@@ -67,16 +67,22 @@ void DebugViewWidget::addErrorMessage(const QString &topic, const QString &messa
void DebugViewWidget::addLogInstanceMessage(const QString &topic, const QString &message, bool highlight) void DebugViewWidget::addLogInstanceMessage(const QString &topic, const QString &message, bool highlight)
{ {
if (highlight) { if (highlight) {
m_ui.instanceLog->appendHtml(QStringLiteral("<b><font color=\"blue\">") m_ui.instanceLog->appendHtml("<b><font color=\"blue\">"
+ topic + topic
+ QStringLiteral("</b><br>") + "</b><br>"
+ message); + "<p>"
+ message
+ "</p>"
+ "<br>");
} else { } else {
m_ui.instanceLog->appendHtml(QStringLiteral("<b>") m_ui.instanceLog->appendHtml("<b>"
+ topic + topic
+ QStringLiteral("</b><br>") + "</b><br>"
+ message); + "<p>"
+ message
+ "</p>"
+ "<br>");
} }
} }