Merge pull request #60 from catppuccin/dev

Port to KDE6
catppuccin · Mar 15, 2024 · 6a12fac · 6a12fac
2 parents e57884a + 72800cf
commit 6a12fac
Show file tree

Hide file tree

Showing 33 changed files with 282 additions and 105 deletions.
diff --git a/Assets/res.webp b/Assets/res.webp
diff --git a/README.md b/README.md
@@ -50,12 +50,9 @@
 
 
 ## Notes
-1. To get a modern, more consistent look, install the [Lightly application style](https://github.com/Luwx/Lightly) and select it from System Settings > Appearance >  Application Style > Lightly.
+1. If you are using KDE 5.27 or below, you might want to run `git checkout v0.2.5`  before running the install script to avoid running into compatibility issues. Alternatively, the release binaries are available [here](https://github.com/catppuccin/kde/releases/tag/v0.2.5).
 2. If you encounter an error similar to 'connection refused' while running the installation script, it may be due to store.kde.org being down or issues with your internet connection.
 
-## Licensing
-The theme makes modifications to [doncsugar's](https://github.com/doncsugar) [lightly plasma style](https://github.com/doncsugar/lightly-plasma). It is licensed under GPL 3.0 and as such, all the changes to the plasma theme are also licensed under GPL. The MIT License still applies to the color scheme, splash screen and the window decorations theme.
-
 
 ## 💝 Current Maintainer
 - [Sourcastic](https://github.com/Sourcastic)

diff --git a/Resources/Aurorae/CatppuccinFrappe-Classic/metadata.desktop b/Resources/Aurorae/CatppuccinFrappe-Classic/metadata.desktop
@@ -3,7 +3,7 @@ Name=Catppuccin Frappe Classic
 Comment=Soothing Pastel theme for Kwin
 X-KDE-PluginInfo-Author=Sourcastic-Catppuccin
 X-KDE-PluginInfo-Email=core@catppuccin.com
-X-KDE-PluginInfo-Version=0.2.5
+X-KDE-PluginInfo-Version=0.2.6
 X-KDE-PluginInfo-Name=CatppuccinFrappe-Classic
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Depends=

diff --git a/Resources/Aurorae/CatppuccinFrappe-Classic/metadata.json b/Resources/Aurorae/CatppuccinFrappe-Classic/metadata.json
@@ -0,0 +1,19 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "core@catppuccin.com",
+                "Name": "Catppuccin"
+            }
+        ],
+        "Category": "",
+        "Dependencies": [
+        ],
+        "EnabledByDefault": true,
+        "Description": "Soothing Pastel theme for Kwin",
+        "Id": "CatppuccinFrappe-Classic",
+        "License": "MIT",
+        "Name": "Catppuccin Frappe Classic",
+        "Version": "0.2.6"
+    }
+}
diff --git a/Resources/Aurorae/CatppuccinFrappe-Modern/metadata.desktop b/Resources/Aurorae/CatppuccinFrappe-Modern/metadata.desktop
@@ -4,7 +4,7 @@ Comment=Soothing Pastel theme for Kwin
 X-KDE-PluginInfo-Author=Cequal-Catppuccin
 X-KDE-PluginInfo-Email=core@catppuccin.com
 X-KDE-PluginInfo-Name=CatppuccinFrappe-Modern
-X-KDE-PluginInfo-Version=0.2.5
+X-KDE-PluginInfo-Version=0.2.6
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=

