From: pin <pin@fe552daf-6dbe-4428-90eb-1537e0879342>
Date: Mon, 6 Sep 2010 11:42:39 +0000 (+0000)
Subject: Prise en charge de la touche « esc » pour quitter les écrans de sélectien d'instrumen... 
X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/commitdiff_plain/3c10e656308bd0f29d8ac4d15f7f95f29aec1697?hp=63fd81dc12159a8621cca5004558ae7dac2c9395

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


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 f2ef178..403f3bc 100755
--- 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 adb6981..66c4776 100755
--- 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)