diff --git a/plasma/look-and-feel/org.magpie.psion.desktop/contents/defaults b/plasma/look-and-feel/org.magpie.psion.desktop/contents/defaults index 4bc804f..e6726e0 100644 --- a/plasma/look-and-feel/org.magpie.psion.desktop/contents/defaults +++ b/plasma/look-and-feel/org.magpie.psion.desktop/contents/defaults @@ -24,4 +24,4 @@ library=org.kde.kwin.aurorae theme=__aurorae__svg__psion [plasmarc][Theme] -name=Psion +name=psion diff --git a/plasma/look-and-feel/org.magpie.psion.desktop/contents/layouts/org.kde.plasma.desktop-layout.js b/plasma/look-and-feel/org.magpie.psion.desktop/contents/layouts/org.kde.plasma.desktop-layout.js index 4924d50..663e076 100644 --- a/plasma/look-and-feel/org.magpie.psion.desktop/contents/layouts/org.kde.plasma.desktop-layout.js +++ b/plasma/look-and-feel/org.magpie.psion.desktop/contents/layouts/org.kde.plasma.desktop-layout.js @@ -5,9 +5,7 @@ panel.location = "bottom"; panel.height = 36 panel.alignment = "center"; geo = screenGeometry(panelScreen); -panel.minimumLength = geo.width -panel.maximumLength = geo.width -panel.lengthMode = "custom" +panel.lengthMode = "fillavailable" panel.floating = true var kickoff = panel.addWidget("org.kde.plasma.kickoff") diff --git a/plasma/look-and-feel/org.magpie.psion.desktop/contents/previews/splash.png b/plasma/look-and-feel/org.magpie.psion.desktop/contents/previews/splash.png index 2dce228..0fbf7c8 100644 Binary files a/plasma/look-and-feel/org.magpie.psion.desktop/contents/previews/splash.png and b/plasma/look-and-feel/org.magpie.psion.desktop/contents/previews/splash.png differ diff --git a/plasma/look-and-feel/org.magpie.psion.desktop/contents/splash/Splash.qml b/plasma/look-and-feel/org.magpie.psion.desktop/contents/splash/Splash.qml index 12f7463..2909d95 100644 --- a/plasma/look-and-feel/org.magpie.psion.desktop/contents/splash/Splash.qml +++ b/plasma/look-and-feel/org.magpie.psion.desktop/contents/splash/Splash.qml @@ -1,78 +1,45 @@ -/* - * Copyright 2014 Marco Martin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * or (at your option) any later version, as published by the Free - * Software Foundation - * - * This program 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, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -import QtQuick 2.5 -import Qt5Compat.GraphicalEffects - +import QtQuick Rectangle { - id: root - color: "#282828" - anchors.fill: parent - property int stage + id: background + anchors.centerIn: parent + color: "#303030" - property variant images : [ - "images/spinner1.png", - "images/spinner2.png", - "images/spinner3.png", - "images/spinner4.png", - "images/spinner5.png", - "images/spinner6.png", - "images/spinner7.png", - "images/spinner8.png", - ]; - property int currentImage : 0; - - Repeater { - id: repeaterImg; - model: images; - delegate: Image { - id: spinner - source: modelData; - asynchronous: true; - height: 60; - width: 60; - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - visible: (model.index === currentImage); - - OpacityAnimator { - target: spinner; - from: 0; - to: 1; - duration: 100; - running: true - } - } + Rectangle { + anchors.fill: parent + color: "#44000000" } - Timer { - id: timerAnimImg; - interval: 125; // here is the delay between 2 images in msecs - running: true; // stopped by default, use start() or running=true to launch - repeat: true; - onTriggered: { - if (currentImage < images.length -1) { - currentImage++; // show next image - } - else { - currentImage = 0; // go back to the first image at the end + Rectangle { + id: groove + width: 360 + height: 12 + anchors.centerIn: parent + color: "#171717" + + Rectangle { + id: block + height: 8 + width: 48 + anchors.verticalCenter: parent.verticalCenter + color: "#847865" + + SequentialAnimation on x { + id: anim + loops: Animation.Infinite + + NumberAnimation { + from: 0 + to: groove.width - block.width + duration: 1100 + easing.type: Easing.OutQuad + } + NumberAnimation { + from: groove.width - block.width + to: 0 + duration: 1100 + easing.type: Easing.OutQuad + } } } } diff --git a/plasma/look-and-feel/org.magpie.psion.desktop/metadata.desktop b/plasma/look-and-feel/org.magpie.psion.desktop/metadata.desktop index 54d0f95..f649605 100644 --- a/plasma/look-and-feel/org.magpie.psion.desktop/metadata.desktop +++ b/plasma/look-and-feel/org.magpie.psion.desktop/metadata.desktop @@ -7,7 +7,7 @@ X-KDE-PluginInfo-Email=phobian@tutanota.com X-KDE-PluginInfo-EnabledByDefault=true X-KDE-PluginInfo-License=GPL 2+ X-KDE-PluginInfo-Name=Psion -X-KDE-PluginInfo-Version=6.7 +X-KDE-PluginInfo-Version=7.0 X-KDE-PluginInfo-Website=https://www.pling.com/u/phob1an X-KDE-ServiceTypes=Plasma/LookAndFeel -X-KPackage-Dependencies=kns://aurorae.knsrc/api.kde-look.org/2137702,kns://colorschemes.knsrc/api.kde-look.org/1235544,kns://plasma-themes.knsrc/api.kde-look.org/1235513,kns://icons.knsrc/api.kde-look.org/1305826,kns://wallpaper.knsrc/api.kde-look.org/2137692 +X-KPackage-Dependencies=kns://aurorae.knsrc/api.kde-look.org/2137702,kns://colorschemes.knsrc/api.kde-look.org/1235544,kns://plasma-themes.knsrc/api.kde-look.org/1235513,kns://icons.knsrc/api.kde-look.org/1305826,kns://wallpaper.knsrc/api.kde-look.org/2137692,kns://sddmtheme.knsrc/api.kde-look.org/1688188 diff --git a/plasma/look-and-feel/org.magpie.psion.desktop/metadata.json b/plasma/look-and-feel/org.magpie.psion.desktop/metadata.json index 8cb81b6..a0c22e9 100644 --- a/plasma/look-and-feel/org.magpie.psion.desktop/metadata.json +++ b/plasma/look-and-feel/org.magpie.psion.desktop/metadata.json @@ -16,7 +16,7 @@ "ServiceTypes": [ "Plasma/LookAndFeel" ], - "Version": "6.7", + "Version": "7.0", "Website": "https://www.pling.com/u/phob1an/" }, "X-KPackage-Dependencies": [ @@ -24,6 +24,7 @@ "kns://colorschemes.knsrc/api.kde-look.org/1235544", "kns://plasma-themes.knsrc/api.kde-look.org/1235513", "kns://icons.knsrc/api.kde-look.org/1305826", - "kns://wallpaper.knsrc/api.kde-look.org/2137692" + "kns://wallpaper.knsrc/api.kde-look.org/2137692", + "kns://sddmtheme.knsrc/api.kde-look.org/1688188" ] }