From fca682a16be06fd6f55743b99186150cd2193c69 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 13 Feb 2017 16:52:04 +0100 Subject: [PATCH] fix(app): remove useless animations and reworking --- linphone-desktop/resources.qrc | 3 +-- .../{ => Animations}/BusyIndicatorStyle.qml | 0 .../Animations/CaterpillarAnimationStyle.qml | 21 ------------------- .../ui/modules/Common/Styles/qmldir | 4 +--- 4 files changed, 2 insertions(+), 26 deletions(-) rename linphone-desktop/ui/modules/Common/Styles/{ => Animations}/BusyIndicatorStyle.qml (100%) delete mode 100644 linphone-desktop/ui/modules/Common/Styles/Animations/CaterpillarAnimationStyle.qml diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc index 5bafe5aa5..ba20323cc 100644 --- a/linphone-desktop/resources.qrc +++ b/linphone-desktop/resources.qrc @@ -210,8 +210,7 @@ ui/modules/Common/qmldir ui/modules/Common/SearchBox.qml ui/modules/Common/SmartConnect.qml - ui/modules/Common/Styles/Animations/CaterpillarAnimationStyle.qml - ui/modules/Common/Styles/BusyIndicatorStyle.qml + ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml ui/modules/Common/Styles/CollapseStyle.qml ui/modules/Common/Styles/DialogStyle.qml ui/modules/Common/Styles/DroppableTextAreaStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/BusyIndicatorStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/BusyIndicatorStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Animations/CaterpillarAnimationStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Animations/CaterpillarAnimationStyle.qml deleted file mode 100644 index dfa85b9dc..000000000 --- a/linphone-desktop/ui/modules/Common/Styles/Animations/CaterpillarAnimationStyle.qml +++ /dev/null @@ -1,21 +0,0 @@ -pragma Singleton -import QtQuick 2.7 - -import Common 1.0 - -// ============================================================================= - -QtObject { - property int nSpheres: 3 - property int spacing: 6 - - property QtObject animation: QtObject { - property int duration: 200 - property int space: 10 - } - - property QtObject sphere: QtObject { - property color color: Colors.x - property int size: 10 - } -} diff --git a/linphone-desktop/ui/modules/Common/Styles/qmldir b/linphone-desktop/ui/modules/Common/Styles/qmldir index 5e4ed5a33..56ea84b58 100644 --- a/linphone-desktop/ui/modules/Common/Styles/qmldir +++ b/linphone-desktop/ui/modules/Common/Styles/qmldir @@ -4,9 +4,7 @@ module Common.Styles # Components styles ------------------------------------------------------------ -singleton BusyIndicatorStyle 1.0 BusyIndicatorStyle.qml - -singleton CaterpillarAnimationStyle 1.0 Animations/CaterpillarAnimationStyle.qml +singleton BusyIndicatorStyle 1.0 Animations/BusyIndicatorStyle.qml singleton CollapseStyle 1.0 CollapseStyle.qml