diff --git a/src/plugins/qmlprofiler/qml/Detail.qml b/src/plugins/qmlprofiler/qml/Detail.qml index 4c40330182b..d37ec0cb34e 100644 --- a/src/plugins/qmlprofiler/qml/Detail.qml +++ b/src/plugins/qmlprofiler/qml/Detail.qml @@ -30,8 +30,11 @@ import QtQuick 2.1 Text { + property bool isLabel: false font.pixelSize: 12 - font.bold: index % 2 === 0 + font.bold: isLabel textFormat: Text.PlainText renderType: Text.NativeRendering + elide: Text.ElideRight + width: text === "" ? 0 : (isLabel ? 85 : 170) } diff --git a/src/plugins/qmlprofiler/qml/RangeDetails.qml b/src/plugins/qmlprofiler/qml/RangeDetails.qml index 3872335c7c0..25fcb20369a 100644 --- a/src/plugins/qmlprofiler/qml/RangeDetails.qml +++ b/src/plugins/qmlprofiler/qml/RangeDetails.qml @@ -152,6 +152,7 @@ Item { width: parent.width color: "white" renderType: Text.NativeRendering + elide: Text.ElideRight } // Details area @@ -174,7 +175,8 @@ Item { Repeater { model: eventInfo Detail { - text: content + isLabel: index % 2 === 0 + text: (content === undefined) ? "" : (isLabel ? (content + ":") : content) } } } diff --git a/src/plugins/qmlprofiler/qml/SelectionRangeDetails.qml b/src/plugins/qmlprofiler/qml/SelectionRangeDetails.qml index fdf32b3b309..7ab390ac1c5 100644 --- a/src/plugins/qmlprofiler/qml/SelectionRangeDetails.qml +++ b/src/plugins/qmlprofiler/qml/SelectionRangeDetails.qml @@ -136,14 +136,15 @@ Item { Repeater { model: [ - qsTr("Start"), + qsTr("Start") + ":", startTime, - showDuration ? qsTr("End") : "", + showDuration ? (qsTr("End") + ":") : "", showDuration ? endTime : "", - showDuration ? qsTr("Duration") : "", + showDuration ? (qsTr("Duration") + ":") : "", showDuration ? duration : "" ] Detail { + isLabel: index % 2 === 0 text: modelData } } diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp index 3482025e3c6..31996192c4f 100644 --- a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp @@ -294,10 +294,7 @@ QVariantMap RangeTimelineModel::details(int index) const result.insert(QStringLiteral("displayName"), categoryLabel(d->rangeType)); result.insert(tr("Duration"), QmlProfilerBaseModel::formatTime(range(index).duration)); - QString detailsString = types[id].data; - if (detailsString.length() > 40) - detailsString = detailsString.left(40) + QLatin1String("..."); - result.insert(tr("Details"), detailsString); + result.insert(tr("Details"), types[id].data); result.insert(tr("Location"), types[id].displayName); return result; }