Mercurial > enso_core

changeset 48:07395bf07eb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactored primary message window to save a reference to the event manager at initialization. We'll later require the event manager to be passed in so this module isn't directly coupled to the ui.events module.
author Atul Varma <varmaa@toolness.com>
date Mon, 25 Feb 2008 12:18:21 -0600
parents f746d6311a58
children 7cb24dbb8c91
files enso/ui/messages/primarywindow.py
diffstat 1 files changed, 12 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/enso/ui/messages/primarywindow.py	Mon Feb 25 12:11:39 2008 -0600
+++ b/enso/ui/messages/primarywindow.py	Mon Feb 25 12:18:21 2008 -0600
@@ -126,6 +126,7 @@
         maxSize = ( width, height )
         MessageWindow.__init__( self, maxSize )
 
+        self.__evtManager = events.eventManager
         self.__msgManager = msgMan
         self.__msg = None
         self.__waiting = False
@@ -149,8 +150,7 @@
         # user doesn't accidentally clear the message before it registers
         # as existing.
         self.__timeSinceCreated = 0
-        eventMan = events.eventManager
-        eventMan.registerResponder( self.waitTick, "timer" )
+        self.__evtManager.registerResponder( self.waitTick, "timer" )
         self.__waiting = True
         
 
@@ -163,10 +163,9 @@
 
         self.__msgManager.onDismissal()
         
-        eventMan = events.eventManager
-        eventMan.removeResponder( self.onDismissal )
+        self.__evtManager.removeResponder( self.onDismissal )
         self.__timeSinceDismissal = 0
-        eventMan.registerResponder( self.animationTick, "timer" )
+        self.__evtManager.registerResponder( self.animationTick, "timer" )
         self.__animating = True
         
 
@@ -195,9 +194,9 @@
         
         self.__timeSinceCreated += msPassed
         if self.__timeSinceCreated > WAIT_TIME:
-            eventMan = events.eventManager
-            eventMan.registerResponder( self.onDismissal, "dismissal" )
-            eventMan.removeResponder( self.waitTick )
+            self.__evtManager.registerResponder( self.onDismissal,
+                                                 "dismissal" )
+            self.__evtManager.removeResponder( self.waitTick )
             self.__waiting = False
 
             # The following message may be used by system tests.
@@ -224,24 +223,21 @@
         "interrupts" the current primary message, terminating
         its animation, and/or
         """
-        
-        eventMan = events.eventManager
 
         if self.__msg != None:
             # If there's an old message, then we've got an
             # event responder registered:
-            eventMan = events.eventManager
             if self.__waiting:
-                eventMan.removeResponder( self.waitTick )
+                self.__evtManager.removeResponder( self.waitTick )
                 self.__waiting = False
             if self.__animating:
-                eventMan.removeResponder( self.animationTick )
+                self.__evtManager.removeResponder( self.animationTick )
                 self.__animating = False
             else:
-                eventMan.removeResponder( self.onDismissal )
+                self.__evtManager.removeResponder( self.onDismissal )
 
         if self.__waiting:
-            eventMan.removeResponder( self.waitTick )
+            self.__evtManager.removeResponder( self.waitTick )
 
     def __drawMessage( self ):
         """
@@ -415,8 +411,7 @@
         """
 
         if self.__animating:
-            eventMan = events.eventManager
-            eventMan.removeResponder( self.animationTick )
+            self.__evtManager.removeResponder( self.animationTick )
             self.__animating = False
         self.hide()
         self.__msg = None