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

fix: adw 1.6 deprecations #479

Open
wants to merge 10 commits into
base: master
Choose a base branch
from

Conversation

GeopJr
Copy link

@GeopJr GeopJr commented Aug 5, 2024

Libadwaita 1.6 is around the corner so I migrated some dialogs to the non-deprecated versions:

AdwAboutWindow => AdwAboutDialog
AdwMessageDialog => AdwAlertDialog

I also changed the uri-dialog's GtkEntry to AdwEntryRow to better match the HIG

image

My C is a bit rusty, let me know if I should change something or if I should split this PR into smaller ones!

Additionally, there's another change that should be done but it's a bit too much for me to do, the main window should become AdwWindow / AdwApplicationWindow to take full advantage of the dialogs. Those windows can display the dialogs inside of them instead of creating new ones and making them modals, which has the added bonus of the dialogs becoming bottom-sheets on narrow window sizes to better fit mobile devices

@Rafostar
Copy link
Owner

Rafostar commented Aug 5, 2024

Thanks for PR! Since this is part of the application itself, I am kinda surprised you are contributing to something that Tuba doesn't use 😉

I haven't looked closely at code yet, but one thing I think you might have missed is bumping minimal required libadwaita version in meson.

@GeopJr
Copy link
Author

GeopJr commented Aug 5, 2024

Since this is part of the application itself, I am kinda surprised you are contributing to something that Tuba doesn't use 😉

I 💖 Clapper!

I haven't looked closely at code yet, but one thing I think you might have missed is bumping minimal required libadwaita version in meson.

Done! I also bumped gtk's to libadwaita 1.5's minimum

@GeopJr GeopJr marked this pull request as draft August 6, 2024 15:50
AdwMessageDialog is deprecated on libadwaita 1.6. Additionally, replace GtkEntry with AdwEntryRow to better follow the HIG.
AdwAboutWindow is deprecated on libadwaita 1.6.
@GeopJr GeopJr marked this pull request as ready for review August 6, 2024 16:29
meson.build Outdated Show resolved Hide resolved
src/bin/clapper-app/clapper-app-about-dialog.c Outdated Show resolved Hide resolved
src/bin/clapper-app/clapper-app-about-dialog.h Outdated Show resolved Hide resolved
src/bin/clapper-app/ui/clapper-app-uri-dialog.ui Outdated Show resolved Hide resolved
src/bin/clapper-app/ui/clapper-app-uri-dialog.ui Outdated Show resolved Hide resolved
src/bin/clapper-app/ui/clapper-app-uri-dialog.ui Outdated Show resolved Hide resolved
src/bin/clapper-app/ui/clapper-app-uri-dialog.ui Outdated Show resolved Hide resolved
src/bin/clapper-app/clapper-app-uri-dialog.c Outdated Show resolved Hide resolved
src/bin/clapper-app/clapper-app-uri-dialog.c Outdated Show resolved Hide resolved
src/bin/clapper-app/clapper-app-uri-dialog.c Outdated Show resolved Hide resolved
Copy link
Owner

@Rafostar Rafostar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just few small suggestions to be applied. Thanks for bearing with me 🙇

src/bin/clapper-app/clapper-app-about-dialog.c Outdated Show resolved Hide resolved
src/bin/clapper-app/clapper-app-about-dialog.h Outdated Show resolved Hide resolved
src/bin/clapper-app/clapper-app-uri-dialog.c Outdated Show resolved Hide resolved
src/bin/clapper-app/clapper-app-uri-dialog.c Outdated Show resolved Hide resolved
src/bin/clapper-app/clapper-app-uri-dialog.c Outdated Show resolved Hide resolved
src/bin/clapper-app/clapper-app-uri-dialog.c Outdated Show resolved Hide resolved
@Rafostar
Copy link
Owner

Hi. Sorry for late reply (I was on vacation break last month). This PR looks good to me. Thanks!

Although, if its ok with you, I will hold it off for now until I have time to work on AdwWindow ports (as I am working on some other Clapper feature right now), since currently this causes criticals (https://gitlab.gnome.org/GNOME/libadwaita/-/issues/912).

There should be both this + AdwWindows in a single release of Clapper and I haven't decided yet if I will make a release before or after working on AdwWindow changes.

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.

2 participants