fixed timer a bit

1 files changed, 7 insertions, 3 deletions

diff --git a/timer.py b/timer.py
index 023e4e30..ad248e18 100644
--- a/timer.py
+++ b/timer.py
@@ -20,9 +20,9 @@ class TimerEntry:
 		self.state = 0
 	
 	def getTime(self):
-		if self.state == 0:
+		if self.state == self.StateWait:
 			return self.begin - self.prepare_time
-		elif self.state == 1:
+		elif self.state == self.StatePrepare:
 			return self.begin
 		else:
 			return self.end 
@@ -52,7 +52,7 @@ class Timer:
 	
 	def setNextActivation(self, when):
 		delay = int((when - time()) * 1000)
-		print "next activation: %d (in %d seconds)" % (when, delay)
+		print "next activation: %d (in %d ms)" % (when, delay)
 		
 		self.timer.start(delay, 1)
 		self.next = when
@@ -70,6 +70,10 @@ class Timer:
 		
 		self.setNextActivation(min)
 	
+	def timeChanged(self, timer):
+		self.timer_list.remove(timer)
+		bisect.insort(self.timer_list, timer)
+	
 	def doActivate(self, w):
 		w.activate(w.state)
 		self.timer_list.remove(w)