[gnome-robots] Use more reasonable hotkeys



commit 66a34214ea4a5cab3d9762e084c2968addf93aff
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Jun 21 08:32:55 2014 -0500

    Use more reasonable hotkeys
    
    All of the previous hotkeys assume the existance of a number pad. Do
    people have number pads anymore?
    
    https://bugzilla.gnome.org/show_bug.cgi?id=731993

 data/org.gnome.robots.gschema.xml |   33 +++++++++------------------------
 help/C/controls-default.page      |   28 ++++++++++++++--------------
 src/properties.c                  |    3 ---
 3 files changed, 23 insertions(+), 41 deletions(-)
---
diff --git a/data/org.gnome.robots.gschema.xml b/data/org.gnome.robots.gschema.xml
index a0f86fb..71e9f3e 100644
--- a/data/org.gnome.robots.gschema.xml
+++ b/data/org.gnome.robots.gschema.xml
@@ -36,66 +36,51 @@
       <description>Enable game sounds.   Play sounds for various events throughout the game.</description>
     </key>
     <key name="key00" type="i">
-      <default>65429</default>
+      <default>121</default>
       <summary>Key to move NW</summary>
       <description>The key used to move north-west.</description>
     </key>
     <key name="key01" type="i">
-      <default>65431</default>
+      <default>107</default>
       <summary>Key to move N</summary>
       <description>The key used to move north.</description>
     </key>
     <key name="key02" type="i">
-      <default>65434</default>
+      <default>117</default>
       <summary>Key to move NE</summary>
       <description>The key used to move north-east.</description>
     </key>
     
     <key name="key03" type="i">
-      <default>65430</default>
+      <default>104</default>
       <summary>Key to move W</summary>
       <description>The key used to move west.</description>
     </key>
     <key name="key04" type="i">
-      <default>65437</default>
+      <default>32</default>
       <summary>Key to hold</summary>
       <description>The key used to hold still.</description>
     </key>
     <key name="key05" type="i">
-      <default>65432</default>
+      <default>108</default>
       <summary>Key to move E</summary>
       <description>The key used to move east.</description>
     </key>
     <key name="key06" type="i">
-      <default>65436</default>
+      <default>98</default>
       <summary>Key to move SW</summary>
       <description>The key used to move south-west.</description>
     </key>
     <key name="key07" type="i">
-      <default>65433</default>
+      <default>106</default>
       <summary>Key to move S</summary>
       <description>The key used to move south.</description>
     </key>
     <key name="key08" type="i">
-      <default>65435</default>
+      <default>110</default>
       <summary>Key to move SE</summary>
       <description>The key used to move south-east.</description>
     </key>
-    <key name="key09" type="i">
-      <default>65451</default>
-      <summary>Key to teleport</summary>
-      <description>The key used to teleport safely (if possible).</description>
-    </key>
-    <key name="key10" type="i">
-      <default>65450</default>
-      <summary>Key to teleport randomly</summary>
-      <description>The key used to teleport randomly.</description>
-    </key>
-    <key name="key11" type="i">
-      <default>65421</default>
-      <summary>Key to wait</summary>
-      <description>The key used to wait.</description>
-    </key>
     <key name="window-width" type="i">
       <default>720</default>
       <summary>Width of the window in pixels</summary>
diff --git a/help/C/controls-default.page b/help/C/controls-default.page
index 3b6f5dd..d293b52 100644
--- a/help/C/controls-default.page
+++ b/help/C/controls-default.page
@@ -8,6 +8,7 @@
 
     <revision pkgversion="3.8" version="0.1" date="2013-04-03" status="draft"/>
     <revision pkgversion="3.11.90" date="2014-03-25" status="review"/>
+    <revision pkgversion="3.13.3" date="2014-06-21" status="review"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -41,52 +42,51 @@
     <tbody>
     <tr>
       <td><p>North west</p></td>
-      <td><p><key>Home</key></p></td>
+      <td><p><key>y</key></p></td>
     </tr>
     <tr>
       <td><p>North</p></td>
-      <td><p><key>&#8593;</key></p></td>
+      <td><p><key>k</key></p></td>
     </tr>
     <tr>
       <td><p>North east</p></td>
-      <td><p><key>PgUp</key></p></td>
+      <td><p><key>u</key></p></td>
     </tr>
     <tr>
       <td><p>West</p></td>
-      <td><p><key>&#8594;</key></p></td>
+      <td><p><key>h</key></p></td>
     </tr>
     <tr>
       <td><p>East</p></td>
-      <td><p><key>&#8592;</key></p></td>
+      <td><p><key>l</key></p></td>
     </tr>
     <tr>
       <td><p>South west</p></td>
-      <td><p><key>End</key></p></td>
+      <td><p><key>b</key></p></td>
     </tr>
     <tr>
       <td><p>South</p></td>
-      <td><p><key>&#8595;</key></p></td>
+      <td><p><key>j</key></p></td>
     </tr>
     <tr>
       <td><p>South east</p></td>
-      <td><p><key>PgDn</key></p></td>
+      <td><p><key>n</key></p></td>
     </tr>
     <tr>
-      <td><p>Stay in the same position</p></td>
-      <td><p><key>Begin</key> (marked only as <key>5</key> on some
-      keypads)</p></td>
+      <td><p>Stay in the same position (one turn)</p></td>
+      <td><p>Space</p></td>
     </tr>
     <tr>
       <td><p>Teleport safely</p></td>
-      <td><p><key>+</key></p></td>
+      <td><p><keyseq><key>Alt</key><key>s</key></keyseq></p></td>
     </tr>
     <tr>
       <td><p>Teleport randomly</p></td>
-      <td><p><key>*</key></p></td>
+      <td><p><keyseq><key>Alt</key><key>r</key></keyseq></p></td>
     </tr>
     <tr>
       <td><p>Wait for the robots</p></td>
-      <td><p><key>Enter</key></p></td>
+      <td><p><keyseq><key>Alt</key><key>w</key></keyseq></p></td>
     </tr>
     </tbody>
   </table>
diff --git a/src/properties.c b/src/properties.c
index 1b8e473..66fb35d 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -512,9 +512,6 @@ show_properties_dialog (void)
                                    "key07", _("Key to move S"), g_settings_get_default_value (settings, 
"key06"),
                                    "key08", _("Key to move SE"), g_settings_get_default_value (settings, 
"key07"),
                                     "key04", _("Key to hold"), g_settings_get_default_value (settings, 
"key08"),
-                                   "key09", _("Key to teleport"), g_settings_get_default_value (settings, 
"key09"),
-                                   "key10", _("Key to teleport randomly"), g_settings_get_default_value 
(settings, "key10"),
-                                   "key11", _("Key to wait"), g_settings_get_default_value (settings, 
"key11"),
                                     NULL);
 
   gtk_box_pack_start (GTK_BOX (vbox), controls_list, TRUE, TRUE, 0);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]