[four-in-a-row/arnaudb/wip/gtk4: 92/92] Use Control.

[Arnaud B. <arnaudb src gnome org>]

commit be53cbd91aaa0e2f6510b5ead261950cc97e27de
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sat Sep 26 09:54:08 2020 +0200

    Use Control.

 data/ui/help-overlay.ui | 14 +++++++-------
 src/four-in-a-row.vala  | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index e4cd8b8..d181175 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -31,28 +31,28 @@
               <object class="GtkShortcutsShortcut">
                 <!-- Translators: in the Keyboard Shortcuts window, section "During a game" -->
                 <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">
                 <!-- Translators: in the Keyboard Shortcuts window, section "During a game" -->
                 <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>
             <child>
               <object class="GtkShortcutsShortcut">
                 <!-- Translators: in the Keyboard Shortcuts window, section "During a game" -->
                 <property name="title" translatable="yes" context="shortcut window">Show a hint</property>
-                <property name="accelerator">&lt;Primary&gt;h</property>
+                <property name="accelerator">&lt;Control&gt;h</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <!-- Translators: in the Keyboard Shortcuts window, section "During a game" -->
                 <property name="title" translatable="yes" context="shortcut window">Toggle game 
menu</property>
-                <property name="accelerator">&lt;Primary&gt;F10</property>
+                <property name="accelerator">&lt;Control&gt;F10</property>
               </object>
             </child>
           </object>
@@ -92,7 +92,7 @@
               <object class="GtkShortcutsShortcut">
                 <!-- Translators: in the Keyboard Shortcuts window, section "During game selection"; how to 
launch a new game -->
                 <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>
@@ -119,7 +119,7 @@
               <object class="GtkShortcutsShortcut">
                 <!-- Translators: in the Keyboard Shortcuts window, section "Generic" -->
                 <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>
@@ -140,7 +140,7 @@
               <object class="GtkShortcutsShortcut">
                 <!-- Translators: in the Keyboard Shortcuts window, section "Generic" -->
                 <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/four-in-a-row.vala b/src/four-in-a-row.vala
index fa84845..dad1146 100644
--- a/src/four-in-a-row.vala
+++ b/src/four-in-a-row.vala
@@ -327,15 +327,15 @@ private class FourInARow : Gtk.Application
         add_action (settings.create_action ("first-player"));
         add_action (settings.create_action ("opponent"));
 
-        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"       });
-        set_accels_for_action ("ui.hint",               {        "<Primary>h"       });
-        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"       });
+        set_accels_for_action ("ui.hint",               {        "<Control>h"       });
+        set_accels_for_action ("ui.undo",               {        "<Control>z"       });
+     // set_accels_for_action ("ui.redo",               { "<Shift><Control>z"       });
         set_accels_for_action ("ui.back",               {                 "Escape"  });
         set_accels_for_action ("ui.toggle-hamburger",   {                 "F10"     });
-     // set_accels_for_action ("app.toggle-game-menu",  {        "<Primary>F10"     });
+     // set_accels_for_action ("app.toggle-game-menu",  {        "<Control>F10"     });
      // set_accels_for_action ("app.help",              {                 "F1"      });
      // set_accels_for_action ("app.about",             {          "<Shift>F1"      });
 
@@ -1030,7 +1030,7 @@ private class FourInARow : Gtk.Application
     {
         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
         {
             window.close_hamburger ();
             history_button_1.active = false;