diff --git a/Resources/Aurorae/CatppuccinFrappe-Modern/metadata.json b/Resources/Aurorae/CatppuccinFrappe-Modern/metadata.json
@@ -0,0 +1,19 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "core@catppuccin.com",
+                "Name": "Catppuccin"
+            }
+        ],
+        "Category": "",
+        "Dependencies": [
+        ],
+        "EnabledByDefault": true,
+        "Description": "Soothing Pastel theme for Kwin",
+        "Id": "CatppuccinFrappe-Modern",
+        "License": "MIT",
+        "Name": "Catppuccin Frappe Modern",
+        "Version": "0.2.6"
+    }
+}
diff --git a/Resources/Aurorae/CatppuccinLatte-Classic/metadata.desktop b/Resources/Aurorae/CatppuccinLatte-Classic/metadata.desktop
@@ -3,7 +3,7 @@ Name=Catppuccin Latte Classic
 Comment=Soothing Pastel theme for Kwin
 X-KDE-PluginInfo-Author=Sourcastic-Catppuccin
 X-KDE-PluginInfo-Email=core@catppuccin.com
-X-KDE-PluginInfo-Version=0.2.5
+X-KDE-PluginInfo-Version=0.2.6
 X-KDE-PluginInfo-Name=CatppuccinLatte-Classic
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Depends=

diff --git a/Resources/Aurorae/CatppuccinLatte-Classic/metadata.json b/Resources/Aurorae/CatppuccinLatte-Classic/metadata.json
@@ -0,0 +1,19 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "core@catppuccin.com",
+                "Name": "Catppuccin"
+            }
+        ],
+        "Category": "",
+        "Dependencies": [
+        ],
+        "EnabledByDefault": true,
+        "Description": "Soothing Pastel theme for Kwin",
+        "Id": "CatppuccinLatte-Classic",
+        "License": "MIT",
+        "Name": "Catppuccin Latte Classic",
+        "Version": "0.2.6"
+    }
+}
diff --git a/Resources/Aurorae/CatppuccinLatte-Modern/metadata.desktop b/Resources/Aurorae/CatppuccinLatte-Modern/metadata.desktop
@@ -4,7 +4,7 @@ Comment=Soothing Pastel theme for Kwin
 X-KDE-PluginInfo-Author=Cequal-Catppuccin
 X-KDE-PluginInfo-Email=core@catppuccin.com
 X-KDE-PluginInfo-Name=CatppuccinLatte-Modern
-X-KDE-PluginInfo-Version=0.2.5
+X-KDE-PluginInfo-Version=0.2.6
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=

diff --git a/Resources/Aurorae/CatppuccinLatte-Modern/metadata.json b/Resources/Aurorae/CatppuccinLatte-Modern/metadata.json
@@ -0,0 +1,19 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "core@catppuccin.com",
+                "Name": "Catppuccin"
+            }
+        ],
+        "Category": "",
+        "Dependencies": [
+        ],
+        "EnabledByDefault": true,
+        "Description": "Soothing Pastel theme for Kwin",
+        "Id": "CatppuccinLatte-Modern",
+        "License": "MIT",
+        "Name": "Catppuccin Latte Modern",
+        "Version": "0.2.6"
+    }
+}
diff --git a/Resources/Aurorae/CatppuccinMacchiato-Classic/metadata.desktop b/Resources/Aurorae/CatppuccinMacchiato-Classic/metadata.desktop
@@ -3,7 +3,7 @@ Name=Catppuccin Macchiato Classic
 Comment=Soothing Pastel theme for Kwin
 X-KDE-PluginInfo-Author=Sourcastic-Catppuccin
 X-KDE-PluginInfo-Email=core@catppuccin.com
-X-KDE-PluginInfo-Version=0.2.5
+X-KDE-PluginInfo-Version=0.2.6
 X-KDE-PluginInfo-Name=CatppuccinMacchiato-Classic
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Depends=

diff --git a/Resources/Aurorae/CatppuccinMacchiato-Classic/metadata.json b/Resources/Aurorae/CatppuccinMacchiato-Classic/metadata.json
@@ -0,0 +1,19 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "core@catppuccin.com",
+                "Name": "Catppuccin"
+            }
+        ],
+        "Category": "",
+        "Dependencies": [
+        ],
+        "EnabledByDefault": true,
+        "Description": "Soothing Pastel theme for Kwin",
+        "Id": "CatppuccinMacchiato-Classic",
+        "License": "MIT",
+        "Name": "Catppuccin Macchiato Classic",
+        "Version": "0.2.6"
+    }
+}
diff --git a/Resources/Aurorae/CatppuccinMacchiato-Modern/metadata.desktop b/Resources/Aurorae/CatppuccinMacchiato-Modern/metadata.desktop
@@ -4,7 +4,7 @@ Comment=Soothing Pastel theme for Kwin
 X-KDE-PluginInfo-Author=Cequal-Catppuccin
 X-KDE-PluginInfo-Email=core@catppuccin.com
 X-KDE-PluginInfo-Name=CatppuccinMacchiato-Modern
