diff options
Diffstat (limited to 'atoidejouer/ui/screen/story.py')
| -rw-r--r-- | atoidejouer/ui/screen/story.py | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/atoidejouer/ui/screen/story.py b/atoidejouer/ui/screen/story.py index 60aec88..4e66e82 100644 --- a/atoidejouer/ui/screen/story.py +++ b/atoidejouer/ui/screen/story.py @@ -27,7 +27,7 @@ def _on_drag_finish(image, event, scene, key, image_size): # logger.debug('[ui.screen.story] _on_drag_finish - rowcount: %s' % rowcount) # DEBUG # refresh - _scr = scene.toolbar.activity.get_current_screen() + _scr = scene.activity.get_current_screen() _scr.refresh(key=key) # set note edit page _scr.panel_edit._notebook.set_current_page(0) @@ -40,7 +40,7 @@ def _on_click(image, event, scene, key): # invalidate key key = None # refresh - _scr = scene.toolbar.activity.get_current_screen() + _scr = scene.activity.get_current_screen() _scr.refresh(key=key) # set note edit page _scr.panel_edit._notebook.set_current_page(0) @@ -48,13 +48,13 @@ def _on_click(image, event, scene, key): class ScreenStory(graphics.Scene): - def __init__(self, toolbar, height_offset=0, width_offset=0, + def __init__(self, activity, height_offset=0, width_offset=0, set_canvas=False, clear=False): # .. graphics.Scene.__init__(self) self.background_color = "#ffffff" - # keep toolbar - self.toolbar = toolbar + # keep activity + self.activity = activity # .. self._set_canvas = set_canvas self._clear = False @@ -72,10 +72,7 @@ class ScreenStory(graphics.Scene): # .. self._screen_height = None self._screen_width = None - # ... self._refresh_screen_size() - # and show - self._show() def set_fullscreen(self, fullscreen): # update fullscreen flag @@ -89,6 +86,8 @@ class ScreenStory(graphics.Scene): # keep some info self._screen_height = gtk.gdk.screen_height() - self._height_offset self._screen_width = gtk.gdk.screen_width() - self._width_offset + # update size request + self.set_size_request(self._screen_width, self._screen_height) def set_clear(self, clear): self._clear = clear @@ -116,8 +115,8 @@ class ScreenStory(graphics.Scene): # ensure valid screen size self._refresh_screen_size() # get the current frame - _time = 0.0 if self.toolbar.activity._thread is None\ - else self.toolbar.activity._thread._time + _time = 0.0 if self.activity._thread is None\ + else self.activity._thread._time # get the current rate _rate = config.Config().get_rate_value() # using DB @@ -139,9 +138,9 @@ class ScreenStory(graphics.Scene): else: pass # refresh sounds if playing - if self.toolbar.activity._thread is None: + if self.activity._thread is None: pass - elif self.toolbar.activity._thread._pause is False: + elif self.activity._thread._pause is False: """ # for each sound for _n in self._get_keys('sounds').get_names(): @@ -160,7 +159,7 @@ class ScreenStory(graphics.Scene): else: # stop all for _id, _sound in self.__sounds.items(): - if self.toolbar.activity._thread._time == 0: + if self.activity._thread._time == 0: _sound.stop() else: _sound.pause() @@ -246,7 +245,9 @@ class ScreenStory(graphics.Scene): else: _filename = '%s_default' % default_name _path = storage.get_image_path(_filename) - _key = story.Key(id=_code, path=_path, layer=0) + _layer = story.DB().get_max('layer') + 1\ + if default_name == 'mask' else 0 + _key = story.Key(id=_code, path=_path, layer=_layer) # .. _align = (0, 0) # get/update width and height @@ -261,8 +262,8 @@ class ScreenStory(graphics.Scene): # get align _x, _y = key.x, key.y # get the current frame - _time = 0.0 if self.toolbar.activity._thread is None\ - else self.toolbar.activity._thread._time + _time = 0.0 if self.activity._thread is None\ + else self.activity._thread._time # get transition ratio _ratio = _time - int(_time) if _ratio < rate: @@ -352,7 +353,7 @@ class ScreenStory(graphics.Scene): def __refresh_sound(self, sequence_name, frame): # get sequence file codes _seq_codes = self._get_keys('sounds').get_sequence_codes( - self.toolbar.name, sequence_name) + self.activity._current, sequence_name) # get sequence filename _current, _f_type, _k_type = self._get_keys('sounds').get_current( sequence_name, frame) @@ -393,7 +394,7 @@ class ScreenStory(graphics.Scene): # ensure/generate code _filecode = key.random_str() # update story key object - self._get_keys('sounds').set_code(self.toolbar.name, sequence_name, + self._get_keys('sounds').set_code(self.activity._current, sequence_name, current, _filecode) # ... _sound = sound.Player() @@ -409,10 +410,8 @@ class ScreenStory(graphics.Scene): self.refresh() # .. self.show() - # update size request - self.set_size_request(self._screen_width, self._screen_height) # update canvas if self._set_canvas is True: - self.toolbar.activity.set_canvas(self) + self.activity.set_canvas(self) else: pass |