bugfix : on ne testait pas correctement la touche échap.

[minwii.git] / src / minwii / widgets / instrumentselector.py

diff --git a/src/minwii/widgets/instrumentselector.py b/src/minwii/widgets/instrumentselector.py
index 6861643..52799d0 100755 (executable)
--- a/src/minwii/widgets/instrumentselector.py
+++ b/src/minwii/widgets/instrumentselector.py
@@ -7,14 +7,14 @@ $URL$
 """
 import os.path
 import pygame
-from eventutils import event_handler, EventDispatcher, EventHandlerMixin
+from minwii.eventutils import event_handler, EventDispatcher, EventHandlerMixin
+from minwii.config import FRAMERATE
+from minwii.config import  INSTRUMENTS
+from minwii.globals import BACKGROUND_LAYER
+from minwii.globals import FOREGROUND_LAYER
+from minwii.globals import CURSOR_LAYER
+from minwii.globals import hls_to_rgba_8bits
 from cursors import WarpingCursor
-from config import FRAMERATE
-from config import  INSTRUMENTS
-from globals import BACKGROUND_LAYER
-from globals import FOREGROUND_LAYER
-from globals import CURSOR_LAYER
-from globals import hls_to_rgba_8bits
 
 
 class InstrumentSelector(pygame.sprite.LayeredDirty, EventHandlerMixin) :
@@ -72,7 +72,8 @@ class InstrumentSelector(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
-        if event.key == pygame.K_q:
+        if event.key in (pygame.K_q, pygame.K_ESCAPE) or \
+            event.unicode == u'q' :
             self.stop()
 
     @event_handler(pygame.MOUSEMOTION)