[gnome-klotski/arnaudb/wip/gtk4: 14/25] Use <Control>.

[Arnaud B. <arnaudb src gnome org>]

commit c1220ca20033c5b724d211080430948e3ec8a2e2
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Tue Apr 7 08:11:25 2020 +0200

    Use <Control>.

 data/ui/help-overlay.ui | 12 ++++++------
 src/gnome-klotski.vala  | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index 36f9823..c7154da 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -32,14 +32,14 @@
                 <property name="visible">False</property>
                 <!-- Translators: Ctrl-Shift-N shortcut description in the Keyboard Shortcuts dialog, 
section "Puzzle-related"; toggles the game menu -->
                 <property name="title" translatable="yes" context="shortcut window">Toggle game 
menu</property>
-                <property name="accelerator">&lt;Primary&gt;F10</property> <!-- show if there is more than 
one thing in it -->
+                <property name="accelerator">&lt;Control&gt;F10</property> <!-- show if there is more than 
one thing in it -->
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <!-- Translators: Ctrl-Shift-N shortcut description in the Keyboard Shortcuts dialog, 
section "Puzzle-related"; restarts the current puzzle -->
                 <property name="title" translatable="yes" context="shortcut window">Restart</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>
           </object>
@@ -52,7 +52,7 @@
               <object class="GtkShortcutsShortcut">
                 <!-- Translators: Ctrl-S shortcut description in the Keyboard Shortcuts dialog, section 
"Headerbar"; toggles the Change Puzzle menu -->
                 <property name="title" translatable="yes" context="shortcut window">Select new 
puzzle</property>
-                <property name="accelerator">&lt;Primary&gt;N</property>
+                <property name="accelerator">&lt;Control&gt;N</property>
               </object>
             </child>
             <child>
@@ -93,7 +93,7 @@
               <object class="GtkShortcutsShortcut">
                 <!-- Translators: Ctrl-S shortcut description in the Keyboard Shortcuts dialog, section 
"Scores" -->
                 <property name="title" translatable="yes" context="shortcut window">Scores dialog</property>
-                <property name="accelerator">&lt;Primary&gt;S</property>
+                <property name="accelerator">&lt;Control&gt;S</property>
               </object>
             </child>
           </object>
@@ -113,7 +113,7 @@
               <object class="GtkShortcutsShortcut">
                 <!-- Translators: Ctrl-? shortcut description in the Keyboard Shortcuts dialog, section 
"Generic": opens Shortcuts dialog -->
                 <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>
@@ -134,7 +134,7 @@
               <object class="GtkShortcutsShortcut">
                 <!-- Translators: Ctrl-Q shortcut description in the Keyboard Shortcuts dialog, section 
"Generic": quits the application -->
                 <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/gnome-klotski.vala b/src/gnome-klotski.vala
index 4fcf7a5..2432195 100644
--- a/src/gnome-klotski.vala
+++ b/src/gnome-klotski.vala
@@ -88,15 +88,15 @@ private class Klotski : Gtk.Application
         set_accels_for_action ("win.prev-pack",     {"Page_Up"});   // TODO the first/last one, click on a 
puzzle, and immediately hit Up or Down arrows.
         set_accels_for_action ("win.next-pack",     {"Page_Down"}); // TODO that makes these keybindings 
sometimes act strangely, but they’re good.
 
-        set_accels_for_action ("win.start-game",    { "<Shift><Primary>n",
-                                                      "<Shift><Primary>r"   }); // TODO just <Primary>n/r?
+        set_accels_for_action ("win.start-game",    { "<Shift><Control>n",
+                                                      "<Shift><Control>r"   }); // TODO just <Control>n/r?
 
-        set_accels_for_action ("win.show-scores",   {        "<Primary>s",      // TODO that's a weird 
shortcut
-                                                      "<Shift><Primary>s"   });
+        set_accels_for_action ("win.show-scores",   {        "<Control>s",      // TODO that's a weird 
shortcut
+                                                      "<Shift><Control>s"   });
      // set_accels_for_action ("win.help",          {                 "F1"  }); // TODO fix dance with
      // set_accels_for_action ("win.about",         {          "<Shift>F1"  }); // the shortcuts dialog
-        set_accels_for_action ("app.quit",          {        "<Primary>q",
-                                                      "<Shift><Primary>q"   });
+        set_accels_for_action ("app.quit",          {        "<Control>q",
+                                                      "<Shift><Control>q"   });
     }
 
     protected override void activate ()