Migrate to Adwaita 1.8 Shortcut Dialog

.github/workflows/apply-translations.yml

@@ -65,7 +65,7 @@ jobs:
                     echo >> po/POTFILES
                     find quick-add -name "*.vala" | sort >> po/POTFILES
                     echo >> po/POTFILES
-                    echo "data/resources/ui/shortcuts.ui" >> po/POTFILES
+                    echo "data/resources/ui/shortcuts.blp" >> po/POTFILES
 
                     python3 scripts/update_translations.py
 

.github/workflows/caldav-test.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Install dependencies
         run: |
           apt-get update
-          apt-get install -y sudo pipx git apache2-utils valac meson ninja-build gettext desktop-file-utils libgtk-4-dev libadwaita-1-dev libgee-0.8-dev libgranite-7-dev libjson-glib-dev libecal2.0-dev libsoup-3.0-dev libwebkitgtk-6.0-dev libgtksourceview-5-dev libportal-dev libportal-gtk4-dev libspelling-1-dev dbus-x11 evolution-data-server
+          apt-get install -y sudo pipx git apache2-utils valac meson ninja-build gettext desktop-file-utils libgtk-4-dev libadwaita-1-dev libgee-0.8-dev libgranite-7-dev libjson-glib-dev libecal2.0-dev libsoup-3.0-dev libwebkitgtk-6.0-dev libgtksourceview-5-dev libportal-dev libportal-gtk4-dev libspelling-1-dev dbus-x11 evolution-data-server blueprint-compiler
 
       - name: Install Radicale with pipx
         run: |

.github/workflows/check-translations.yml

@@ -48,7 +48,7 @@ jobs:
                     echo >> po/POTFILES
                     find quick-add -name "*.vala" | sort >> po/POTFILES
                     echo >> po/POTFILES
-                    echo "data/resources/ui/shortcuts.ui" >> po/POTFILES
+                    echo "data/resources/ui/shortcuts.blp" >> po/POTFILES
 
                     python3 ../main-repo/scripts/update_translations.py
 

.gitignore

@@ -11,3 +11,6 @@ subprojects/gxml**/
 planify*txt
 .flatpak
 .buildconfig
+
+/subprojects/blueprint-compiler
+/data/resources/ui/*.ui

data/resources/ui/shortcuts.blp

@@ -0,0 +1,95 @@
+using Gtk 4.0;
+using Adw 1;
+
+Adw.ShortcutsDialog shortcuts_dialog {
+  Adw.ShortcutsSection {
+    title: C_("shortcut window", "Used Anywhere");
+
+    Adw.ShortcutsItem {
+      accelerator: "a";
+      title: C_("shortcut window", "Create a New Task");
+    }
+
+    Adw.ShortcutsItem {
+      accelerator: "<ctrl>v";
+      title: C_("shortcut window", "Paste Plain Text to Create New Task");
+    }
+
+    Adw.ShortcutsItem {
+      accelerator: "p";
+      title: C_("shortcut window", "Create a New Project");
+    }
+
+    Adw.ShortcutsItem {
+      accelerator: "s";
+      title: C_("shortcut window", "Create a New Section in a Project");
+    }
+  }
+
+  Adw.ShortcutsSection {
+    title: C_("shortcut window", "Search");
+
+    Adw.ShortcutsItem {
+      accelerator: "<ctrl>f";
+      title: C_("shortcut window", "Open Quick Find");
+    }
+  }
+
+  Adw.ShortcutsSection {
+    title: C_("shortcut window", "Control Windows");
+
+    Adw.ShortcutsItem {
+      accelerator: "<ctrl>q";
+      title: C_("shortcut window", "Quit");
+    }
+
+    Adw.ShortcutsItem {
+      accelerator: "<ctrl>comma";
+      title: C_("shortcut window", "Open Preferences");
+    }
+
+    Adw.ShortcutsItem {
+      accelerator: "m";
+      title: C_("shortcut window", "Toggle Sidebar");
+    }
+
+    Adw.ShortcutsItem {
+      accelerator: "F1";
+      title: C_("shortcut window", "Open Keyboard Shortcuts");
+    }
+  }
+
+  Adw.ShortcutsSection {
+    title: C_("shortcut window", "Navigate");
+
+    Adw.ShortcutsItem {
+      accelerator: "<ctrl>h";
+      title: C_("shortcut window", "Open Homepage");
+    }
+
+    Adw.ShortcutsItem {
+      accelerator: "<ctrl>i";
+      title: C_("shortcut window", "Open Inbox");
+    }
+
+    Adw.ShortcutsItem {
+      accelerator: "<ctrl>t";
+      title: C_("shortcut window", "Open Today");
+    }
+
+    Adw.ShortcutsItem {
+      accelerator: "<ctrl>u";
+      title: C_("shortcut window", "Open Scheduled");
+    }
+
+    Adw.ShortcutsItem {
+      accelerator: "<ctrl>l";
+      title: C_("shortcut window", "Open Labels");
+    }
+
+    Adw.ShortcutsItem {
+      accelerator: "<ctrl>p";
+      title: C_("shortcut window", "Open Pinboard");
+    }
+  }
+}

meson.build

@@ -60,12 +60,24 @@ endif
 # Resources #
 ############
 
+
+blueprints = custom_target('blueprints',
+                           input : files(
+                               'data/resources/ui/shortcuts.blp',
+                           ),
+                           output : 'shortcuts.ui',
+                           command : [find_program('blueprint-compiler'), 'batch-compile', '@CURRENT_SOURCE_DIR@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
+)
+
+
 asresources = gnome.compile_resources (
     'as-resources', 'data/io.github.alainm23.planify.gresource.xml',
+    dependencies: blueprints,
     source_dir: 'data',
     c_name: 'as'
 )
 
+
 ###########
 # Profile #
 ###########

scripts/update_translations.py

@@ -69,7 +69,7 @@ def main():
     subprocess.run([
         'xgettext', '--files-from=po/POTFILES', '--directory=.',
         '--output=po/io.github.alainm23.planify.pot',
-        '--from-code=UTF-8', '--keyword=_', '--keyword=N_',
+        '--from-code=UTF-8', '--keyword=_', '--keyword=N_', '--keyword=C_:1c,2'
         '--package-name=io.github.alainm23.planify'
     ], check=True)
 

src/MainWindow.vala

@@ -788,9 +788,8 @@ public class MainWindow : Adw.ApplicationWindow {
             var shortcuts_builder = new Gtk.Builder ();
             shortcuts_builder.add_from_resource ("/io/github/alainm23/planify/shortcuts.ui");
 
-            var shortcuts_window = (Gtk.ShortcutsWindow) shortcuts_builder.get_object ("shortcuts-planify");
-            shortcuts_window.set_transient_for (this);
-            shortcuts_window.show ();
+            var shortcuts_dialog = (Adw.ShortcutsDialog) shortcuts_builder.get_object ("shortcuts_dialog");
+            shortcuts_dialog.present (this);
         } catch (Error e) {
             warning ("Failed to open shortcuts window: %s\n", e.message);
         }