twin3_* to twin_* #364

Merged
blu.256 merged 2 commits from fix/twin3-to-twin into master 10 months ago
Collaborator

This PR changes the way that TWin decoration libraries are called, dropping the '3' as discussed in #351.

Compatibility with the twin3_ scheme is maintained, but all the decorations are preferred to use the new scheme.

This PR changes the way that TWin decoration libraries are called, dropping the '3' as discussed in #351. Compatibility with the `twin3_` scheme is maintained, but all the decorations are preferred to use the new scheme.
blu.256 added 2 commits 10 months ago
9edbd88a9d
Make TWin look for `twin_` libraries
9c72973391
KWin: rename client libraries twin3_* -> twin_*
blu.256 force-pushed fix/twin3-to-twin from 9c72973391 to 769b5984c6 10 months ago
blu.256 requested review from SlavekB 10 months ago
blu.256 requested review from MicheleC 10 months ago
blu.256 added this to the R14.2.0 release milestone 10 months ago
SlavekB approved these changes 10 months ago
SlavekB left a comment
Owner

It looks good. I was afraid it would be a bigger problem, but this looks like a smooth change.

It looks good. I was afraid it would be a bigger problem, but this looks like a smooth change.
MicheleC requested changes 10 months ago
MicheleC left a comment
Owner

The changes look good but there are several other instances of "twin3_" left in tdebase. Some are just in Makefiles.am, so not so critical (but good to update too), but others are in xml files or cpp code related to plugins, so not sure it would affect functionality somewhere.
I think we should address all of them since we are doing the twin3 --> twin renaming.

The changes look good but there are several other instances of "twin3_" left in tdebase. Some are just in Makefiles.am, so not so critical (but good to update too), but others are in xml files or cpp code related to plugins, so not sure it would affect functionality somewhere. I think we should address all of them since we are doing the twin3 --> twin renaming.
Poster
Collaborator

I'll make the requested changes and it probably makes sense to do the same with window decorations in other repos (tdeaddons and standalone).

I'll make the requested changes and it probably makes sense to do the same with window decorations in other repos (tdeaddons and standalone).
Owner

Great, sounds good.

Great, sounds good.
blu.256 force-pushed fix/twin3-to-twin from 769b5984c6 to 603cd8312f 10 months ago
Poster
Collaborator

The changes look good but there are several other instances of "twin3_" left in tdebase. Some are just in Makefiles.am, so not so critical (but good to update too), but others are in xml files or cpp code related to plugins, so not sure it would affect functionality somewhere.

Done. Didn't test the Makefiles, though they should probably work.

> The changes look good but there are several other instances of "twin3_" left in tdebase. Some are just in Makefiles.am, so not so critical (but good to update too), but others are in xml files or cpp code related to plugins, so not sure it would affect functionality somewhere. Done. Didn't test the Makefiles, though they should *probably* work.
blu.256 requested review from MicheleC 10 months ago
Owner

