Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port to KDE6 #60

Merged
merged 17 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Assets/res.webp
Binary file not shown.
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Name=Catppuccin Frappe Classic
Comment=Soothing Pastel theme for Kwin
X-KDE-PluginInfo-Author=Sourcastic-Catppuccin
[email protected]
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=
Expand Down
19 changes: 19 additions & 0 deletions Resources/Aurorae/CatppuccinFrappe-Classic/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"KPlugin": {
"Authors": [
{
"Email": "[email protected]",
"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"
}
}
2 changes: 1 addition & 1 deletion Resources/Aurorae/CatppuccinFrappe-Modern/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Comment=Soothing Pastel theme for Kwin
X-KDE-PluginInfo-Author=Cequal-Catppuccin
[email protected]
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=
Expand Down
19 changes: 19 additions & 0 deletions Resources/Aurorae/CatppuccinFrappe-Modern/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"KPlugin": {
"Authors": [
{
"Email": "[email protected]",
"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"
}
}
2 changes: 1 addition & 1 deletion Resources/Aurorae/CatppuccinLatte-Classic/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Name=Catppuccin Latte Classic
Comment=Soothing Pastel theme for Kwin
X-KDE-PluginInfo-Author=Sourcastic-Catppuccin
[email protected]
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=
Expand Down
19 changes: 19 additions & 0 deletions Resources/Aurorae/CatppuccinLatte-Classic/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"KPlugin": {
"Authors": [
{
"Email": "[email protected]",
"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"
}
}
2 changes: 1 addition & 1 deletion Resources/Aurorae/CatppuccinLatte-Modern/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Comment=Soothing Pastel theme for Kwin
X-KDE-PluginInfo-Author=Cequal-Catppuccin
[email protected]
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=
Expand Down
19 changes: 19 additions & 0 deletions Resources/Aurorae/CatppuccinLatte-Modern/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"KPlugin": {
"Authors": [
{
"Email": "[email protected]",
"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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Name=Catppuccin Macchiato Classic
Comment=Soothing Pastel theme for Kwin
X-KDE-PluginInfo-Author=Sourcastic-Catppuccin
[email protected]
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=
Expand Down
19 changes: 19 additions & 0 deletions Resources/Aurorae/CatppuccinMacchiato-Classic/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"KPlugin": {
"Authors": [
{
"Email": "[email protected]",
"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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Comment=Soothing Pastel theme for Kwin
X-KDE-PluginInfo-Author=Cequal-Catppuccin
[email protected]
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=
Expand Down
19 changes: 19 additions & 0 deletions Resources/Aurorae/CatppuccinMacchiato-Modern/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"KPlugin": {
"Authors": [
{
"Email": "[email protected]",
"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"
}
}
2 changes: 1 addition & 1 deletion Resources/Aurorae/CatppuccinMocha-Classic/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Name=Catppuccin Mocha Classic
Comment=Soothing Pastel theme for Kwin
X-KDE-PluginInfo-Author=Sourcastic-Catppuccin
[email protected]
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=
Expand Down
19 changes: 19 additions & 0 deletions Resources/Aurorae/CatppuccinMocha-Classic/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"KPlugin": {
"Authors": [
{
"Email": "[email protected]",
"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"
}
}
2 changes: 1 addition & 1 deletion Resources/Aurorae/CatppuccinMocha-Modern/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Comment=Soothing Pastel theme for Kwin
X-KDE-PluginInfo-Author=Cequal-Catppuccin
[email protected]
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=
Expand Down
19 changes: 19 additions & 0 deletions Resources/Aurorae/CatppuccinMocha-Modern/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"KPlugin": {
"Authors": [
{
"Email": "[email protected]",
"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"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/LookAndFeel/defaults
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions Resources/LookAndFeel/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
[email protected]
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
22 changes: 22 additions & 0 deletions Resources/LookAndFeel/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"KPackageStructure": "Plasma/LookAndFeel",
"KPlugin": {
"Authors": [
{
"Email": "[email protected]",
"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"
]
}
23 changes: 11 additions & 12 deletions Resources/splash-screen/contents/splash/Splash.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
}
Expand All @@ -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
}
}
}
Expand All @@ -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
}
}
2 changes: 1 addition & 1 deletion Resources/splash-screen/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ [email protected]
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
19 changes: 19 additions & 0 deletions Resources/splash-screen/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"KPackageStructure": "Plasma/LookAndFeel",
"KPlugin": {
"Authors": [
{
"Email": "[email protected]",
"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"
}
}
Loading