Prise en charge de la touche « esc » pour quitter les écrans de sélectien d'instrumen...

git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@313 fe552daf-6dbe-4428-90eb-1537e0879342

diff --git a/src/minwii/widgets/instrumentselector.py b/src/minwii/widgets/instrumentselector.py
index f2ef1783d84ecacba1f7b596f5ddc1ffa71e6dc1..403f3bc9f91551395bf09fada0fbb997d8da052a 100755 (executable)
--- a/src/minwii/widgets/instrumentselector.py
+++ b/src/minwii/widgets/instrumentselector.py
@@ -72,7 +72,9 @@ class InstrumentSelector(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
-        if event.key == pygame.K_q:
+        if event.key == pygame.K_q or \
+            event.unicode == u'q' or \
+            pygame.K_ESCAPE:
             self.stop()
 
     @event_handler(pygame.MOUSEMOTION)

diff --git a/src/minwii/widgets/playingscreen.py b/src/minwii/widgets/playingscreen.py
index adb6981c18bc9f36053b6567b7f4868d68ee82f0..66c4776aff2b04fbffe87dd1a791c6b5c39b97bd 100755 (executable)
--- a/src/minwii/widgets/playingscreen.py
+++ b/src/minwii/widgets/playingscreen.py
@@ -100,7 +100,9 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
-        if event.key == pygame.K_q or event.unicode == u'q':
+        if event.key == pygame.K_q or \
+            event.unicode == u'q' or \
+            pygame.K_ESCAPE:
             self.stop()
     
     @event_handler(pygame.MOUSEBUTTONDOWN)