[longomatch] use Shift for all default keys

[Andoni Morales Alastruey <amorales src gnome org>]

commit 5e9083a175166023ba3db1c2c66b9b3d1ddb64d9
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Fri Oct 24 02:53:43 2014 +0200

    use Shift for all default keys

 LongoMatch.Core/Common/Hotkeys.cs  |   32 ++++++++++++++++----------------
 LongoMatch.Core/Common/Keyboard.cs |    4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/LongoMatch.Core/Common/Hotkeys.cs b/LongoMatch.Core/Common/Hotkeys.cs
index 8b06f29..7b7eb87 100644
--- a/LongoMatch.Core/Common/Hotkeys.cs
+++ b/LongoMatch.Core/Common/Hotkeys.cs
@@ -81,32 +81,32 @@ namespace LongoMatch.Core.Common
                        ActionsDescriptions [KeyAction.ZoomOut] = Catalog.GetString ("Zoom timeline out");
                        
                        UpdateMapping (KeyAction.DeleteEvent, "<Shift_L>+d");
-                       UpdateMapping (KeyAction.DrawFrame, "f");
-                       UpdateMapping (KeyAction.EditEvent, "e");
-                       UpdateMapping (KeyAction.FitTimeline, "t");
+                       UpdateMapping (KeyAction.DrawFrame, "<Shift_L>+f");
+                       UpdateMapping (KeyAction.EditEvent, "<Shift_L>+e");
+                       UpdateMapping (KeyAction.FitTimeline, "<Shift_L>+t");
                        UpdateMapping (KeyAction.FrameDown, "Left");
                        UpdateMapping (KeyAction.FrameUp, "Right");
                        UpdateMapping (KeyAction.JumpUp, "<Shift_L>+Right");
                        UpdateMapping (KeyAction.JumpDown, "<Shift_L>+Left");
-                       UpdateMapping (KeyAction.CloseEvent, "a");
-                       UpdateMapping (KeyAction.LocalPlayer, "q");
-                       UpdateMapping (KeyAction.VisitorPlayer, "w");
-                       UpdateMapping (KeyAction.LocalPlayer, "n");
-                       UpdateMapping (KeyAction.VisitorPlayer, "b");
-                       UpdateMapping (KeyAction.PauseClock, "p");
-                       UpdateMapping (KeyAction.ShowTimeline, "z");
-                       UpdateMapping (KeyAction.ShowDashboard, "x");
-                       UpdateMapping (KeyAction.ShowPositions, "c");
+                       UpdateMapping (KeyAction.CloseEvent, "<Shift_L>+a");
+                       UpdateMapping (KeyAction.LocalPlayer, "<Shift_L>+q");
+                       UpdateMapping (KeyAction.VisitorPlayer, "<Shift_L>+w");
+                       UpdateMapping (KeyAction.LocalPlayer, "<Shift_L>+n");
+                       UpdateMapping (KeyAction.VisitorPlayer, "<Shift_L>+b");
+                       UpdateMapping (KeyAction.PauseClock, "<Shift_L>+p");
+                       UpdateMapping (KeyAction.ShowTimeline, "<Shift_L>+z");
+                       UpdateMapping (KeyAction.ShowDashboard, "<Shift_L>+x");
+                       UpdateMapping (KeyAction.ShowPositions, "<Shift_L>+c");
                        UpdateMapping (KeyAction.SpeedDown, "Down");
                        UpdateMapping (KeyAction.SpeedUp, "Up");
                        UpdateMapping (KeyAction.StartPeriod, "<Shift_L>+i");
-                       UpdateMapping (KeyAction.StopPeriod, "<Shitft_L>+o");
-                       UpdateMapping (KeyAction.Substitution, "s");
+                       UpdateMapping (KeyAction.StopPeriod, "<Shift_L>+o");
+                       UpdateMapping (KeyAction.Substitution, "<Shift_L>+s");
                        UpdateMapping (KeyAction.TogglePlay, "space");
                        UpdateMapping (KeyAction.ZoomIn, "plus");
                        UpdateMapping (KeyAction.ZoomOut, "minus");
-                       UpdateMapping (KeyAction.Next, "plus");
-                       UpdateMapping (KeyAction.Prev, "minus");
+                       UpdateMapping (KeyAction.Next, "<Alt_L>+Right");
+                       UpdateMapping (KeyAction.Prev, "<Alt_L>+Left");
                }
        }
 }
diff --git a/LongoMatch.Core/Common/Keyboard.cs b/LongoMatch.Core/Common/Keyboard.cs
index bb1a1bd..bd0c3a7 100644
--- a/LongoMatch.Core/Common/Keyboard.cs
+++ b/LongoMatch.Core/Common/Keyboard.cs
@@ -49,7 +49,7 @@ namespace LongoMatch.Core.Common
 
                public static HotKey ParseName (string name)
                {
-                       int key = -1, modifier = -1, i;
+                       int key = 0, modifier = 0, i;
                        
                        if (name.Contains (">+")) {
                                i = name.IndexOf ('+');
@@ -63,7 +63,7 @@ namespace LongoMatch.Core.Common
 
                public static string HotKeyName (HotKey hotkey)
                {
-                       if (hotkey.Modifier != -1) {
+                       if (hotkey.Modifier != -1 && hotkey.Modifier != 0) {
                                return string.Format ("<{0}>+{1}", NameFromKeyval ((uint)hotkey.Modifier),
                                                      NameFromKeyval ((uint)hotkey.Key));
                        } else {