-X-KDE-PluginInfo-Version=0.2.5
+X-KDE-PluginInfo-Version=0.2.6
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=

diff --git a/Resources/Aurorae/CatppuccinMacchiato-Modern/metadata.json b/Resources/Aurorae/CatppuccinMacchiato-Modern/metadata.json
@@ -0,0 +1,19 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "core@catppuccin.com",
+                "Name": "Catppuccin"
+            }
+        ],
+        "Category": "",
+        "Dependencies": [
+        ],
+        "EnabledByDefault": true,
+        "Description": "Soothing Pastel theme for Kwin",
+        "Id": "CatppuccinMacchiato-Modern",
+        "License": "MIT",
+        "Name": "Catppuccin Macchiato Modern",
+        "Version": "0.2.6"
+    }
+}
diff --git a/Resources/Aurorae/CatppuccinMocha-Classic/metadata.desktop b/Resources/Aurorae/CatppuccinMocha-Classic/metadata.desktop
@@ -3,7 +3,7 @@ Name=Catppuccin Mocha Classic
 Comment=Soothing Pastel theme for Kwin
 X-KDE-PluginInfo-Author=Sourcastic-Catppuccin
 X-KDE-PluginInfo-Email=core@catppuccin.com
-X-KDE-PluginInfo-Version=0.2.5
+X-KDE-PluginInfo-Version=0.2.6
 X-KDE-PluginInfo-Name=CatppuccinMocha-Classic
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Depends=

diff --git a/Resources/Aurorae/CatppuccinMocha-Classic/metadata.json b/Resources/Aurorae/CatppuccinMocha-Classic/metadata.json
@@ -0,0 +1,19 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "core@catppuccin.com",
+                "Name": "Catppuccin"
+            }
+        ],
+        "Category": "",
+        "Dependencies": [
+        ],
+        "EnabledByDefault": true,
+        "Description": "Soothing Pastel theme for Kwin",
+        "Id": "CatppuccinMocha-Classic",
+        "License": "MIT",
+        "Name": "Catppuccin Mocha Classic",
+        "Version": "0.2.6"
+    }
+}
diff --git a/Resources/Aurorae/CatppuccinMocha-Modern/metadata.desktop b/Resources/Aurorae/CatppuccinMocha-Modern/metadata.desktop
@@ -4,7 +4,7 @@ Comment=Soothing Pastel theme for Kwin
 X-KDE-PluginInfo-Author=Cequal-Catppuccin
 X-KDE-PluginInfo-Email=core@catppuccin.com
 X-KDE-PluginInfo-Name=CatppuccinMocha-Modern
-X-KDE-PluginInfo-Version=0.2.5
+X-KDE-PluginInfo-Version=0.2.6
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=