Will try to find time to test it tomorrow and feedback (very busy week :-( )

Will try to find time to test it tomorrow and feedback (very busy week :-( )
Owner

Nice catch in removing the files twin3_plugin.{pl,upd}.
I did not have enough time for a full test and to prepare a debian packaging PR too. Will do that tomorrow.

Nice catch in removing the files twin3_plugin.{pl,upd}. I did not have enough time for a full test and to prepare a debian packaging PR too. Will do that tomorrow.
MicheleC approved these changes 10 months ago
MicheleC left a comment
Owner

Looks good

Looks good
Owner

@blu.256 please wait for TDE/tde-packaging#237 to be approved by Slavek, then merge this PR and subsequently that one as well (make sure to rebase it if necessary)

@blu.256 please wait for TDE/tde-packaging#237 to be approved by Slavek, then merge this PR and subsequently that one as well (make sure to rebase it if necessary)
blu.256 force-pushed fix/twin3-to-twin from 603cd8312f to 88ea716029 10 months ago
blu.256 merged commit 88ea716029 into master 10 months ago
blu.256 deleted branch fix/twin3-to-twin 10 months ago
blu.256 referenced this issue from a commit 10 months ago
blu.256 referenced this issue from a commit 10 months ago
Poster
Collaborator
@MicheleC I've made the needed changes to all window decorations I could remember of: * TDE/tdeartwork#22 * TDE/twin-style-suse2#6 * TDE/twin-style-crystal#4 * TDE/twin-style-machbunt#4 * TDE/twin-style-dekorator#3 * TDE/tde-style-baghira#10 * TDE/tde-style-ia-ora#3 * TDE/tde-style-domino#3 Let me know if it's okay to merge them.
blu.256 referenced this issue from a commit 10 months ago
Owner

Let me know if it's okay to merge them.

I will approve on those PRs as I go through

> Let me know if it's okay to merge them. I will approve on those PRs as I go through
Owner

Now I realized – we will not need an update script that existing twin3_ in users configuration will rewrite to twin_?

Now I realized – we will not need an update script that existing `twin3_` in users configuration will rewrite to `twin_`?
Owner

Now I realized – we will not need an update script that existing twin3_ in users configuration will rewrite to twin_?

Good point, we will need something like that because the theme will contain the name of the theme in it, which will change from twin3 to twin.
So it seems we have to add a conversion into r14-xdg-update

> Now I realized – we will not need an update script that existing `twin3_` in users configuration will rewrite to `twin_`? Good point, we will need something like that because the theme will contain the name of the theme in it, which will change from twin3 to twin. So it seems we have to add a conversion into r14-xdg-update
Poster
Collaborator

Now I realized – we will not need an update script that existing twin3_ in users configuration will rewrite to twin_?

That should not be necessary, as old twin3_ values still work for compatibility reasons and they will get overwritten the next time the user changes the used window decoration.

> Now I realized – we will not need an update script that existing `twin3_` in users configuration will rewrite to `twin_`? That should not be necessary, as old `twin3_` values still work for compatibility reasons and they will get overwritten the next time the user changes the used window decoration.
Owner

That should not be necessary, as old twin3_ values still work for compatibility reasons and they will get overwritten the next time the user changes the used window decoration.

I fear at the next reboot the theme will not be found if the theme is not updated (which is not something a user would do often anyway). Look at the contents of a .kth file under the wm section.
For example <wm type="builtin" name="twin3_SUSE2" > but now the name of the theme is twin_SUSE2 so probably it would not be loaded correctly.

> That should not be necessary, as old twin3_ values still work for compatibility reasons and they will get overwritten the next time the user changes the used window decoration. I fear at the next reboot the theme will not be found if the theme is not updated (which is not something a user would do often anyway). Look at the contents of a .kth file under the `wm` section. For example `<wm type="builtin" name="twin3_SUSE2" >` but now the name of the theme is `twin_SUSE2` so probably it would not be loaded correctly.
Owner

Now I realized – we will not need an update script that existing twin3_ in users configuration will rewrite to twin_?

That should not be necessary, as old twin3_ values still work for compatibility reasons and they will get overwritten the next time the user changes the used window decoration.

If the user has twin3_ in its configuration, but actually there will be twin_ on the disk, will it work? I assumed it wouldn't work. It does not seem to be KDecorationPlugins::loadPlugin(...) is ready for something like that.

> > Now I realized – we will not need an update script that existing `twin3_` in users configuration will rewrite to `twin_`? > > That should not be necessary, as old `twin3_` values still work for compatibility reasons and they will get overwritten the next time the user changes the used window decoration. If the user has `twin3_` in its configuration, but actually there will be `twin_` on the disk, will it work? I assumed it wouldn't work. It does not seem to be `KDecorationPlugins::loadPlugin(...)` is ready for something like that.
Poster
Collaborator

If the user has twin3_ in its configuration, but actually there will be twin_ on the disk, will it work? I assumed it wouldn't work. It does not seem to be KDecorationPlugins::loadPlugin(...) is ready for something like that.

I don't think there would be problems as the code can find libraries with both names but we can add an update script just to be sure.

> If the user has `twin3_` in its configuration, but actually there will be `twin_` on the disk, will it work? I assumed it wouldn't work. It does not seem to be `KDecorationPlugins::loadPlugin(...)` is ready for something like that. I don't think there would be problems as the code [can find libraries with both names](https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/src/commit/84ab47055dcfb9cf1bb11a22c8ab6de3fb0819b7/twin/kcmtwin/twindecoration/twindecoration.cpp#L417) but we can add an update script just to be sure.
Owner

Yes, the code is looking for libraries of both names. But after updating the packages, the user will have twin3_b2 in the configuration, while on the disk will be twin_b2. So twin3_b2 listed in the configuration will not be found => the default will be used.

Yes, the code is looking for libraries of both names. But after updating the packages, the user will have `twin3_b2` in the configuration, while on the disk will be `twin_b2`. So `twin3_b2` listed in the configuration will not be found => the default will be used.
Owner

See PR #372 for the renaming script.

See PR #372 for the renaming script.

Reviewers

SlavekB approved these changes 10 months ago
MicheleC approved these changes 10 months ago
The pull request has been merged as 88ea716029.
Sign in to join this conversation.
No Milestone
No Assignees
3 Participants
Notifications
Due Date

No due date set.

Reference: TDE/tdebase#364
Loading…
There is no content yet.