[iagno/arnaudb/wip/gtk4: 41/54] Use <Control>.

[Arnaud B. <arnaudb src gnome org>]

commit 115e73ec65e6b6df52b03dea7c59713891186718
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Tue Apr 7 09:26:35 2020 +0200

    Use <Control>.

 data/ui/help-overlay.ui | 10 +++++-----
 src/base-window.vala    |  2 +-
 src/iagno.vala          | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index 2e7f9bc..4344015 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -29,7 +29,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Start new game</property>
-                <property name="accelerator">&lt;Primary&gt;&lt;Shift&gt;n</property>
+                <property name="accelerator">&lt;Control&gt;&lt;Shift&gt;n</property>
               </object>
             </child>
             <child>
@@ -75,13 +75,13 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">New game</property>
-                <property name="accelerator">&lt;Primary&gt;n</property>
+                <property name="accelerator">&lt;Control&gt;n</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Undo last move</property>
-                <property name="accelerator">&lt;Primary&gt;z</property>
+                <property name="accelerator">&lt;Control&gt;z</property>
               </object>
             </child>
           </object>
@@ -92,7 +92,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Keyboard 
shortcuts</property>
-                <property name="accelerator">&lt;Primary&gt;question &lt;Primary&gt;F1</property>
+                <property name="accelerator">&lt;Control&gt;question &lt;Control&gt;F1</property>
               </object>
             </child>
             <child>
@@ -110,7 +110,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Quit</property>
-                <property name="accelerator">&lt;Primary&gt;q</property>
+                <property name="accelerator">&lt;Control&gt;q</property>
               </object>
             </child>
           </object>
diff --git a/src/base-window.vala b/src/base-window.vala
index aa1f338..581ffdc 100644
--- a/src/base-window.vala
+++ b/src/base-window.vala
@@ -328,7 +328,7 @@ private class BaseWindow : AdaptativeWindow, AdaptativeWidget
     {
         string name = Gdk.keyval_name (keyval) ?? "";
 
-        if (name == "F1") // TODO fix dance done with the F1 & <Primary>F1 shortcuts that show help overlay
+        if (name == "F1") // TODO fix dance done with the F1 & <Control>F1 shortcuts that show help overlay
         {
             headerbar.close_popovers ();
             main_view.close_popovers ();
diff --git a/src/iagno.vala b/src/iagno.vala
index 46bea43..a218ad6 100644
--- a/src/iagno.vala
+++ b/src/iagno.vala
@@ -449,12 +449,12 @@ private class Iagno : Gtk.Application, BaseApplication
 
         /* Actions and preferences */
         add_action_entries (app_actions, this);
-        set_accels_for_action ("ui.new-game",           {        "<Primary>n"       });
-        set_accels_for_action ("ui.start-game",         { "<Shift><Primary>n"       });
-        set_accels_for_action ("app.quit",              {        "<Primary>q",
-                                                          "<Shift><Primary>q"       });
-        set_accels_for_action ("ui.undo",               {        "<Primary>z"       });
-     // set_accels_for_action ("ui.redo",               { "<Shift><Primary>z"       });
+        set_accels_for_action ("ui.new-game",           {        "<Control>n"       });
+        set_accels_for_action ("ui.start-game",         { "<Shift><Control>n"       });
+        set_accels_for_action ("app.quit",              {        "<Control>q",
+                                                          "<Shift><Control>q"       });
+        set_accels_for_action ("ui.undo",               {        "<Control>z"       });
+     // set_accels_for_action ("ui.redo",               { "<Shift><Control>z"       });
         set_accels_for_action ("base.escape",           {                 "Escape"  });
         set_accels_for_action ("base.toggle-hamburger", {                 "F10"     });
      // set_accels_for_action ("app.help",              {                 "F1"      });