diff --git a/Jolly-Global-Themes/Jolly-Global/contents/defaults b/Jolly-Global-Themes/Jolly-Global/contents/defaults index 67b500e..a36fefa 100644 --- a/Jolly-Global-Themes/Jolly-Global/contents/defaults +++ b/Jolly-Global-Themes/Jolly-Global/contents/defaults @@ -17,13 +17,14 @@ Theme=Jolly-Dark-Icons cursorTheme=breeze_cursors [Wallpaper] -Image=Forest SunsetNL.png +Image=Jolly-Nebula Wallpaper [plasmarc][Theme] name=Jolly-Plasma [kwinrc][org.kde.kdecoration2] library=org.kde.kwin.aurorae -theme=__aurorae__svg__Jolly-Aurorae - +theme=__aurorae__svg__Jolly-Aurorae-6 +[KSplash] +Theme=Jolly-Splash-6 diff --git a/Jolly-Global-Themes/Jolly-Global/contents/layots/org.kde.plasma.desktop-layout.js b/Jolly-Global-Themes/Jolly-Global/contents/layots/org.kde.plasma.desktop-layout.js new file mode 100644 index 0000000..09fdfac --- /dev/null +++ b/Jolly-Global-Themes/Jolly-Global/contents/layots/org.kde.plasma.desktop-layout.js @@ -0,0 +1,6 @@ +loadTemplate("org.kde.plasma.desktop.defaultPanel") + +var desktopsArray = desktopsForActivity(currentActivity()); +for( var j = 0; j < desktopsArray.length; j++) { + desktopsArray[j].wallpaperPlugin = 'org.kde.image'; +} diff --git a/Jolly-Global-Themes/Jolly-Global/contents/previews/fullscreenpreview.jpg b/Jolly-Global-Themes/Jolly-Global/contents/previews/fullscreenpreview.jpg index 131c69b..663d48e 100644 Binary files a/Jolly-Global-Themes/Jolly-Global/contents/previews/fullscreenpreview.jpg and b/Jolly-Global-Themes/Jolly-Global/contents/previews/fullscreenpreview.jpg differ diff --git a/Jolly-Global-Themes/Jolly-Global/contents/previews/preview.png b/Jolly-Global-Themes/Jolly-Global/contents/previews/preview.png index 3b3ea2b..02fc4d0 100644 Binary files a/Jolly-Global-Themes/Jolly-Global/contents/previews/preview.png and b/Jolly-Global-Themes/Jolly-Global/contents/previews/preview.png differ diff --git a/Jolly-Global-Themes/Jolly-Global/contents/previews/splash.png b/Jolly-Global-Themes/Jolly-Global/contents/previews/splash.png index f53eabd..7dd5589 100644 Binary files a/Jolly-Global-Themes/Jolly-Global/contents/previews/splash.png and b/Jolly-Global-Themes/Jolly-Global/contents/previews/splash.png differ diff --git a/Jolly-Global-Themes/Jolly-Global/contents/splash/Splash.qml b/Jolly-Global-Themes/Jolly-Global/contents/splash/Splash.qml index 7393c8c..d4d0132 100644 --- a/Jolly-Global-Themes/Jolly-Global/contents/splash/Splash.qml +++ b/Jolly-Global-Themes/Jolly-Global/contents/splash/Splash.qml @@ -1,55 +1,22 @@ -/* - * 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 QtGraphicalEffects 1.0 + Image { id: root source: "images/Jolly-Nebula Wallpaper Without Plasma Logo.jpg" - fillMode: Image.PreserveAspectCrop - + property int stage - + onStageChanged: { if (stage == 1) { introAnimation.running = true - preOpacityAnimation.from = 0; - preOpacityAnimation.to = 1; - preOpacityAnimation.running = true; - } - if (stage == 4) { - preOpacityAnimation.from = 1; - preOpacityAnimation.to = 0; - preOpacityAnimation.running = true; - pausa.start(); } } Item { id: content - anchors.rightMargin: 0 - anchors.bottomMargin: 0 - anchors.leftMargin: 0 - anchors.topMargin: 0 anchors.fill: parent - opacity: 1 + opacity: 0 TextMetrics { id: units text: "M" @@ -60,72 +27,65 @@ Image { Image { id: logo - property real size: units.gridUnit * 12 + //match SDDM/lockscreen avatar positioning + property real size: units.gridUnit * 10 + anchors.centerIn: parent - source: "" + + source: "images/start.svg" + sourceSize.width: size sourceSize.height: size - } - } - Text { - id: date - text:Qt.formatDateTime(new Date(),"dddd, hh:mm AP") - font.pointSize: 26 - color: "#7d7daf" - opacity:0.85 - font { family: "NotoSans"; weight: Font.Medium ;capitalization: Font.Capitalize} - anchors.horizontalCenter: parent.horizontalCenter - y: (parent.height - height) / 2.4 - } + ParallelAnimation { + running: true - Image { - id: busyIndicator1 - //in the middle of the remaining space - //y: (parent.height - height) / 1.7 - y: root.height - (root.height - logo.y) / 1.1 - height/2 - anchors.horizontalCenter: parent.horizontalCenter - source: "images/start.svg" - opacity: 0.9 - sourceSize.height: units.gridUnit * 6.0 - sourceSize.width: units.gridUnit * 6.0 - RotationAnimator on rotation { - id: rotationAnimator1 - from: 0 - to: 0 - duration: 1100 - loops: Animation.Infinite + ScaleAnimator { + target: logo + from: 0 + to: 1.0 + duration: 700 + } + + SequentialAnimation { + loops: Animation.Infinite + + ScaleAnimator { + target: logo + from: 0.8 + to: 1.1 + duration: 1000 + } + ScaleAnimator { + target: logo + from: 1 + to: 0.8 + duration: 1000 + } + } } - } - Image { - id: topRect - anchors.horizontalCenter: parent.horizontalCenter - y: root.height - source: "images/rectangle.svg" + } + + Rectangle { - y: 232 - radius: 0 - anchors.horizontalCenterOffset: 0 - color: "#33305a" - anchors { - bottom: parent.bottom - bottomMargin: 50 - horizontalCenter: parent.horizontalCenter - } - height: 2 - width: height*200 + radius: 4 + color: "#d3d3ff" + opacity: 0.9 + y: parent.height - (parent.height - logo.y) / 3 - height/2 + anchors.horizontalCenter: parent.horizontalCenter + height: 6 + width: height*32 Rectangle { - id: topRectRectangle - radius: 1 + radius: 3 anchors { left: parent.left top: parent.top bottom: parent.bottom } width: (parent.width / 6) * (stage - 0.00) - color: "#7171a8" - Behavior on width { + color: "#5c5c88" + Behavior on width { PropertyAnimation { duration: 200 easing.type: Easing.InOutQuad @@ -133,98 +93,16 @@ Image { } } } + } - SequentialAnimation { + OpacityAnimator { id: introAnimation running: false - - ParallelAnimation { - PropertyAnimation { - property: "y" - target: topRect - to: ((root.height / 3) * 2) - 170 - duration: 1500 - easing.type: Easing.InOutBack - easing.overshoot: 1.0 - } - - } - } - - Text { - visible: true - height: 1470 - width: 1920 - Text { - id: text - font.pointSize: 24 - x: (root.width - width) / 2 - y: (root.height / 3) * 2 - anchors.centerIn: parent - text: "Linux For Open Minds" - visible: false - } - LinearGradient { - anchors.fill: text - source: text - gradient: Gradient { - GradientStop { position: 0; color: "#8282c1" } - GradientStop { position: 0.4; color: "#8282c1" } - GradientStop { position: 0.6; color: "#434364" } - GradientStop { position: 1; color: "#434364" } - } - } -} - - OpacityAnimator { - id: preOpacityAnimation - running: false - target: preLoadingText + target: content from: 0 to: 1 - duration: 2000 + duration: 1000 easing.type: Easing.InOutQuad } - - Text { - id: loadingText - height: 30 - anchors.bottomMargin: 0 - anchors.topMargin: 0 - text: "Linux For Open Minds" - color: "#2e75bc" - font.family: webFont.name - font.weight: Font.ExtraLight - - font.pointSize: 20 - opacity: 0 - textFormat: Text.StyledText - x: (root.width - width) / 2 - y: (root.height / 3) * 2 - } - - OpacityAnimator { - id: opacityAnimation - running: false - target: loadingText - from: 0 - to: 1 - duration: 000 - easing.type: Easing.InOutQuad - paused: true - } - - Timer { - id: pausa - interval: 1500; running: false; repeat: false; - onTriggered: root.viewLoadingText(); - } - - function viewLoadingText() { - opacityAnimation.from = 0; - opacityAnimation.to = 1; - opacityAnimation.running = true; - } - } diff --git a/Jolly-Global-Themes/Jolly-Global/contents/splash/images/Jolly-Nebula Wallpaper Without Plasma Logo.jpg b/Jolly-Global-Themes/Jolly-Global/contents/splash/images/Jolly-Nebula Wallpaper Without Plasma Logo.jpg index 2fb42d4..2b08a43 100644 Binary files a/Jolly-Global-Themes/Jolly-Global/contents/splash/images/Jolly-Nebula Wallpaper Without Plasma Logo.jpg and b/Jolly-Global-Themes/Jolly-Global/contents/splash/images/Jolly-Nebula Wallpaper Without Plasma Logo.jpg differ diff --git a/Jolly-Global-Themes/Jolly-Global/metadata.json b/Jolly-Global-Themes/Jolly-Global/metadata.json new file mode 100644 index 0000000..dc8a020 --- /dev/null +++ b/Jolly-Global-Themes/Jolly-Global/metadata.json @@ -0,0 +1,33 @@ +{ + "KPackageStructure": "Plasma/LookAndFeel", + "KPlugin": { + "Authors": [ + { + "Email": "l4k1987@gmail.com", + "Name": "l4k1" + } + ], + "Category": "Global Themes (Plasma 6)", + "ServiceTypes": [ + "Plasma/LookAndFeel" + ], + "EnabledByDefault": true, + "Name": "Jolly-Global-6", + "Description": "Jolly Global Theme by l4k1", + "Id": "Jolly-Global-6", + "Version": "1.0", + "License": "GPLv3", + "Website": "https://github.com/L4ki/Jolly-Plasma-Themes" + }, + "X-KPackage-Dependencies": [ + "kns://window-decorations.knsrc/api.kde-look.org/2133854", + "kns://window-decorations.knsrc/api.kde-look.org/2133852", + "kns://colorschemes.knsrc/api.kde-look.org/1654363", + "kns://icons.knsrc/api.kde-look.org/1654368", + "kns://icons.knsrc/api.kde-look.org/2148992", + "kns://plasma-themes.knsrc/api.kde-look.org/1654379", + "kns://sddmtheme.knsrc/api.kde-look.org/2140584", + "kns://wallpaper.knsrc/api.kde-look.org/1654331", + "kns://wallpaper.knsrc/api.kde-look.org/2155591" + ] +}