Merge branch 'master' of evefit.org:pyfa

2010-11-19 12:15:54 +01:00
parent 811fe150a6 9ec337b155
commit 6b3c175aab
1 changed files with 1 additions and 7 deletions
--- a/gui/chromeTabs.py
+++ b/gui/chromeTabs.py
@@ -1203,17 +1203,11 @@ class PFNotebookPagePreview(wx.Frame):
        self.Refresh()

    def OnTimer(self, event):
-        if event.GetId() == self.timerSleepId:
-            self.direction = -1
-            self.timer.Start(10)
-            return
        self.transp += 20*self.direction
+
        if self.transp > 240:
            self.transp = 240
            self.timer.Stop()
-            if not self.timerSleep:
-                self.timerSleep = wx.Timer(self, self.timerSleepId)
-            self.timerSleep.Start(5000, True)

        if self.transp < 0:
            self.transp = 0