diff options
Diffstat (limited to 'activity.py')
| -rw-r--r-- | activity.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/activity.py b/activity.py index ff7331c..6a14b11 100644 --- a/activity.py +++ b/activity.py @@ -96,7 +96,7 @@ def _toolbar_changed(toolbox, page, activity_): # remove first if exist activity_.remove_screen('activity') # show the activity screen - activity_._change_screen(toolbar=None, name='activity') + activity_.change_screen('activity') else: pass # propagate it @@ -128,16 +128,17 @@ class AToiDeJouerActivity(activity.Activity): self.max_time = 0 # show self._toolbox.show() + self.__toolbars = {'activity': None} # init toolbars for _n in ['story', 'edit', 'help']: # init toolbar - toolbar.Toolbar(self, name=_n) + self.__toolbars[_n] = toolbar.Toolbar(self, name=_n) # set toolbox cb self._toolbox.connect('current-toolbar-changed', _toolbar_changed, self) # do anim self._thread = ThreadAnim(self) # show the activity screen - self._change_screen(toolbar=None, name='activity') + self.change_screen('activity') def get_toolbox(self): return self._toolbox @@ -188,14 +189,12 @@ class AToiDeJouerActivity(activity.Activity): else: return None - def _change_screen(self, toolbar=None, name=None): - # little check - if toolbar is None and name is None: - return - else: - # update current screen name - self._previous = self._current - self._current = toolbar.name if name is None else name + def change_screen(self, name): + # get current toolbar + toolbar = self.__toolbars[name] if name in self.__toolbars else None + # update current screen name + self._previous = self._current + self._current = name # already exist if self._current == 'edit': if self._splash is None: |