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

Update installer script #55

Merged
merged 6 commits into from
Mar 8, 2024
Merged

Update installer script #55

merged 6 commits into from
Mar 8, 2024

Conversation

dinckelman
Copy link
Contributor

@dinckelman dinckelman commented Mar 5, 2024

Two patches included:

  • Add support for installing window decorations through the script, rather than KDE/Pling store
  • Install KF6-compatible metadata along with the rest of the theme

Issues worth noting:

  • An assumption that kpackagetool6 is available is made. Plasma5 users will have an issue with installing this
  • Some assumptions are made for the window decorations
  • None of the themes apply automatically, however all of them apply manually correctly from Global Themes
  • None of the Lightly related edits work, obviously, as that theme also requires a KF6/Qt6 update

I strongly recommend checking if everything makes sense, before attempting to merge, because I have probably made mistakes somewhere. Several trial runs with different configurations have not shown immediate issues

Odd formatting
@Sourcastic
Copy link
Member

Hey, thank you so much for this. I'll take a proper look at this tomorrow, as it's quite late.

However, we have uploaded the plasma 6 aurorae themes to the KDE Store now: https://www.pling.com/u/catppuccin/products. If you're interested, we could have it work as it did before.

@pluiedev
Copy link

pluiedev commented Mar 6, 2024

As Plasma 6 is still very new I think it's necessary to preserve Plasma 5 support for now. Perhaps when Plasma 5 is declared EOL then we can remove support for it

@Sourcastic
Copy link
Member

I don't think the plan is to necessarily "remove support" per se. Once the porting work is done, I'll make one final Plasma5 release (0.2.5) to point people to (and maybe even add a note in the readme). And then make a 0.2.6 release onwards.

Though, testing @dinckelman's patch, it works just fine on Plasma 5 still.

@dinckelman
Copy link
Contributor Author

However, we have uploaded the plasma 6 aurorae themes to the KDE Store now: https://www.pling.com/u/catppuccin/products. If you're interested, we could have it work as it did before.

Definitely a possibility. That could just be left as a debug flag, and omitted from the regular process.

As Plasma 6 is still very new I think it's necessary to preserve Plasma 5 support for now. Perhaps when Plasma 5 is declared EOL then we can remove support for it.

Like I've mentioned, I think this should be taken a look at for sure. I was considering adding a check for which version is available, however I believe it's better to leave that up to debate for the original maintainers.

One thought I've had in the meantime is that this could potentially be split twofold. Since the script already installs the entire theme as-is, without the need of kpackagetool, it could just be omitted. I imagine if you're using Pling to get the theme, you won't really be dealing with this to begin with. I suppose that's what the specific definitions in the metadata were helpful for before

@Sourcastic
Copy link
Member

Sourcastic commented Mar 6, 2024

Ok so I tested this on plasma 5, the script does work, this still applies though:

None of the themes apply automatically, however all of them apply manually correctly from Global Themes

This wasn't how it worked before, I've been trying to see why for a while now, but it's confusing. For some reason, the kpackage that forms is the splash theme? So if you installed Mocha + Muave, it makes Catppuccin-Mocha-Muave-splash which obviously makes the lookandfeeltool command fail. I'll try to fix this tomorrow, otherwise it does work.

Like I've mentioned, I think this should be taken a look at for sure. I was considering adding a check for which version is available, however I believe it's better to leave that up to debate for the original maintainers.

I was thinking of doing something like this as well, but somehow it does work on plasma 5.

One thought I've had in the meantime is that this could potentially be split twofold. Since the script already installs the entire theme as-is, without the need of kpackagetool, it could just be omitted. I imagine if you're using Pling to get the theme, you won't really be dealing with this to begin with. I suppose that's what the specific definitions in the metadata were helpful for before

Yup, this was how it originally worked. It could make sense to revert it to that behaviour. For now, it might be better to get the kde6 port out as soon as possible if it works and then try to make those changes.

Definitely a possibility. That could just be left as a debug flag, and omitted from the regular process.

Also, yes. Either way would work on both plasma 6 and 5 as well since it includes both metadata.desktop and metadata.json.

@Sourcastic
Copy link
Member

Hey, so I've tried to fix the whole theme-not-applying issue, but I couldn't get it to work. It works just fine on plasma 5 with kpackagetool5, but they seemed to have changed something in plasma 6 that isn't well documented.

Just added a quick workaround that removes the reliance on kpackagetool6, would appreciate it if someone could test it out real quick, and then we could get this merged.

P.S: Sorry for the double commit.

@dinckelman
Copy link
Contributor Author

dinckelman commented Mar 7, 2024

Appears to be working properly for me. It actually even applies the theme too now, on Plasma 6

@Sourcastic
Copy link
Member

Appears to be working properly for me. It actually even applies the theme too now, on Plasma 6

Oh, does it? It didn't for me. I'll ask a couple of people on discord to see how it behaves.

@NullCub3
Copy link

NullCub3 commented Mar 8, 2024

Chiming in here, the script works great for me, everything seems to apply correctly except for the splash screen for some reason. The theme is still in the settings but it doesn't appear to get switched to from my testing.

@Sourcastic
Copy link
Member

Ok so asking around, that seems to line up with most people's experience. The splash screen isn't ported (That requires some QML knowledge I suppose) and the lightly plasma theme doesn't install. It does, however, apply.

I think some of the changes then would be to port the splash theme and we should maybe remove lightly and just shift to default breeze? Thoughts?

@pluiedev
Copy link

pluiedev commented Mar 8, 2024

Personally I think Plasma 6 Breeze is perfectly aesthetically pleasing enough for me. Plus, I think it is a tad weird that Catppuccin, which is supposed to just be a color scheme system, bundles an alternate window decoration set and such anyway.

@Sourcastic
Copy link
Member

Personally I think Plasma 6 Breeze is perfectly aesthetically pleasing enough for me. Plus, I think it is a tad weird that Catppuccin, which is supposed to just be a color scheme system, bundles an alternate window decoration set and such anyway.

Very fair, yeah. I think it's something that's left from when another person was the main maintainer. I'll try to make it breeze by default then.

@Sourcastic
Copy link
Member

Sourcastic commented Mar 8, 2024

I'll stop hijacking this PR then, thank you so much for your help @dinckelman, I'll add you to the contributor's list as well!! ❤️

Edit: Due to overall org policy, the contributor's list has been deprecated in favour of what GitHub just has automatically. Still, tysm for your help.

@Sourcastic Sourcastic merged commit 0352cee into catppuccin:dev Mar 8, 2024
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants