ryonakano · ryonakano · Mar 16, 2025 · Mar 14, 2025 · Mar 16, 2025 · Mar 16, 2025
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ builddir*
 # subprojects
 subprojects/live-chart
 subprojects/ryokucha
+subprojects/blueprint-compiler
diff --git a/README.md b/README.md
@@ -49,6 +49,7 @@ flatpak run com.github.ryonakano.reco.Devel
 ### From Source Code (Native)
 You'll need the following dependencies to build:
 
+* blueprint-compiler
 * libadwaita-1-dev
 * libgee-0.8-dev
 * libglib2.0-dev (>= 2.74)

diff --git a/build-aux/appcenter/com.github.ryonakano.reco.Devel.yml b/build-aux/appcenter/com.github.ryonakano.reco.Devel.yml
@@ -44,6 +44,19 @@ modules:
           type: git
           tag-pattern: '^([\d.]+)$'
 
+  - name: blueprint-compiler
+    buildsystem: meson
+    cleanup:
+      - '*'
+    sources:
+      - type: git
+        url: https://gitlab.gnome.org/jwestman/blueprint-compiler.git
+        tag: v0.16.0
+        commit: 04ef0944db56ab01307a29aaa7303df6067cb3c0
+        x-checker-data:
+          type: git
+          tag-pattern: ^v([\d.]+)$
+
   - name: reco
     buildsystem: meson
     config-opts:

diff --git a/build-aux/flathub/com.github.ryonakano.reco.Devel.yml b/build-aux/flathub/com.github.ryonakano.reco.Devel.yml
@@ -44,6 +44,19 @@ modules:
           type: git
           tag-pattern: '^([\d.]+)$'
 
+  - name: blueprint-compiler
+    buildsystem: meson
+    cleanup:
+      - '*'
+    sources:
+        url: https://gitlab.gnome.org/jwestman/blueprint-compiler.git
+        tag: v0.16.0
+        commit: 04ef0944db56ab01307a29aaa7303df6067cb3c0
+        x-checker-data:
+          type: git
+          tag-pattern: ^v([\d.]+)$
+
   - name: reco
     buildsystem: meson
     config-opts:

diff --git a/com.github.ryonakano.reco.yml b/com.github.ryonakano.reco.yml
@@ -45,6 +45,19 @@ modules:
           type: git
           tag-pattern: '^([\d.]+)$'
 
+  - name: blueprint-compiler
+    buildsystem: meson
+    cleanup:
+      - '*'
+    sources:
+      - type: git
+        url: https://gitlab.gnome.org/jwestman/blueprint-compiler.git
+        tag: v0.16.0
+        commit: 04ef0944db56ab01307a29aaa7303df6067cb3c0
+        x-checker-data:
+          type: git
+          tag-pattern: ^v([\d.]+)$
+
   - name: reco
     buildsystem: meson
     config-opts:

diff --git a/data/meson.build b/data/meson.build
@@ -59,9 +59,24 @@ install_data(
     install_dir: get_option('datadir') / 'glib-2.0' / 'schemas'
 )
 
+blueprints = custom_target('blueprints',
+    input: files(
+        'ui/help-overlay.blp',
+    ),
+    output: '.',
+    command: [
+        find_program('blueprint-compiler'),
+        'batch-compile',
+        '@OUTPUT@',
+        '@CURRENT_SOURCE_DIR@',
+        '@INPUT@'
+    ]
+)
+
 asresources = gnome.compile_resources(
     'as-resources',
     'reco.gresource.xml',
+    dependencies: blueprints,
     source_dir: 'data',
     c_name: 'as'
 )
diff --git a/data/reco.gresource.xml b/data/reco.gresource.xml
@@ -2,7 +2,10 @@
 <gresources>
   <gresource prefix="/com/github/ryonakano/reco">
     <file alias="Application.css">Application.css</file>
+
+    <file preprocess="xml-stripblanks" alias="gtk/help-overlay.ui">ui/help-overlay.ui</file>
   </gresource>
+
   <gresource prefix="/com/github/ryonakano/reco/icons">
     <file compressed="true" preprocess="xml-stripblanks" alias="record-completed-symbolic.svg">icons/record-completed-symbolic.svg</file>
   </gresource>

diff --git a/data/ui/help-overlay.blp b/data/ui/help-overlay.blp
@@ -0,0 +1,32 @@
+using Gtk 4.0;
+
+ShortcutsWindow help_overlay {
+    modal: true;
+
+    ShortcutsSection {
+        section-name: "shortcuts";
+
+        ShortcutsGroup {
+            title: C_("shortcut window", "General");
+
+            ShortcutsShortcut {
+                title: C_("shortcut window", "Keyboard Shortcuts");
+                action-name: "win.show-help-overlay";
+            }
+
+            ShortcutsShortcut {
+                title: C_("shortcut window", "Quit");
+                action-name: "app.quit";
+            }
+        }
+
+        ShortcutsGroup {
+            title: C_("shortcut window", "Recording");
+
+            ShortcutsShortcut {
+                title: C_("shortcut window", "Start/Stop recording");
+                accelerator: "<Shift><Ctrl>R";
+            }
+        }
+    }
+}
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -35,6 +35,7 @@ public class MainWindow : Adw.ApplicationWindow {
 
         var main_menu = new Menu ();
         main_menu.append_submenu (_("_Style"), style_submenu);
+        main_menu.append (_("_Keyboard Shortcuts"), "win.show-help-overlay");
 
         var menu_button = new Gtk.MenuButton () {
             tooltip_text = _("Main Menu"),

diff --git a/src/View/RecordView.vala b/src/View/RecordView.vala
@@ -54,11 +54,7 @@ public class View.RecordView : AbstractView {
 
         stop_button = new Gtk.Button () {
             icon_name = "media-playback-stop-symbolic",
-#if USE_GRANITE
-            tooltip_markup = Granite.markup_accel_tooltip ({"<Shift><Ctrl>R"}, _("Finish recording")),
-#else
             tooltip_text = _("Finish recording"),
-#endif
             halign = Gtk.Align.CENTER,
             width_request = 48,
             height_request = 48

diff --git a/src/View/WelcomeView.vala b/src/View/WelcomeView.vala
@@ -153,11 +153,7 @@ public class View.WelcomeView : AbstractView {
 
         record_button = new Gtk.Button () {
             icon_name = "audio-input-microphone-symbolic",
-#if USE_GRANITE
-            tooltip_markup = Granite.markup_accel_tooltip ({"<Shift><Ctrl>R"}, _("Start recording")),
-#else
             tooltip_text = _("Start recording"),
-#endif
             halign = Gtk.Align.CENTER,
             margin_top = 12,
             width_request = 48,

diff --git a/subprojects/blueprint-compiler.wrap b/subprojects/blueprint-compiler.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+directory = blueprint-compiler
+url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
+revision = v0.16.0
+depth = 1
+
+[provide]
+program_names = blueprint-compiler