From 13ba063696381be0a223b2b20cf5d4e9a0937f77 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 25 Jan 2018 17:49:15 +0100 Subject: [PATCH] QmlProfiler: Fix translations and tests for statistics view The statistics view is not called "events" anymore. Task-number: QTCREATORBUG-19658 Change-Id: Iff4375d3dc0cf5d82d118244698887818f924c07 Reviewed-by: Robert Loehning --- share/qtcreator/translations/qtcreator_cs.ts | 2 +- share/qtcreator/translations/qtcreator_fr.ts | 2 +- share/qtcreator/translations/qtcreator_uk.ts | 2 +- .../qtcreator/translations/qtcreator_zh_CN.ts | 2 +- .../qtcreator/translations/qtcreator_zh_TW.ts | 2 +- .../qmlprofiler/qmlprofilerstatisticsview.cpp | 34 +++++++++---------- tests/system/objects.map | 2 +- .../suite_debugger/tst_simple_analyze/test.py | 2 +- 8 files changed, 23 insertions(+), 25 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 0ef506e5575..0b0ad9d1447 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -57589,7 +57589,7 @@ Má se to zkusit ještě jednou? - QmlProfiler::Internal::QmlProfilerEventsMainView + QmlProfiler::Internal::QmlProfilerStatisticsMainView Location Umístění diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 3469e6780ed..16d3b304730 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -58942,7 +58942,7 @@ Voulez-vous la tuer ? - QmlProfiler::Internal::QmlProfilerEventsMainView + QmlProfiler::Internal::QmlProfilerStatisticsMainView Location Emplacement diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 33c48c0773e..8a20f959d43 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -30492,7 +30492,7 @@ Do you want to kill it? - QmlProfiler::Internal::QmlProfilerEventsMainView + QmlProfiler::Internal::QmlProfilerStatisticsMainView Location Розташування diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 1cc26a1ef98..74d7dac92c2 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -55655,7 +55655,7 @@ Do you want to retry? - QmlProfiler::Internal::QmlProfilerEventsMainView + QmlProfiler::Internal::QmlProfilerStatisticsMainView Location 路径 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index bc117ee0ce2..4e1339a0cde 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -32076,7 +32076,7 @@ Do you want to kill it? - QmlProfiler::Internal::QmlProfilerEventsMainView + QmlProfiler::Internal::QmlProfilerStatisticsMainView Location 位置 diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp index b603def7ba7..e415ec2f19e 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp @@ -107,41 +107,39 @@ static void setViewDefaults(Utils::TreeView *view) static QString displayHeader(Fields header) { - static const char ctxt[] = "QmlProfiler::Internal::QmlProfilerEventsMainView"; - switch (header) { case Callee: - return QCoreApplication::translate(ctxt, "Callee"); + return QmlProfilerStatisticsMainView::tr("Callee"); case CalleeDescription: - return QCoreApplication::translate(ctxt, "Callee Description"); + return QmlProfilerStatisticsMainView::tr("Callee Description"); case Caller: - return QCoreApplication::translate(ctxt, "Caller"); + return QmlProfilerStatisticsMainView::tr("Caller"); case CallerDescription: - return QCoreApplication::translate(ctxt, "Caller Description"); + return QmlProfilerStatisticsMainView::tr("Caller Description"); case CallCount: - return QCoreApplication::translate(ctxt, "Calls"); + return QmlProfilerStatisticsMainView::tr("Calls"); case Details: - return QCoreApplication::translate(ctxt, "Details"); + return QmlProfilerStatisticsMainView::tr("Details"); case Location: - return QCoreApplication::translate(ctxt, "Location"); + return QmlProfilerStatisticsMainView::tr("Location"); case MaxTime: - return QCoreApplication::translate(ctxt, "Longest Time"); + return QmlProfilerStatisticsMainView::tr("Longest Time"); case TimePerCall: - return QCoreApplication::translate(ctxt, "Mean Time"); + return QmlProfilerStatisticsMainView::tr("Mean Time"); case SelfTime: - return QCoreApplication::translate(ctxt, "Self Time"); + return QmlProfilerStatisticsMainView::tr("Self Time"); case SelfTimeInPercent: - return QCoreApplication::translate(ctxt, "Self Time in Percent"); + return QmlProfilerStatisticsMainView::tr("Self Time in Percent"); case MinTime: - return QCoreApplication::translate(ctxt, "Shortest Time"); + return QmlProfilerStatisticsMainView::tr("Shortest Time"); case TimeInPercent: - return QCoreApplication::translate(ctxt, "Time in Percent"); + return QmlProfilerStatisticsMainView::tr("Time in Percent"); case TotalTime: - return QCoreApplication::translate(ctxt, "Total Time"); + return QmlProfilerStatisticsMainView::tr("Total Time"); case Type: - return QCoreApplication::translate(ctxt, "Type"); + return QmlProfilerStatisticsMainView::tr("Type"); case MedianTime: - return QCoreApplication::translate(ctxt, "Median Time"); + return QmlProfilerStatisticsMainView::tr("Median Time"); default: return QString(); } diff --git a/tests/system/objects.map b/tests/system/objects.map index 56d1a346b9a..388424259bd 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -62,7 +62,7 @@ :Dialog_Debugger::Internal::SymbolPathsDialog {name='Debugger__Internal__SymbolPathsDialog' type='Debugger::Internal::SymbolPathsDialog' visible='1' windowTitle='Dialog'} :Dialog_QmlJSEditor::Internal::ComponentNameDialog {name='QmlJSEditor__Internal__ComponentNameDialog' type='QmlJSEditor::Internal::ComponentNameDialog' visible='1' windowTitle='Move Component into Separate File'} :Edit Environment_ProjectExplorer::EnvironmentItemsDialog {type='ProjectExplorer::EnvironmentItemsDialog' unnamed='1' visible='1' windowTitle='Edit Environment'} -:Events.QmlProfilerEventsTable_QmlProfiler::Internal::QmlProfilerEventsMainView {container=':Qt Creator.Events_QDockWidget' name='QmlProfilerEventsTable' type='QmlProfiler::Internal::QmlProfilerStatisticsMainView' visible='1'} +:Events.QmlProfilerEventsTable_QmlProfiler::Internal::QmlProfilerStatisticsMainView {container=':Qt Creator.Events_QDockWidget' name='QmlProfilerEventsTable' type='QmlProfiler::Internal::QmlProfilerStatisticsMainView' visible='1'} :Executable:_Utils::PathChooser {buddy=':scrollArea.Executable:_QLabel' type='Utils::PathChooser' unnamed='1' visible='1'} :Failed to start application_QMessageBox {type='QMessageBox' unnamed='1' visible='1' windowTitle='Failed to start application'} :File has been removed.Close_QPushButton {text='Close' type='QPushButton' unnamed='1' visible='1' window=':File has been removed_QMessageBox'} diff --git a/tests/system/suite_debugger/tst_simple_analyze/test.py b/tests/system/suite_debugger/tst_simple_analyze/test.py index 5de123db4d5..07166a8bf4d 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/test.py +++ b/tests/system/suite_debugger/tst_simple_analyze/test.py @@ -107,7 +107,7 @@ def performTest(workingDir, projectName, targetCount, availableConfigs): (colPercent, colTotal, colSelfPercent, colSelf, colCalls, colMean, colMedian, colLongest, colShortest) = range(2, 11) model = waitForObject(":Events.QmlProfilerEventsTable_QmlProfiler::" - "Internal::QmlProfilerEventsMainView").model() + "Internal::QmlProfilerStatisticsMainView").model() compareEventsTab(model, "events_qt5.tsv") test.compare(dumpItems(model, column=colPercent)[0], '100.00 %') # cannot run following test on colShortest (unstable)