book: Use adw::ShortcutDialog
#2193
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hofer-Julian
commented
Dec 7, 2025
| <item> | ||
| <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute> | ||
| <attribute name="action">win.show-help-overlay</attribute> | ||
| <attribute name="action">app.shortcuts</attribute> |
Collaborator
Author
There was a problem hiding this comment.
TODO: Mention that change in the book
| <interface> | ||
| <object class="GtkShortcutsWindow" id="help_overlay"> | ||
| <property name="modal">True</property> | ||
| <object class="AdwShortcutsDialog" id="shortcuts_dialog"> |
Collaborator
Author
There was a problem hiding this comment.
TODO: Mention the changed id in the book
| <gresources> | ||
| <gresource prefix="/org/gtk_rs/Todo6/"> | ||
| <file compressed="true" preprocess="xml-stripblanks" alias="gtk/help-overlay.ui">shortcuts.ui</file> | ||
| <file compressed="true" preprocess="xml-stripblanks" alias="shortcuts-dialog.ui">shortcuts.ui</file> |
Collaborator
Author
There was a problem hiding this comment.
TODO: Mention that change in the book
Comment on lines
+158
to
+165
| Now that we are using Libadwaita, we should also update our keyboard shortcuts window to use [`adw::ShortcutsDialog`](https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs/stable/latest/docs/libadwaita/struct.ShortcutsDialog.html). | ||
| This widget is the Libadwaita equivalent of [`gtk::ShortcutsWindow`](https://gtk-rs.org/gtk4-rs/stable/latest/docs/gtk4/struct.ShortcutsWindow.html) and provides better integration with the Adwaita style. | ||
|
|
||
| The main differences are: | ||
|
|
||
| - [`adw::ShortcutsDialog`](https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs/stable/latest/docs/libadwaita/struct.ShortcutsDialog.html) extends [`adw::Dialog`](https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs/stable/latest/docs/libadwaita/struct.Dialog.html) rather than [`gtk::Window`](https://gtk-rs.org/gtk4-rs/stable/latest/docs/gtk4/struct.Window.html) | ||
| - It uses [`adw::ShortcutsSection`](https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs/stable/latest/docs/libadwaita/struct.ShortcutsSection.html) and [`adw::ShortcutsItem`](https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs/stable/latest/docs/libadwaita/struct.ShortcutsItem.html) instead of [`gtk::ShortcutsSection`](https://gtk-rs.org/gtk4-rs/stable/latest/docs/gtk4/struct.ShortcutsSection.html), [`gtk::ShortcutsGroup`](https://gtk-rs.org/gtk4-rs/stable/latest/docs/gtk4/struct.ShortcutsGroup.html), and [`gtk::ShortcutsShortcut`](https://gtk-rs.org/gtk4-rs/stable/latest/docs/gtk4/struct.ShortcutsShortcut.html) | ||
| - The structure is simpler, with sections directly containing items |
Collaborator
Author
There was a problem hiding this comment.
Simplify this and add diff of changed parts
| ```xml | ||
| {{#rustdoc_include ../listings/todo/6/resources/shortcuts.ui}} | ||
| ``` | ||
|
|
Collaborator
Author
There was a problem hiding this comment.
Add screenshot
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also update dependencies