From be6bc9b4310c197f9268d6787b734c874bf929d9 Mon Sep 17 00:00:00 2001 From: Urtsi Santsi Date: Thu, 3 Jul 2025 16:40:08 +0300 Subject: [PATCH] Port to AdwShortcutsDialog --- build-aux/io.github.flattool.Warehouse.json | 4 +- po/POTFILES | 2 +- src/gtk/help-overlay.blp | 123 -------------------- src/gtk/shortcuts-dialog.blp | 119 +++++++++++++++++++ src/main_window/window.blp | 2 +- src/meson.build | 2 +- src/warehouse.gresource.xml | 2 +- 7 files changed, 125 insertions(+), 129 deletions(-) delete mode 100644 src/gtk/help-overlay.blp create mode 100644 src/gtk/shortcuts-dialog.blp diff --git a/build-aux/io.github.flattool.Warehouse.json b/build-aux/io.github.flattool.Warehouse.json index ab05e105..f5af5bbe 100644 --- a/build-aux/io.github.flattool.Warehouse.json +++ b/build-aux/io.github.flattool.Warehouse.json @@ -1,7 +1,7 @@ { "id": "io.github.flattool.Warehouse", "runtime": "org.gnome.Platform", - "runtime-version": "48", + "runtime-version": "49", "sdk": "org.gnome.Sdk", "command": "warehouse", "finish-args": [ @@ -34,7 +34,7 @@ { "type": "git", "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler", - "tag": "v0.16.0" + "tag": "v0.18.0" } ], "cleanup": ["*"] diff --git a/po/POTFILES b/po/POTFILES index f830f1a2..46cd0a52 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -8,7 +8,7 @@ src/gtk/app_row.blp src/gtk/attempt_install_dialog.blp src/gtk/attempt_install_dialog.py src/gtk/error_toast.py -src/gtk/help-overlay.blp +src/gtk/shortcuts-dialog.blp src/gtk/installation_chooser.blp src/gtk/installation_chooser.py src/gtk/loading_status.blp diff --git a/src/gtk/help-overlay.blp b/src/gtk/help-overlay.blp deleted file mode 100644 index 13e52063..00000000 --- a/src/gtk/help-overlay.blp +++ /dev/null @@ -1,123 +0,0 @@ -using Gtk 4.0; - -ShortcutsWindow help_overlay { - modal: true; - ShortcutsSection { - section-name: "shortcuts"; - max-height: 17; - ShortcutsGroup { - title: _("General"); - ShortcutsShortcut { - title: _("Refresh"); - action-name: "app.refresh"; - } - ShortcutsShortcut { - title: _("Open Files"); - action-name: "app.open-files"; - } - ShortcutsShortcut { - title: _("Open Menu"); - action-name: "app.open-menu"; - } - ShortcutsShortcut { - title: _("Show Shortcuts"); - action-name: "win.show-help-overlay"; - } - ShortcutsShortcut { - title: _("Quit"); - action-name: "app.quit"; - } - } - ShortcutsGroup { - title: _("Navigation"); - ShortcutsShortcut { - title: _("Show Packages Page"); - action-name: "app.show-packages-page"; - } - ShortcutsShortcut { - title: _("Show Remotes Page"); - action-name: "app.show-remotes-page"; - } - ShortcutsShortcut { - title: _("Show User Data Page"); - action-name: "app.show-user-data-page"; - } - ShortcutsShortcut { - title: _("Show Snapshots Page"); - action-name: "app.show-snapshots-page"; - } - ShortcutsShortcut { - title: _("Show Install Page"); - action-name: "app.show-install-page"; - } - } - ShortcutsGroup { - title: _("Packages Page"); - ShortcutsShortcut { - title: _("Search Mode"); - action-name: "app.search-mode"; - } - ShortcutsShortcut { - title: _("Edit Filters"); - action-name: "app.filter"; - } - ShortcutsShortcut { - title: _("Selection Mode"); - action-name: "app.toggle-select-mode"; - } - } - ShortcutsGroup { - title: _("Remotes Page"); - ShortcutsShortcut { - title: _("Search Mode"); - action-name: "app.search-mode"; - } - ShortcutsShortcut { - title: _("Show or Hide Disabled Remotes"); - action-name: "app.filter"; - } - ShortcutsShortcut { - title: _("New Remote"); - action-name: "app.new"; - } - } - ShortcutsGroup { - title: _("User Data Page"); - ShortcutsShortcut { - title: _("Search Mode"); - action-name: "app.search-mode"; - } - ShortcutsShortcut { - title: _("Edit Sorting Modes"); - action-name: "app.filter"; - } - ShortcutsShortcut { - title: _("Selection Mode"); - action-name: "app.toggle-select-mode"; - } - ShortcutsShortcut { - title: _("Show Active Data"); - action-name: "app.active-data-view"; - } - ShortcutsShortcut { - title: _("Show Leftover Data"); - action-name: "app.leftover-data-view"; - } - } - ShortcutsGroup { - title: _("Snapshots Page"); - ShortcutsShortcut { - title: _("Search Mode"); - action-name: "app.search-mode"; - } - ShortcutsShortcut { - title: _("Selection Mode"); - action-name: "app.toggle-select-mode"; - } - ShortcutsShortcut { - title: _("New Snapshots"); - action-name: "app.new"; - } - } - } -} diff --git a/src/gtk/shortcuts-dialog.blp b/src/gtk/shortcuts-dialog.blp new file mode 100644 index 00000000..4051b02f --- /dev/null +++ b/src/gtk/shortcuts-dialog.blp @@ -0,0 +1,119 @@ +using Gtk 4.0; +using Adw 1; + +Adw.ShortcutsDialog shortcuts_dialog { + Adw.ShortcutsSection { + title: _("General"); + Adw.ShortcutsItem { + title: _("Refresh"); + action-name: "app.refresh"; + } + Adw.ShortcutsItem { + title: _("Open Files"); + action-name: "app.open-files"; + } + Adw.ShortcutsItem { + title: _("Open Menu"); + action-name: "app.open-menu"; + } + Adw.ShortcutsItem { + title: _("Show Shortcuts"); + action-name: "app.shortcuts"; + } + Adw.ShortcutsItem { + title: _("Quit"); + action-name: "app.quit"; + } + } + Adw.ShortcutsSection { + title: _("Navigation"); + Adw.ShortcutsItem { + title: _("Show Packages Page"); + action-name: "app.show-packages-page"; + } + Adw.ShortcutsItem { + title: _("Show Remotes Page"); + action-name: "app.show-remotes-page"; + } + Adw.ShortcutsItem { + title: _("Show User Data Page"); + action-name: "app.show-user-data-page"; + } + Adw.ShortcutsItem { + title: _("Show Snapshots Page"); + action-name: "app.show-snapshots-page"; + } + Adw.ShortcutsItem { + title: _("Show Install Page"); + action-name: "app.show-install-page"; + } + } + Adw.ShortcutsSection { + title: _("Packages Page"); + Adw.ShortcutsItem { + title: _("Search Mode"); + action-name: "app.search-mode"; + } + Adw.ShortcutsItem { + title: _("Edit Filters"); + action-name: "app.filter"; + } + Adw.ShortcutsItem { + title: _("Selection Mode"); + action-name: "app.toggle-select-mode"; + } + } + Adw.ShortcutsSection { + title: _("Remotes Page"); + Adw.ShortcutsItem { + title: _("Search Mode"); + action-name: "app.search-mode"; + } + Adw.ShortcutsItem { + title: _("Show or Hide Disabled Remotes"); + action-name: "app.filter"; + } + Adw.ShortcutsItem { + title: _("New Remote"); + action-name: "app.new"; + } + } + Adw.ShortcutsSection { + title: _("User Data Page"); + Adw.ShortcutsItem { + title: _("Search Mode"); + action-name: "app.search-mode"; + } + Adw.ShortcutsItem { + title: _("Edit Sorting Modes"); + action-name: "app.filter"; + } + Adw.ShortcutsItem { + title: _("Selection Mode"); + action-name: "app.toggle-select-mode"; + } + Adw.ShortcutsItem { + title: _("Show Active Data"); + action-name: "app.active-data-view"; + } + Adw.ShortcutsItem { + title: _("Show Leftover Data"); + action-name: "app.leftover-data-view"; + } + } + Adw.ShortcutsSection { + title: _("Snapshots Page"); + Adw.ShortcutsItem { + title: _("Search Mode"); + action-name: "app.search-mode"; + } + Adw.ShortcutsItem { + title: _("Selection Mode"); + action-name: "app.toggle-select-mode"; + } + Adw.ShortcutsItem { + title: _("New Snapshots"); + action-name: "app.new"; + } + } +} diff --git a/src/main_window/window.blp b/src/main_window/window.blp index 98049c67..244121b1 100644 --- a/src/main_window/window.blp +++ b/src/main_window/window.blp @@ -163,7 +163,7 @@ menu primary_menu { } item { label: _("_Keyboard Shortcuts"); - action: "win.show-help-overlay"; + action: "app.shortcuts"; } item { label: _("_About Warehouse"); diff --git a/src/meson.build b/src/meson.build index afb663a6..d9bf1c27 100644 --- a/src/meson.build +++ b/src/meson.build @@ -5,7 +5,7 @@ gnome = import('gnome') blueprints = custom_target('blueprints', input: files( 'gtk/app_row.blp', - 'gtk/help-overlay.blp', + 'gtk/shortcuts-dialog.blp', 'gtk/loading_status.blp', 'gtk/installation_chooser.blp', 'gtk/attempt_install_dialog.blp', diff --git a/src/warehouse.gresource.xml b/src/warehouse.gresource.xml index 814b0a3b..4fd55d36 100644 --- a/src/warehouse.gresource.xml +++ b/src/warehouse.gresource.xml @@ -2,7 +2,7 @@ ../data/style.css - gtk/help-overlay.ui + gtk/shortcuts-dialog.ui gtk/loading_status.ui gtk/app_row.ui gtk/installation_chooser.ui