diff --git a/io.github.fizzyizzy05.binary.json b/io.github.fizzyizzy05.binary.json index 6d5e2f7..fd114a9 100644 --- a/io.github.fizzyizzy05.binary.json +++ b/io.github.fizzyizzy05.binary.json @@ -1,7 +1,7 @@ { "id" : "io.github.fizzyizzy05.binary", "runtime" : "org.gnome.Platform", - "runtime-version" : "48", + "runtime-version" : "49", "sdk" : "org.gnome.Sdk", "command" : "binary", "finish-args" : [ diff --git a/po/POTFILES b/po/POTFILES index ea9da01..0430a63 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1,7 +1,7 @@ data/io.github.fizzyizzy05.binary.desktop.in data/io.github.fizzyizzy05.binary.metainfo.xml.in data/io.github.fizzyizzy05.binary.gschema.xml -src/gtk/help-overlay.blp +src/shortcuts-dialog.blp src/main.py src/window.py src/window.blp diff --git a/src/binary.gresource.xml b/src/binary.gresource.xml index c780cfd..598a946 100644 --- a/src/binary.gresource.xml +++ b/src/binary.gresource.xml @@ -5,7 +5,7 @@ preferences.ui style.css style-hc.css - gtk/help-overlay.ui + shortcuts-dialog.ui icons/scalable/actions/vertical-arrows-symbolic.svg ../data/io.github.fizzyizzy05.binary.metainfo.xml diff --git a/src/gtk/help-overlay.blp b/src/gtk/help-overlay.blp deleted file mode 100644 index 1ee6d79..0000000 --- a/src/gtk/help-overlay.blp +++ /dev/null @@ -1,34 +0,0 @@ -using Gtk 4.0; - -ShortcutsWindow help_overlay { - modal: true; - - ShortcutsSection { - section-name: "shortcuts"; - max-height: 10; - - ShortcutsGroup { - title: C_("shortcut window", "General"); - - ShortcutsShortcut { - title: C_("shortcut window", "New Window"); - action-name: "app.new-window"; - } - - ShortcutsShortcut { - title: C_("shortcut window", "Close Window"); - action-name: "app.close-window"; - } - - ShortcutsShortcut { - title: C_("shortcut window", "Show Shortcuts"); - action-name: "win.show-help-overlay"; - } - - ShortcutsShortcut { - title: C_("shortcut window", "Quit"); - action-name: "app.quit"; - } - } - } -} diff --git a/src/meson.build b/src/meson.build index 3f9913b..70f39f6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -4,7 +4,7 @@ gnome = import('gnome') blueprints = custom_target('blueprints', input: files( - 'gtk/help-overlay.blp', + 'shortcuts-dialog.blp', 'preferences.blp', 'window.blp', ), diff --git a/src/shortcuts-dialog.blp b/src/shortcuts-dialog.blp new file mode 100644 index 0000000..0e8696a --- /dev/null +++ b/src/shortcuts-dialog.blp @@ -0,0 +1,28 @@ +using Gtk 4.0; +using Adw 1; + +Adw.ShortcutsDialog shortcuts_dialog { + Adw.ShortcutsSection { + title: C_("shortcut window", "General"); + + Adw.ShortcutsItem { + title: C_("shortcut window", "New Window"); + action-name: "app.new-window"; + } + + Adw.ShortcutsItem { + title: C_("shortcut window", "Close Window"); + action-name: "app.close-window"; + } + + Adw.ShortcutsItem { + title: C_("shortcut window", "Show Shortcuts"); + action-name: "app.shortcuts"; + } + + Adw.ShortcutsItem { + title: C_("shortcut window", "Quit"); + action-name: "app.quit"; + } + } +} diff --git a/src/window.blp b/src/window.blp index dfe3833..87cad7f 100644 --- a/src/window.blp +++ b/src/window.blp @@ -184,7 +184,7 @@ menu primary_menu { section { item { label: _("_Keyboard Shortcuts"); - action: "win.show-help-overlay"; + action: "app.shortcuts"; } item {