diff --git a/Resources/Aurorae/CatppuccinMocha-Modern/metadata.json b/Resources/Aurorae/CatppuccinMocha-Modern/metadata.json
@@ -0,0 +1,19 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "core@catppuccin.com",
+                "Name": "Catppuccin"
+            }
+        ],
+        "Category": "",
+        "Dependencies": [
+        ],
+        "EnabledByDefault": true,
+        "Description": "Soothing Pastel theme for Kwin",
+        "Id": "CatppuccinMocha-Modern",
+        "License": "MIT",
+        "Name": "Catppuccin Mocha Modern",
+        "Version": "0.2.6"
+    }
+}
diff --git a/...es/LookAndFeel/Catppuccin-Frappe-Global/contents/previews/fullscreenpreview.jpg b/...es/LookAndFeel/Catppuccin-Frappe-Global/contents/previews/fullscreenpreview.jpg
diff --git a/Resources/LookAndFeel/Catppuccin-Frappe-Global/contents/previews/preview.png b/Resources/LookAndFeel/Catppuccin-Frappe-Global/contents/previews/preview.png
diff --git a/...ces/LookAndFeel/Catppuccin-Latte-Global/contents/previews/fullscreenpreview.jpg b/...ces/LookAndFeel/Catppuccin-Latte-Global/contents/previews/fullscreenpreview.jpg
diff --git a/Resources/LookAndFeel/Catppuccin-Latte-Global/contents/previews/preview.png b/Resources/LookAndFeel/Catppuccin-Latte-Global/contents/previews/preview.png
diff --git a/...LookAndFeel/Catppuccin-Macchiato-Global/contents/previews/fullscreenpreview.jpg b/...LookAndFeel/Catppuccin-Macchiato-Global/contents/previews/fullscreenpreview.jpg
diff --git a/Resources/LookAndFeel/Catppuccin-Macchiato-Global/contents/previews/preview.png b/Resources/LookAndFeel/Catppuccin-Macchiato-Global/contents/previews/preview.png
diff --git a/...ces/LookAndFeel/Catppuccin-Mocha-Global/contents/previews/fullscreenpreview.jpg b/...ces/LookAndFeel/Catppuccin-Mocha-Global/contents/previews/fullscreenpreview.jpg
diff --git a/Resources/LookAndFeel/Catppuccin-Mocha-Global/contents/previews/preview.png b/Resources/LookAndFeel/Catppuccin-Mocha-Global/contents/previews/preview.png
diff --git a/Resources/LookAndFeel/defaults b/Resources/LookAndFeel/defaults
@@ -11,7 +11,7 @@ library=org.kde.kwin.aurorae
 theme=--aurorae
 
 [plasmarc][Theme]
-name=lightly-plasma-git
+name=default
 
 [KSplash]
 Theme=Catppuccin---flavour---accentName-splash
diff --git a/Resources/LookAndFeel/metadata.desktop b/Resources/LookAndFeel/metadata.desktop
@@ -2,12 +2,12 @@
 Comment=A theme based on Catppuccin's --flavour flavour
 Name=Catppuccin --flavour --accentName
 X-KDE-PluginInfo-Author=KDE-Catppuccin
-X-KDE-PluginInfo-Category=Plasma Look And Feel
+X-KDE-PluginInfo-Category=Global Themes (Plasma 6)
 X-KDE-PluginInfo-Email=core@catppuccin.com
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-PluginInfo-License=MIT
 X-KDE-PluginInfo-Name=Catppuccin---flavour---accentName
-X-KDE-PluginInfo-Version=0.2.5
+X-KDE-PluginInfo-Version=0.2.6
 X-KDE-PluginInfo-Website=github.com/catppuccin/KDE
 X-KDE-ServiceTypes=Plasma/LookAndFeel
-X-KPackage-Dependencies=kns://plasma-themes.knsrc/api.kde-look.org/1879921,kns://aurorae.knsrc/api.kde-look.org/--StoreAuroraeNo
+X-KPackage-Dependencies=kns://aurorae.knsrc/api.kde-look.org/--StoreAuroraeNo
diff --git a/Resources/LookAndFeel/metadata.json b/Resources/LookAndFeel/metadata.json
@@ -0,0 +1,22 @@
+{
+    "KPackageStructure": "Plasma/LookAndFeel",
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "core@catppuccin.com",
+                "Name": "Catppuccin"
+            }
+        ],
+        "Category": "Global Themes (Plasma 6)",
+        "Dependencies": [
+        ],
+        "EnabledByDefault": true,
+        "Id": "Catppuccin---flavour---accentName",
+        "License": "MIT",
+        "Name": "Catppuccin --flavour --accentName",
+        "Version": "0.2.6"
+    },
+    "X-KPackage-Dependencies": [
+        "kns://aurorae.knsrc/api.kde-look.org/--StoreAuroraeNo"
+    ]
+}
diff --git a/Resources/splash-screen/contents/splash/Splash.qml b/Resources/splash-screen/contents/splash/Splash.qml
@@ -7,10 +7,8 @@
     SPDX-License-Identifier: MIT
 */
 
