fix dummy key binding

1 files changed, 30 insertions, 46 deletions

diff --git a/atoidejouer/ui/panel.py b/atoidejouer/ui/panel.py
index b4091f1..5059622 100644
--- a/atoidejouer/ui/panel.py
+++ b/atoidejouer/ui/panel.py
@@ -346,61 +346,45 @@ def _on_key_press(widget, event, panel):
         # key factory
         if panel.screen.toolbar.name == 'graphics':
             # POSITION
-            if _mod == 'Mod2+4'\
-            or _mod == 'Mod2+Left': # left
-                # do move
-                _on_position_clicked(widget, panel, 'x', -1)
-            elif _mod == 'Ctrl+Mod2+4'\
-            or _mod == 'Ctrl+Mod2+Left': # big left
-                # do move
+            if _name == 'Left' and _mod.startswith('Ctrl+'): # big left
                 _on_position_clicked(widget, panel, 'x', -10)
-            elif _mod == 'Mod2+6'\
-            or _mod == 'Mod2+Right': # right
-                # do move
-                _on_position_clicked(widget, panel, 'x', 1)
-            elif _mod == 'Ctrl+Mod2+6'\
-            or _mod == 'Ctrl+Mod2+Right': # big right
-                # do move
+            elif _name == 'Left': # left
+                _on_position_clicked(widget, panel, 'x', -1)
+            elif _name == 'Right' and _mod.startswith('Ctrl+'): # big right
                 _on_position_clicked(widget, panel, 'x', 10)
-            elif _mod == 'Mod2+8'\
-            or _mod == 'Mod2+Up': # top
-                # do move
-                _on_position_clicked(widget, panel, 'y', -1)
-            elif _mod == 'Ctrl+Mod2+8'\
-            or _mod == 'Ctrl+Mod2+Up': # big top
-                # do move
+            elif _name == 'Right': # right
+                _on_position_clicked(widget, panel, 'x', 1)
+            elif _name == 'Up' and _mod.startswith('Ctrl+'): # big top
                 _on_position_clicked(widget, panel, 'y', -10)
-            elif _mod == 'Mod2+2'\
-            or _mod == 'Mod2+Down': # bottom
-                # do move
-                _on_position_clicked(widget, panel, 'y', 1)
-            elif _mod == 'Ctrl+Mod2+2'\
-            or _mod == 'Ctrl+Mod2+Down': # big bottom
-                # do move
+            elif _name == 'Up': # top
+                _on_position_clicked(widget, panel, 'y', -1)
+            elif _name == 'Down' and _mod.startswith('Ctrl+'): # big bottom
                 _on_position_clicked(widget, panel, 'y', 10)
+            elif _name == 'Down': # bottom
+                _on_position_clicked(widget, panel, 'y', 1)
             # LAYOUT
-            elif _mod == 'Mod2+Page Up':
-                _on_layout_clicked(widget, panel, 'move_up')
-            elif _mod == 'Ctrl+Mod2+Page Up':
+            elif _name == 'Page Up' and _mod.startswith('Ctrl+'):
                 _on_layout_clicked(widget, panel, 'move_up_up')
-            elif _mod == 'Mod2+Page Down':
-                _on_layout_clicked(widget, panel, 'move_down')
-            elif _mod == 'Ctrl+Mod2+Page Down':
+            elif _name == 'Page Up':
+                _on_layout_clicked(widget, panel, 'move_up')
+            elif _name == 'Page Down' and _mod.startswith('Ctrl+'):
                 _on_layout_clicked(widget, panel, 'move_down_down')
+            elif _name == 'Page Down':
+                _on_layout_clicked(widget, panel, 'move_down')
             # TIME
-            elif _mod == 'Mod2++':
-                _on_time_clicked(widget, panel, 1)
-            elif _mod == 'Ctrl+Mod2++':
+            elif _name == '+' and _mod.startswith('Ctrl+'):
                 _on_time_clicked(widget, panel, 10)
-            elif _mod == 'Mod2+-':
-                _on_time_clicked(widget, panel, -1)
-            elif _mod == 'Ctrl+Mod2+-':
+            elif _name == '+':
+                _on_time_clicked(widget, panel, 1)
+            elif _name == '-' and _mod.startswith('Ctrl+'):
                 _on_time_clicked(widget, panel, -10)
+            elif _name == '-':
+                _on_time_clicked(widget, panel, -1)
             # DELETE
-            elif _mod == 'Mod2+Delete':
-                _on_remove_key_clicked(widget, panel)
-            elif _mod == 'Ctrl+Mod2+Delete':
+            elif _name == 'Delete' and _mod.startswith('Ctrl+'):
                 _on_remove_sequence_clicked(widget, panel)
+            elif _name == 'Delete':
+                _on_remove_key_clicked(widget, panel)
             # IMAGE
             # TODO ...
         elif panel.screen.toolbar.name == 'sounds':
@@ -412,18 +396,18 @@ def _on_key_press(widget, event, panel):
             # shortcut
             _thread = panel.screen.toolbar.activity._thread
             # ..
-            if _mod == 'Mod2+Space': # play right
+            if _name == 'space': # play right
                 # 
                 _time = _get_next_time(panel, 1)
                 # 
                 _thread.set_time(time_=_time, pause=True)
-            elif _mod == 'Ctrl+Mod2+Space': # play left
+            elif _name == 'space' and _mod.startswith('Ctrl+'): # play left
                 # 
                 _time = _get_previous_time(panel, 1)
                 # 
                 _thread.set_time(time_=_time, pause=True)
             # PLAY
-            elif _mod == 'Mod2+Return':
+            elif _name == 'Return':
                 # ..
                 if _thread._pause is True:
                     panel.screen.toolbar.play()