diff options
Diffstat (limited to 'activity.py')
| -rw-r--r-- | activity.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/activity.py b/activity.py index 0d6fd14..a08ddeb 100644 --- a/activity.py +++ b/activity.py @@ -77,8 +77,10 @@ class ThreadAnim(threading.Thread): # update scene if hasattr(_current_screen, 'scene'): _current_screen.scene.refresh() - else: + elif hasattr(_current_screen, 'refresh'): _current_screen.refresh() + else: + pass # update timeline if hasattr(_current_screen, 'timeline'): _current_screen.timeline.refresh() @@ -152,6 +154,7 @@ class AToiDeJouerActivity(activity.Activity): self._thread = None self._screens = dict() self._current = None + self._previous = None self._handler_id = None self._number_of_keys = 1 # .. @@ -164,7 +167,8 @@ class AToiDeJouerActivity(activity.Activity): # tmp var _toolbar = None # init toolbars - for _n in ['story', 'graphics', 'graphics_add', 'sounds', 'sounds_add']: + for _n in ['story', 'graphics', 'graphics_add', + 'sounds', 'sounds_add', 'help']: # init toolbar _t = toolbar.Toolbar(self, name=_n) # if default toolbar .. set default screen @@ -198,6 +202,7 @@ class AToiDeJouerActivity(activity.Activity): def set_current_screen(self, name, screen): # udpate current name + self._previous = self._current self._current = name # little check self.add_screen(name, screen) @@ -237,6 +242,7 @@ class AToiDeJouerActivity(activity.Activity): return else: # update current screen name + self._previous = self._current self._current = toolbar.name if name is None else name # already exist if self._current in ['graphics', 'sounds']: @@ -267,6 +273,9 @@ class AToiDeJouerActivity(activity.Activity): # .. refresh self._screens[self._current].timeline.refresh_sequence() self._screens[self._current].timeline.refresh_adjustment() + elif self._current == 'help': + del self._screens[self._current] + self._screens[self._current] = screens.ScreenHelp(self) else: pass # exit @@ -297,6 +306,8 @@ class AToiDeJouerActivity(activity.Activity): _scr.timeline.refresh_adjustment() elif self._current == 'story': _scr = screens.ScreenStory(toolbar, set_canvas=True) + elif self._current == 'help': + _scr = screens.ScreenHelp(self) else: # ?? return @@ -325,6 +336,7 @@ class AToiDeJouerActivity(activity.Activity): # clear self.graphic_keys.ask_clear() # refresh default + self._previous = self._current _current = self.get_current_screen() _current.refresh() |