diff options
Diffstat (limited to 'activity.py')
| -rw-r--r-- | activity.py | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/activity.py b/activity.py index e0099bf..65942f8 100644 --- a/activity.py +++ b/activity.py @@ -79,11 +79,6 @@ class ThreadAnim(threading.Thread): _current_screen.refresh() else: pass - # update timeline - if hasattr(_current_screen, 'timeline'): - _current_screen.timeline.refresh() - else: - pass # update panel if hasattr(_current_screen, 'panel'): _current_screen.panel.refresh() @@ -141,7 +136,7 @@ class AToiDeJouerActivity(activity.Activity): # init parent activity.Activity.__init__(self, handle) # init activity working folder - storage.init_activity_folder() + storage.init_activity_files() # .. self.max_participants = 1 # get toolbox @@ -176,6 +171,7 @@ class AToiDeJouerActivity(activity.Activity): def get_toolbox(self): return self._toolbox + """ def update_number_of_keys(self): # set max _graphic_max = self.graphic_keys.get_max_frame() @@ -183,6 +179,7 @@ class AToiDeJouerActivity(activity.Activity): _max = _graphic_max if _graphic_max > _sound_max else _sound_max # update value self._number_of_keys = _max + 1 + """ def get_current_screen(self): # little check @@ -259,11 +256,7 @@ class AToiDeJouerActivity(activity.Activity): toolbar.pause() # update all self._thread.set_time() - if self._current == 'edit': - # .. refresh - self._screens[self._current].timeline.refresh_sequence() - self._screens[self._current].timeline.refresh_adjustment() - elif self._current == 'help': + if self._current == 'help': del self._screens[self._current] self._screens[self._current] = screens.ScreenHelp(self) else: @@ -280,12 +273,6 @@ class AToiDeJouerActivity(activity.Activity): # screen factory elif self._current == 'edit': _scr = screens.ScreenEdit(toolbar) - # .. init sequences - for _n in self.graphic_keys._names: - _scr.timeline.add_sequence(_n) - # .. refresh - _scr.timeline.refresh_sequence() - _scr.timeline.refresh_adjustment() elif self._current == 'story': _scr = screens.ScreenStory(toolbar, set_canvas=True) elif self._current == 'help': @@ -299,8 +286,7 @@ class AToiDeJouerActivity(activity.Activity): self._update_slider(toolbar) def read_file(self, file_path): - """Read saved data from datastore and resume activity based on a - previous state. + pass """ # init content _data = None @@ -311,18 +297,19 @@ class AToiDeJouerActivity(activity.Activity): finally: _file.close() # parse json data - self.graphic_keys.loads(_data) - self.sound_keys.loads(_data) + # self.graphic_keys.loads(_data) + # self.sound_keys.loads(_data) # set activity new number of keys - self.update_number_of_keys() + # self.update_number_of_keys() # clear - self.graphic_keys.ask_clear() + # self.graphic_keys.ask_clear() # switch to edit mode if no key self._toolbox.set_current_toolbar(1) self._change_screen(toolbar=self.__story_toolbar) + """ def write_file(self, file_path): - """Dummy overiding ... + pass """ # content dict _data_dict = { @@ -339,6 +326,7 @@ class AToiDeJouerActivity(activity.Activity): _f.write(_data) finally: _f.close() + """ def close(self, skip_save=False): # stop the thread @@ -351,5 +339,4 @@ class AToiDeJouerActivity(activity.Activity): pass else: _screen.item_preview._thread.kill() - # .. activity.Activity.close(self, skip_save=True) |