diff options
| author | Kama Wójcik <kama.wojcik@qt.io> | 2021-06-28 15:12:42 +0200 |
|---|---|---|
| committer | Kama Wójcik <kama.wojcik@qt.io> | 2021-06-28 14:56:37 +0000 |
| commit | 45b41a04c392a61e44a05c501d313cc6100eebc2 (patch) | |
| tree | 1d8b663a71ede3e67ebb546cb44cc06a4a3e7859 | |
| parent | 20533cc3986f9f118762b3e22da7dbb9cbf23609 (diff) | |
| download | qt-creator-45b41a04c392a61e44a05c501d313cc6100eebc2.tar.gz | |
QmlDesigner: Fix layout and tooltip
* Fix layout for AnimatedImage
* Fix tooltip for Animation section
Change-Id: Ibdcc2e34317555396ad51fbf873dfcee1adbcf55
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnimatedImageSpecifics.qml | 42 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnimationSection.qml | 2 |
2 files changed, 21 insertions, 23 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnimatedImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnimatedImageSpecifics.qml index 6c59408a58..1d4e8fe87c 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnimatedImageSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnimatedImageSpecifics.qml @@ -34,11 +34,11 @@ Column { anchors.right: parent.right ImageSection { - caption: qsTr("Animated Image") + caption: qsTr("Image") } Section { - caption: qsTr("Animation Settings") + caption: qsTr("Animated image") anchors.left: parent.left anchors.right: parent.right @@ -62,40 +62,38 @@ Column { enabled: backendValues.speed.isAvailable } + // TODO convert to % and add % label after the spin box + ExpandingSpacer {} } PropertyLabel { - text: qsTr("Paused") - tooltip: qsTr("Whether the animated image is paused.") - disabledState: !backendValues.paused.isAvailable + text: qsTr("Playing") + tooltip: qsTr("Whether the animation is playing and/or paused.") + disabledState: !backendValues.playing.isAvailable && !backendValues.paused.isAvailable } SecondColumnLayout { CheckBox { - text: backendValues.paused.valueToString + text: StudioTheme.Constants.play implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - backendValue: backendValues.paused - enabled: backendValues.paused.isAvailable + + StudioTheme.Values.actionIndicatorWidth + backendValue: backendValues.playing + enabled: backendValue.isAvailable + fontFamily: StudioTheme.Constants.iconFont.family + fontPixelSize: StudioTheme.Values.myIconFontSize } - ExpandingSpacer {} - } + Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap } - PropertyLabel { - text: qsTr("Playing") - tooltip: qsTr("Whether the animated image is playing.") - disabledState: !backendValues.playing.isAvailable - } - - SecondColumnLayout { CheckBox { - text: backendValues.playing.valueToString + text: StudioTheme.Constants.pause implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - backendValue: backendValues.playing - enabled: backendValues.playing.isAvailable + + StudioTheme.Values.actionIndicatorWidth + backendValue: backendValues.paused + enabled: backendValue.isAvailable + fontFamily: StudioTheme.Constants.iconFont.family + fontPixelSize: StudioTheme.Values.myIconFontSize } ExpandingSpacer {} diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnimationSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnimationSection.qml index cdbf07307d..e671c73165 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnimationSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnimationSection.qml @@ -42,7 +42,7 @@ Section { SectionLayout { PropertyLabel { text: qsTr("Running") - tooltip: qsTr("Whether the animation is running and paused.") + tooltip: qsTr("Whether the animation is running and/or paused.") } SecondColumnLayout { |