-import QtGraphicalEffects 1.15
-import QtQuick 2.5
-import QtQuick.Window 2.2
-import org.kde.plasma.core 2.0 as PlasmaCore
+import QtQuick
+import org.kde.kirigami 2 as Kirigami
 
 Rectangle {
     id: root
@@ -33,7 +31,8 @@ Rectangle {
         id: content
         anchors.fill: parent
         opacity: 0
-
+        //TODO: Figure out how to port DropShadow to KDE6, erase comment when ported.
+/*
         DropShadow {
             anchors.fill: logo
             horizontalOffset: 0
@@ -44,17 +43,17 @@ Rectangle {
             source: logo
             opacity: 0.1
         }
-
+*/
         Image {
             id: logo
             //match SDDM/lockscreen avatar positioning
-            property real size: PlasmaCore.Units.gridUnit * 8
+            readonly property real size: Kirigami.Units.gridUnit * 8
 
             anchors.centerIn: parent
             source: "images/Logo.png"
 
             sourceSize.width: size
-            sourceSize.height: size
+            sourceSize.height: sizes
             smooth: true
             visible: true
         }
@@ -65,15 +64,15 @@ Rectangle {
             y: parent.height - (parent.height - logo.y) / 2 - height/2
             anchors.horizontalCenter: parent.horizontalCenter
             source: "images/busywidget.svg"
-            sourceSize.height: PlasmaCore.Units.gridUnit * 3.5
-            sourceSize.width: PlasmaCore.Units.gridUnit * 3.5
+            sourceSize.height: Kirigami.Units.gridUnit * 3.5
+            sourceSize.width: Kirigami.Units.gridUnit * 3.5
             RotationAnimator on rotation {
                 id: rotationAnimator
                 from: 0
                 to: 360
                 duration: 2000
                 loops: Animation.Infinite
-                running: PlasmaCore.Units.longDuration > 1
+                running: Kirigami.Units.longDuration > 1
             }
         }
     }
@@ -84,7 +83,7 @@ Rectangle {
         target: content
         from: 0
         to: 1
-        duration: PlasmaCore.Units.veryLongDuration * 2
+        duration: Kirigami.Units.veryLongDuration * 2
         easing.type: Easing.InOutQuad
     }
 }
diff --git a/Resources/splash-screen/metadata.desktop b/Resources/splash-screen/metadata.desktop
@@ -7,6 +7,6 @@ X-KDE-PluginInfo-Email=core@catppuccin.com
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-PluginInfo-License=MIT
 X-KDE-PluginInfo-Name=Catppuccin---flavour---accentName-splash
-X-KDE-PluginInfo-Version=0.2.5
+X-KDE-PluginInfo-Version=0.2.6
 X-KDE-PluginInfo-Website=github.com/catppuccin/KDE
 X-KDE-ServiceTypes=Plasma/LookAndFeel
diff --git a/Resources/splash-screen/metadata.json b/Resources/splash-screen/metadata.json
@@ -0,0 +1,19 @@
+{
+    "KPackageStructure": "Plasma/LookAndFeel",
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "core@catppuccin.com",
+                "Name": "Catppuccin"
+            }
+        ],
+        "Category": "Plasma Look And Feel",
+        "Dependencies": [
+        ],
+        "EnabledByDefault": true,
+        "Id": "Catppuccin---flavour---accentName-splash",
+        "License": "MIT",
+        "Name": "Catppuccin --flavour --accentName",
+        "Version": "0.2.6"
+    }
+}