From 4b0f20f777b9d03dfec7925d86d3af0872e67ff5 Mon Sep 17 00:00:00 2001 From: Knud Dollereder Date: Wed, 25 May 2022 12:50:54 +0200 Subject: [PATCH] Make timeline animations visible in the navigator The timeline and timeline-animation is now visible in the Navigator regardless of the "Show only visible" filter setting. Also assigned icons to timeline, timeline-animation, keyframe and keyframe-group Fixes: QDS-6965 Change-Id: I85a735a3a1811dd783c98422358492fd4b71f61f Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: Thomas Hartmann --- .../qtquickplugin/images/keyframe-16px.png | Bin 0 -> 190 bytes .../qtquickplugin/images/timeline-16px.png | Bin 0 -> 389 bytes .../images/timeline-animation-16px.png | Bin 0 -> 389 bytes .../qtquickplugin/qtquickplugin.qrc | 3 + .../qmldesigner/qtquickplugin/quick.metainfo | 55 ++++++++++++++++++ 5 files changed, 58 insertions(+) create mode 100644 src/plugins/qmldesigner/qtquickplugin/images/keyframe-16px.png create mode 100644 src/plugins/qmldesigner/qtquickplugin/images/timeline-16px.png create mode 100644 src/plugins/qmldesigner/qtquickplugin/images/timeline-animation-16px.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/keyframe-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/keyframe-16px.png new file mode 100644 index 0000000000000000000000000000000000000000..6e1c9f912a28c5e287a29e9b5ec6991f98a27055 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdoVYd_r6q7#LPy01nljr3?%V zY$ZW{!3>NYeN(2tK6bv1fq@~&)5S4_BU<&uM&1So9%cu79f!&Dx@pD@W;ayE@y>rSQPGj^T;>STmP_#0jm$U3%5&~ a{69Sr#gm)Y++|>3VDNPHb6Mw<&;$SnPDAGa literal 0 HcmV?d00001 diff --git a/src/plugins/qmldesigner/qtquickplugin/images/timeline-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/timeline-16px.png new file mode 100644 index 0000000000000000000000000000000000000000..d4ecf00031f09ee20882ac301eb663031c71c0e4 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7eLP(pLo9lGFK_gl5-7m> zAm2P9VbN`eCLy7W4a*J$1O<5X9u<+|;+Br`sA$an#>msDds5d#U;%^XngxyF24Zce z92lj1R8}AT=dD*>-?MzynKPE(&-mmyH%T4sd?=SXwPh&i1gEOU`%q8>dg$Z$4(V>D1XU zua~~@3l?wRaQD=w?^2gk^SbWro^q*Vv(;6bxUg4?BQJ-aadqKVzHuUpe?!>3LfN-E zrqY7TBlk8Yp9x*LdD(7>^N+gc@Cbf%&wsf6@6rRIV)lNTwniQ5ku|YgPxSc~#@>9_ zZ_pebdERqpbNi2`jXJe0&NfH0dD6E&wPu=nLdfn)g#JfK?x!3|kCg98?Wy*R>*{#d u(0t~k@tUNKo9fqo7r&QmthDQccx^zkwfvLoZy6XE7(8A5T-G@yGywoYpQ&j8 literal 0 HcmV?d00001 diff --git a/src/plugins/qmldesigner/qtquickplugin/images/timeline-animation-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/timeline-animation-16px.png new file mode 100644 index 0000000000000000000000000000000000000000..d4ecf00031f09ee20882ac301eb663031c71c0e4 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7eLP(pLo9lGFK_gl5-7m> zAm2P9VbN`eCLy7W4a*J$1O<5X9u<+|;+Br`sA$an#>msDds5d#U;%^XngxyF24Zce z92lj1R8}AT=dD*>-?MzynKPE(&-mmyH%T4sd?=SXwPh&i1gEOU`%q8>dg$Z$4(V>D1XU zua~~@3l?wRaQD=w?^2gk^SbWro^q*Vv(;6bxUg4?BQJ-aadqKVzHuUpe?!>3LfN-E zrqY7TBlk8Yp9x*LdD(7>^N+gc@Cbf%&wsf6@6rRIV)lNTwniQ5ku|YgPxSc~#@>9_ zZ_pebdERqpbNi2`jXJe0&NfH0dD6E&wPu=nLdfn)g#JfK?x!3|kCg98?Wy*R>*{#d u(0t~k@tUNKo9fqo7r&QmthDQccx^zkwfvLoZy6XE7(8A5T-G@yGywoYpQ&j8 literal 0 HcmV?d00001 diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc index 0098d05a37d..7cdc3309cba 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc @@ -95,5 +95,8 @@ images/video-output-16px.png images/video-output-24px.png images/video-output-24px@2x.png + images/timeline-16px.png + images/keyframe-16px.png + images/timeline-animation-16px.png diff --git a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo index d21d8420b4b..4b766f715c1 100644 --- a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo +++ b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo @@ -280,6 +280,61 @@ MetaInfo { } } + Type { + name: "QtQuick.Timeline.Timeline" + icon: ":/qtquickplugin/images/timeline-16px.png" + + Hints { + visibleNonDefaultProperties: "animations" + visibleInLibrary: false + visibleInNavigator: true + } + ItemLibraryEntry { + name: "Timeline" + category: "none" + version: "1.0" + } + } + + Type { + name: "QtQuick.Timeline.TimelineAnimation" + icon: ":/qtquickplugin/images/timeline-animation-16px.png" + + Hints { + visibleInLibrary: false + visibleInNavigator: true + } + ItemLibraryEntry { + name: "Animation" + category: "none" + version: "1.0" + } + } + + Type { + name: "QtQuick.Timeline.Keyframe" + icon: ":/qtquickplugin/images/keyframe-16px.png" + + ItemLibraryEntry { + name: "Keyframe" + category: "none" + version: "1.0" + requiredImport: "none" + } + } + + Type { + name: "QtQuick.Timeline.KeyframeGroup" + icon: ":/qtquickplugin/images/keyframe-16px.png" + + ItemLibraryEntry { + name: "KeyframeGroup" + category: "none" + version: "1.0" + requiredImport: "none" + } + } + Type { name: "QtQuick.PropertyAnimation" icon: ":/qtquickplugin/images/item-icon16.png"