diff --git a/containment/package/contents/ui/abilities/AnimationsPrivate.qml b/containment/package/contents/ui/abilities/AnimationsPrivate.qml index 1b00b6fda..4216c20ac 100644 --- a/containment/package/contents/ui/abilities/AnimationsPrivate.qml +++ b/containment/package/contents/ui/abilities/AnimationsPrivate.qml @@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 import org.kde.latte.core 0.2 as LatteCore import org.kde.latte.private.app 0.1 as LatteApp -import "animations" as AnimationComponents +import org.kde.latte.abilities.components.animations 0.1 as AnimationComponents Ability { property Item container: null @@ -64,13 +64,13 @@ Ability { readonly property bool hasThicknessAnimation: (needBothAxis.count>0) || (needThickness.count>0) - readonly property Item duration: Item { - readonly property int proposed: speedFactor.current * 2.8 * longDuration + readonly property Item duration: AnimationComponents.Duration { + proposed: speedFactor.current * 2.8 * longDuration } - readonly property Item speedFactor: Item { - readonly property real normal: 1.0 - readonly property real current: { + readonly property Item speedFactor: AnimationComponents.SpeedFactor { + normal: 1.0 + current: { if (!active || plasmoid.configuration.durationTime === 0) { return 0; } @@ -87,7 +87,6 @@ Ability { } } - //! animations related to parabolic effect /////!!!!!! property int hoverPixelSensitivity: { diff --git a/containment/package/contents/ui/applet/communicator/Engine.qml b/containment/package/contents/ui/applet/communicator/Engine.qml index 6477694d7..bd4e38be6 100644 --- a/containment/package/contents/ui/applet/communicator/Engine.qml +++ b/containment/package/contents/ui/applet/communicator/Engine.qml @@ -19,7 +19,7 @@ import QtQuick 2.7 -import org.kde.latte.containers.abilities 0.1 as ContainerAbility +import org.kde.latte.abilities.components 0.1 as AbilityComponents import "../../../code/AppletIdentifier.js" as AppletIdentifier @@ -52,7 +52,7 @@ Item{ //! END OF PROPERTIES //! BEGIN OF PUBLIC PROPERTIES SET THROUGH LATTEBRIDGE.ACTIONS - readonly property Item requires: ContainerAbility.AppletRequirements{} + readonly property Item requires: AbilityComponents.AppletRequirements{} //! END OF PUBLIC PROPERTIES SET THROUGH LATTEBRIDGE.ACTIONS property bool windowsTrackingEnabledSent: false diff --git a/declarativeimports/CMakeLists.txt b/declarativeimports/CMakeLists.txt index d07bf1dd4..22e164a52 100644 --- a/declarativeimports/CMakeLists.txt +++ b/declarativeimports/CMakeLists.txt @@ -1,6 +1,5 @@ add_subdirectory(core) -install(DIRECTORY applets/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/applets) +install(DIRECTORY abilities/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/abilities) install(DIRECTORY components/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/components) -install(DIRECTORY containers/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/containers) diff --git a/declarativeimports/applets/abilities/Requirements.qml b/declarativeimports/abilities/applets/Requirements.qml similarity index 96% rename from declarativeimports/applets/abilities/Requirements.qml rename to declarativeimports/abilities/applets/Requirements.qml index 551d1fa30..8874295d0 100644 --- a/declarativeimports/applets/abilities/Requirements.qml +++ b/declarativeimports/abilities/applets/Requirements.qml @@ -19,9 +19,9 @@ import QtQuick 2.0 -import org.kde.latte.containers.abilities 0.1 as ContainerAbility +import org.kde.latte.abilities.components 0.1 as AbilityComponent -ContainerAbility.AppletRequirements{ +AbilityComponent.AppletRequirements{ id: requirements readonly property bool isActive: bridge !== null diff --git a/declarativeimports/abilities/applets/qmldir b/declarativeimports/abilities/applets/qmldir new file mode 100644 index 000000000..4bae76acb --- /dev/null +++ b/declarativeimports/abilities/applets/qmldir @@ -0,0 +1,3 @@ +module org.kde.latte.abilities.applets + +Requirements 0.1 Requirements.qml diff --git a/declarativeimports/containers/abilities/AppletRequirements.qml b/declarativeimports/abilities/components/AppletRequirements.qml similarity index 100% rename from declarativeimports/containers/abilities/AppletRequirements.qml rename to declarativeimports/abilities/components/AppletRequirements.qml diff --git a/declarativeimports/abilities/components/animations/Duration.qml b/declarativeimports/abilities/components/animations/Duration.qml new file mode 100644 index 000000000..f9e369d83 --- /dev/null +++ b/declarativeimports/abilities/components/animations/Duration.qml @@ -0,0 +1,24 @@ +/* +* Copyright 2020 Michail Vourlakos +* +* This file is part of Latte-Dock +* +* Latte-Dock is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* Latte-Dock is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ + +import QtQuick 2.7 + +Item { + property int proposed: 700 +} diff --git a/declarativeimports/abilities/components/animations/SpeedFactor.qml b/declarativeimports/abilities/components/animations/SpeedFactor.qml new file mode 100644 index 000000000..af8adccdb --- /dev/null +++ b/declarativeimports/abilities/components/animations/SpeedFactor.qml @@ -0,0 +1,25 @@ +/* +* Copyright 2020 Michail Vourlakos +* +* This file is part of Latte-Dock +* +* Latte-Dock is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* Latte-Dock is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ + +import QtQuick 2.7 + +Item { + property real normal: 1.0 + property real current: 1.0 +} diff --git a/containment/package/contents/ui/abilities/animations/Tracker.qml b/declarativeimports/abilities/components/animations/Tracker.qml similarity index 100% rename from containment/package/contents/ui/abilities/animations/Tracker.qml rename to declarativeimports/abilities/components/animations/Tracker.qml diff --git a/declarativeimports/abilities/components/animations/qmldir b/declarativeimports/abilities/components/animations/qmldir new file mode 100644 index 000000000..05247cf5d --- /dev/null +++ b/declarativeimports/abilities/components/animations/qmldir @@ -0,0 +1,5 @@ +module org.kde.latte.abilities.components.animations + +Duration 0.1 Duration.qml +SpeedFactor 0.1 SpeedFactor.qml +Tracker 0.1 Tracker.qml diff --git a/declarativeimports/containers/abilities/qmldir b/declarativeimports/abilities/components/qmldir similarity index 52% rename from declarativeimports/containers/abilities/qmldir rename to declarativeimports/abilities/components/qmldir index fff279be6..2a0f2b789 100644 --- a/declarativeimports/containers/abilities/qmldir +++ b/declarativeimports/abilities/components/qmldir @@ -1,3 +1,3 @@ -module org.kde.latte.containers.abilities +module org.kde.latte.abilities.components AppletRequirements 0.1 AppletRequirements.qml diff --git a/declarativeimports/applets/abilities/qmldir b/declarativeimports/applets/abilities/qmldir deleted file mode 100644 index adb4dd686..000000000 --- a/declarativeimports/applets/abilities/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module org.kde.latte.applets.abilities - -Requirements 0.1 Requirements.qml diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index 6d8a55e12..934a21a35 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -33,7 +33,7 @@ import org.kde.activities 0.1 as Activities import org.kde.latte.core 0.2 as LatteCore import org.kde.latte.components 1.0 as LatteComponents -import org.kde.latte.applets.abilities 0.1 as AppletAbility +import org.kde.latte.abilities.applets 0.1 as AppletAbility import org.kde.latte.private.tasks 0.1 as LatteTasks