Reorganized hotkeys file so modifiers appear before non-modifiers. Th…

…is prevents unneeded collisions.
wesnoth · May 22, 2018 · ccc223b · ccc223b
1 parent b011faa
commit ccc223b
Showing 1 changed file with 101 additions and 100 deletions.
diff --git a/data/core/hotkeys.cfg b/data/core/hotkeys.cfg
@@ -41,11 +41,6 @@
     mouse=0
 [/hotkey]
 
-[hotkey]
-    command=aiformula
-    key=f
-[/hotkey]
-
 [hotkey]
     command=accelerated
     key=a
@@ -57,24 +52,116 @@
     {IF_APPLE_CMD_ELSE_CTRL}
 [/hotkey]
 [hotkey]
-    command=changeside
-    key=u
-    shift=yes
+    command=clearlabels
+    {IF_APPLE_CMD_ELSE_CTRL}
+    key=c
 [/hotkey]
 [hotkey]
-    command=chatlog
+    command=clearmessages
+    {IF_APPLE_CMD_ELSE_CTRL}
+    key=x
+[/hotkey]
+[hotkey]
+    command=describeterrain
+    key=t
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
+    command=fullscreen
+    key=f
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
+    command=labelteamterrain
+    key=l
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
+    command=load
+    key=o
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
+    command=mute
+    key=m
+    {IF_APPLE_CMD_ELSE_CTRL}
     alt=yes
-    key=c
 [/hotkey]
 [hotkey]
-    command=clearlabels
+    command=objectives
+    key=j
     {IF_APPLE_CMD_ELSE_CTRL}
-    key=c
 [/hotkey]
 [hotkey]
-    command=clearmessages
+    command=preferences
+#ifdef APPLE
+    key=,
+#else
+    key=p
+#endif
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
+    command=quit
+    key=w
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
+    command=recruit
+    key=r
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
+    command=renameunit
+    key=n
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
+    command=repeatrecruit
+    key=r
+    {IF_APPLE_CMD_ELSE_CTRL}
+    alt=yes
+[/hotkey]
+[hotkey]
+    command=save
+    key=s
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
+    command=showenemymoves
+    key=v
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
+    command=speaktoally
+    key=m
     {IF_APPLE_CMD_ELSE_CTRL}
-    key=x
+[/hotkey]
+[hotkey]
+    command=toggleellipses
+    key=e
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+[hotkey]
+    command=togglegrid
+    key=g
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
+
+[hotkey]
+    command=aiformula
+    key=f
+[/hotkey]
+
+[hotkey]
+    command=changeside
+    key=u
+    shift=yes
+[/hotkey]
+[hotkey]
+    command=chatlog
+    alt=yes
+    key=c
 [/hotkey]
 [hotkey]
     command=createunit
@@ -102,11 +189,6 @@
     command=describeunit
     key=d
 [/hotkey]
-[hotkey]
-    command=describeterrain
-    key=t
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
 [hotkey]
     command=endunitturn
     key="space"
@@ -120,11 +202,6 @@
     ctrl=yes
 #endif
 [/hotkey]
-[hotkey]
-    command=fullscreen
-    key=f
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
 [hotkey]
     command=help
     key=F1
@@ -139,11 +216,6 @@
     key=k
     shift=yes
 [/hotkey]
-[hotkey]
-    command=labelteamterrain
-    key=l
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
 [hotkey]
     command=labelterrain
     key=l
@@ -153,75 +225,19 @@
     command=leader
     key=l
 [/hotkey]
-[hotkey]
-    command=load
-    key=o
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
-[hotkey]
-    command=mute
-    key=m
-    {IF_APPLE_CMD_ELSE_CTRL}
-    alt=yes
-[/hotkey]
-[hotkey]
-    command=objectives
-    key=j
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
-[hotkey]
-    command=preferences
-#ifdef APPLE
-    key=,
-#else
-    key=p
-#endif
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
-[hotkey]
-    command=quit
-    key=w
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
 [hotkey]
     command=recall
     key=r
     alt=yes
 [/hotkey]
-[hotkey]
-    command=recruit
-    key=r
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
 [hotkey]
     command=redo
     key=r
 [/hotkey]
-[hotkey]
-    command=renameunit
-    key=n
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
-[hotkey]
-    command=repeatrecruit
-    key=r
-    {IF_APPLE_CMD_ELSE_CTRL}
-    alt=yes
-[/hotkey]
-[hotkey]
-    command=save
-    key=s
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
 [hotkey]
     command=search
     key=/
 [/hotkey]
-[hotkey]
-    command=showenemymoves
-    key=v
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
 [hotkey]
     command=speak
     key=m
@@ -231,11 +247,6 @@
     key=m
     alt=yes
 [/hotkey]
-[hotkey]
-    command=speaktoally
-    key=m
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
 [hotkey]
     command=statistics
     key=s
@@ -245,16 +256,6 @@
     key=s
     alt=yes
 [/hotkey]
-[hotkey]
-    command=toggleellipses
-    key=e
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
-[hotkey]
-    command=togglegrid
-    key=g
-    {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
 [hotkey]
     command=undo
     key=u