[gnome-tetravex/arnaudb/wip/gtk4] Use <Control>.

[Arnaud B. <arnaudb src gnome org>]

commit 184d1edcbfa028a7a6b80bc2c20d4682c2723560
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Tue Apr 7 08:15:16 2020 +0200

    Use <Control>.

 src/gnome-tetravex.vala | 32 ++++++++++++++++----------------
 src/help-overlay.ui     |  6 +++---
 2 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/src/gnome-tetravex.vala b/src/gnome-tetravex.vala
index 518e228..60f5d95 100644
--- a/src/gnome-tetravex.vala
+++ b/src/gnome-tetravex.vala
@@ -268,22 +268,22 @@ private class Tetravex : Gtk.Application
         add_action_entries (action_entries, this);
         add_action (settings.create_action ("theme"));
 
-        set_accels_for_action ("app.solve",         {        "<Primary>h"       });
-        set_accels_for_action ("app.scores",        {        "<Primary>i"       });
-        set_accels_for_action ("app.new-game",      {        "<Primary>n"       });
-        set_accels_for_action ("app.pause",         {        "<Primary>p",
+        set_accels_for_action ("app.solve",         {        "<Control>h"       });
+        set_accels_for_action ("app.scores",        {        "<Control>i"       });
+        set_accels_for_action ("app.new-game",      {        "<Control>n"       });
+        set_accels_for_action ("app.pause",         {        "<Control>p",
                                                                       "Pause"   });
-        set_accels_for_action ("app.quit",          {        "<Primary>q"       });
-        set_accels_for_action ("app.move-up-l",     {        "<Primary>Up"      });
-        set_accels_for_action ("app.move-down-l",   {        "<Primary>Down"    });
-        set_accels_for_action ("app.move-left-l",   {        "<Primary>Left"    });
-        set_accels_for_action ("app.move-right-l",  {        "<Primary>Right"   });
-        set_accels_for_action ("app.move-up-r",     { "<Shift><Primary>Up"      });
-        set_accels_for_action ("app.move-down-r",   { "<Shift><Primary>Down"    });
-        set_accels_for_action ("app.move-left-r",   { "<Shift><Primary>Left"    });
-        set_accels_for_action ("app.move-right-r",  { "<Shift><Primary>Right"   });
-        set_accels_for_action ("app.undo",          {        "<Primary>z"       });
-        set_accels_for_action ("app.redo",          { "<Shift><Primary>z"       });
+        set_accels_for_action ("app.quit",          {        "<Control>q"       });
+        set_accels_for_action ("app.move-up-l",     {        "<Control>Up"      });
+        set_accels_for_action ("app.move-down-l",   {        "<Control>Down"    });
+        set_accels_for_action ("app.move-left-l",   {        "<Control>Left"    });
+        set_accels_for_action ("app.move-right-l",  {        "<Control>Right"   });
+        set_accels_for_action ("app.move-up-r",     { "<Shift><Control>Up"      });
+        set_accels_for_action ("app.move-down-r",   { "<Shift><Control>Down"    });
+        set_accels_for_action ("app.move-left-r",   { "<Shift><Control>Left"    });
+        set_accels_for_action ("app.move-right-r",  { "<Shift><Control>Right"   });
+        set_accels_for_action ("app.undo",          {        "<Control>z"       });
+        set_accels_for_action ("app.redo",          { "<Shift><Control>z"       });
         set_accels_for_action ("app.hamburger",     {                 "F10"     });
         // F1 and friends are managed manually
 
@@ -979,7 +979,7 @@ private class Tetravex : Gtk.Application
             }
         }
         else if (name == "F1")
-            return on_f1_pressed (state);   // TODO fix dance done with the F1 & <Primary>F1 shortcuts that 
show help overlay
+            return on_f1_pressed (state);   // TODO fix dance done with the F1 & <Control>F1 shortcuts that 
show help overlay
 
         return false;
     }
diff --git a/src/help-overlay.ui b/src/help-overlay.ui
index 3b19466..b92f31c 100644
--- a/src/help-overlay.ui
+++ b/src/help-overlay.ui
@@ -77,14 +77,14 @@
             <property name="title" translatable="yes" context="shortcut window">History</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="accelerator">&lt;Primary&gt;z</property>
+                <property name="accelerator">&lt;Control&gt;z</property>
                 <!-- Translators: Ctrl-Z shortcut description in the Keyboard Shortcuts dialog, section 
History; verb, undoes last move -->
                 <property name="title" translatable="yes" context="shortcut window">Undo</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="accelerator">&lt;Shift&gt;&lt;Primary&gt;z</property>
+                <property name="accelerator">&lt;Shift&gt;&lt;Control&gt;z</property>
                 <!-- Translators: Shift-Ctrl-Z shortcut description in the Keyboard Shortcuts dialog, 
section History; verb, redoes undone move -->
                 <property name="title" translatable="yes" context="shortcut window">Redo</property>
               </object>
@@ -131,7 +131,7 @@
             <property name="title" translatable="yes" context="shortcut window">Generic</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="accelerator">&lt;Primary&gt;question &lt;Primary&gt;F1</property>
+                <property name="accelerator">&lt;Control&gt;question &lt;Control&gt;F1</property>
                 <!-- Translators: Ctrl-F1 shortcut description in the Keyboard Shortcuts dialog, section 
Generic; displays Keyboard Shortcuts dialog -->
                 <property name="title" translatable="yes" context="shortcut window">Show Keyboard 
Shortcuts</property>
               </object>