[gnome-mines/arnaudb/wip/gtk4: 39/39] Use Control.

[Arnaud B. <arnaudb src gnome org>]

commit 6f38d43307b48aa7b11c5065847fd7565032e703
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sat Sep 26 09:51:53 2020 +0200

    Use Control.

 src/gnome-mines.vala | 23 ++++++++++++-----------
 src/help-overlay.ui  | 10 +++++-----
 2 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/src/gnome-mines.vala b/src/gnome-mines.vala
index 8599b06..736bb06 100644
--- a/src/gnome-mines.vala
+++ b/src/gnome-mines.vala
@@ -235,17 +235,18 @@ public class Mines : Gtk.Application
         menu_button.set_menu_model (menu);
         headerbar.pack_end (menu_button);
 
-        set_accels_for_action ("app.new-game", {"<Primary>n"});
-        set_accels_for_action ("app.silent-new-game", {"Escape"});
-        set_accels_for_action ("app.repeat-size", {"<Primary>r"});
-        set_accels_for_action ("app.small-size", {"1", "KP_1"});
-        set_accels_for_action ("app.medium-size", {"2", "KP_2"});
-        set_accels_for_action ("app.large-size", {"3", "KP_3"});
-        set_accels_for_action ("app.custom-size", {"4", "KP_4"});
-        set_accels_for_action ("app.pause", {"Pause"});
-        set_accels_for_action ("app.help", {"F1"});
-        set_accels_for_action ("app.quit", {"<Primary>q", "<Primary>w"});
-        set_accels_for_action ("app.menu", {"F10"});
+        set_accels_for_action ("app.new-game",          { "<Control>n"      });
+        set_accels_for_action ("app.silent-new-game",   {          "Escape" });
+        set_accels_for_action ("app.repeat-size",       { "<Control>r"      });
+        set_accels_for_action ("app.small-size",        {     "1", "KP_1"   });
+        set_accels_for_action ("app.medium-size",       {     "2", "KP_2"   });
+        set_accels_for_action ("app.large-size",        {     "3", "KP_3"   });
+        set_accels_for_action ("app.custom-size",       {     "4", "KP_4"   });
+        set_accels_for_action ("app.pause",             {          "Pause"  });
+        set_accels_for_action ("app.help",              {          "F1"     });
+        set_accels_for_action ("app.quit",              { "<Control>q",
+                                                          "<Control>w"      });
+        set_accels_for_action ("app.menu",              {          "F10"    });
 
         minefield_view = new MinefieldView (settings);
 
diff --git a/src/help-overlay.ui b/src/help-overlay.ui
index bf1a664..46ef093 100644
--- a/src/help-overlay.ui
+++ b/src/help-overlay.ui
@@ -10,13 +10,13 @@
             <property name="title" translatable="yes" context="shortcut window">Window and game</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="accelerator">&lt;Ctrl&gt;N</property>
+                <property name="accelerator">&lt;Control&gt;n</property>
                 <property name="title" translatable="yes" context="shortcut window">Start a new 
game</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="accelerator">&lt;Ctrl&gt;R</property>
+                <property name="accelerator">&lt;Control&gt;r</property>
                 <property name="title" translatable="yes" context="shortcut window">Restart game with 
current settings</property>
               </object>
             </child>
@@ -40,13 +40,13 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="accelerator">&lt;Primary&gt;question</property>
+                <property name="accelerator">&lt;Control&gt;question</property>
                 <property name="title" translatable="yes" context="shortcut window">Show Keyboard 
Shortcuts</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="accelerator">&lt;Ctrl&gt;Q</property>
+                <property name="accelerator">&lt;Control&gt;q</property>
                 <property name="title" translatable="yes" context="shortcut window">Quit</property>
               </object>
             </child>
@@ -104,7 +104,7 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="accelerator">&lt;Primary&gt;space</property>
+                <property name="accelerator">&lt;Control&gt;space</property>
                 <property name="title" translatable="yes" context="shortcut window">Toggle field flag 
state</property>
               </object>
             </child>