diff options
Diffstat (limited to 'src/plugins/qmldesigner/qmldesignerextension')
6 files changed, 27 insertions, 27 deletions
diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineanimationform.ui b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineanimationform.ui index 8bc3e6c9737..5d13cfa7264 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineanimationform.ui +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineanimationform.ui @@ -10,14 +10,11 @@ <height>176</height> </rect> </property> - <property name="windowTitle"> - <string>Form</string> - </property> <layout class="QGridLayout" name="gridLayout"> <item row="4" column="3"> <widget class="QLabel" name="label_16"> <property name="text"> - <string>Loops</string> + <string>Loops:</string> </property> </widget> </item> @@ -117,7 +114,7 @@ </size> </property> <property name="text"> - <string>Animation ID</string> + <string>Animation ID:</string> </property> </widget> </item> @@ -162,14 +159,14 @@ <item row="5" column="1"> <widget class="QLabel" name="label_23"> <property name="text"> - <string>Finished</string> + <string>Finished:</string> </property> </widget> </item> <item row="4" column="7"> <widget class="QLabel" name="label_17"> <property name="text"> - <string>Ping Pong</string> + <string>Ping pong</string> </property> </widget> </item> @@ -205,7 +202,7 @@ </size> </property> <property name="text"> - <string>Transition to state</string> + <string>Transition to state:</string> </property> </widget> </item> @@ -222,7 +219,7 @@ <bool>true</bool> </property> <property name="text"> - <string>Running in Base State</string> + <string>Running in base state</string> </property> </widget> </item> @@ -257,7 +254,7 @@ <item row="3" column="1"> <widget class="QLabel" name="label_12"> <property name="text"> - <string>Start Frame</string> + <string>Start frame:</string> </property> </widget> </item> @@ -290,14 +287,14 @@ <item row="3" column="7"> <widget class="QLabel" name="label_14"> <property name="text"> - <string>Duration</string> + <string>Duration:</string> </property> </widget> </item> <item row="3" column="3"> <widget class="QLabel" name="label_13"> <property name="text"> - <string>End Frame</string> + <string>End frame:</string> </property> </widget> </item> diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineconstants.h b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineconstants.h index 40e4900442d..6c012beec1e 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineconstants.h +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineconstants.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. @@ -46,13 +46,13 @@ const int priorityTimelineCategory = 110; const char timelineCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Timeline"); const char timelineCopyKeyframesDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", - "Copy All Keyframes from item"); + "Copy All Keyframes"); const char timelinePasteKeyframesDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", - "Paste Keyframes to item"); + "Paste Keyframes"); const char timelineInsertKeyframesDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", - "Insert Keyframes for item"); + "Add Keyframes at Current Frame"); const char timelineDeleteKeyframesDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", - "Delete All Keyframes for item"); + "Delete All Keyframes"); const char timelineStatusBarFrameNumber[] = QT_TRANSLATE_NOOP("QmlDesignerTimeline", "Frame %1"); diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineform.ui b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineform.ui index 5eea257be19..b8b47e4c701 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineform.ui +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineform.ui @@ -10,9 +10,6 @@ <height>170</height> </rect> </property> - <property name="windowTitle"> - <string>Form</string> - </property> <layout class="QGridLayout" name="gridLayout"> <item row="1" column="8" colspan="2"> <spacer name="horizontalSpacer_11"> @@ -84,7 +81,7 @@ <item row="4" column="0"> <widget class="QLabel" name="label_8"> <property name="text"> - <string>Expression Binding</string> + <string>Expression binding:</string> </property> <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> @@ -107,7 +104,7 @@ <item row="2" column="4"> <widget class="QLabel" name="label_7"> <property name="text"> - <string>End Frame</string> + <string>End frame:</string> </property> <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> @@ -200,7 +197,7 @@ <bool>false</bool> </property> <property name="text"> - <string>Expression Binding</string> + <string>Expression binding</string> </property> </widget> </item> @@ -214,7 +211,7 @@ <item row="1" column="0"> <widget class="QLabel" name="label_5"> <property name="text"> - <string>Timeline ID</string> + <string>Timeline ID:</string> </property> <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> @@ -243,7 +240,7 @@ <item row="2" column="1"> <widget class="QLabel" name="label_6"> <property name="text"> - <string>Start Frame</string> + <string>Start frame:</string> </property> <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinepropertyitem.h b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinepropertyitem.h index 5cd241b7a33..2b8c00c59bc 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinepropertyitem.h +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinepropertyitem.h @@ -44,6 +44,8 @@ class TimelineToolButton; class TimelineKeyframeItem : public TimelineMovableAbstractItem { + Q_DECLARE_TR_FUNCTIONS(TimelineKeyframeItem) + public: explicit TimelineKeyframeItem(TimelinePropertyItem *parent, const ModelNode &frame); ~TimelineKeyframeItem() override; @@ -84,6 +86,8 @@ private: class TimelinePropertyItem : public TimelineItem { + Q_OBJECT + public: enum { Type = TimelineConstants::timelinePropertyItemUserType }; diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.h b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.h index 3c34ba39299..26db04f7579 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.h +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.h @@ -40,6 +40,8 @@ class TimelineSectionItem; class TimelineBarItem : public TimelineMovableAbstractItem { + Q_DECLARE_TR_FUNCTIONS(TimelineBarItem) + enum class Location { Undefined, Center, Left, Right }; public: diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp index 6ce3731222e..47426d97551 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp @@ -103,7 +103,7 @@ QWidget *TimelineEditorDelegate::createEditor(QWidget *parent, switch (index.column()) { case TimelineSettingsModel::TimelineRow: { QTC_ASSERT(comboBox, return widget); - comboBox->addItem(tr("None")); + comboBox->addItem(TimelineSettingsModel::tr("None")); for (const auto &timeline : timelineSettingsModel->timelineView()->getTimelines()) { if (!timeline.modelNode().id().isEmpty()) comboBox->addItem(timeline.modelNode().id()); @@ -111,7 +111,7 @@ QWidget *TimelineEditorDelegate::createEditor(QWidget *parent, } break; case TimelineSettingsModel::AnimationRow: { QTC_ASSERT(comboBox, return widget); - comboBox->addItem(tr("None")); + comboBox->addItem(TimelineSettingsModel::tr("None")); for (const auto &animation : timelineSettingsModel->timelineView()->getAnimations(qmlTimeline)) { if (!animation.id().isEmpty()) |