diff options
Diffstat (limited to 'atoidejouer/ui/panel/edit.py')
| -rw-r--r-- | atoidejouer/ui/panel/edit.py | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/atoidejouer/ui/panel/edit.py b/atoidejouer/ui/panel/edit.py index 5350f30..84e913c 100644 --- a/atoidejouer/ui/panel/edit.py +++ b/atoidejouer/ui/panel/edit.py @@ -36,7 +36,7 @@ def _set_bg(widget): def _on_position_clicked(widget, panel, move, value): # shortcut - _activity = panel.screen.toolbar.activity + _activity = panel.screen.activity if _activity._thread._pause is False\ or panel.key is None: pass @@ -60,7 +60,7 @@ def _on_position_clicked(widget, panel, move, value): def _on_layer_clicked(widget, panel, move): # shortcut - _activity = panel.screen.toolbar.activity + _activity = panel.screen.activity # get max _layer_max = story.DB().get_max('layer') # do nothing @@ -95,7 +95,7 @@ def _on_layer_clicked(widget, panel, move): def _on_duration_clicked(widget, panel, value): # shortcut - _activity = panel.screen.toolbar.activity + _activity = panel.screen.activity _duration_max = story.DB().get_max('duration') _duration = None # do nothing @@ -120,7 +120,7 @@ def _on_loop_click(toggle, panel, image): _stock_id = 'repeat_grey' if toggle.get_active() is True else 'repeat' image.set_from_file(storage.get_icon_path(_stock_id)) # shortcut - _activity = panel.screen.toolbar.activity + _activity = panel.screen.activity # do nothing if _activity._thread._pause is False\ or panel.key is None: @@ -132,22 +132,22 @@ def _on_loop_click(toggle, panel, image): def _get_next_time(panel, factor): # get the current frame - _time = 0.0 if panel.screen.toolbar.activity._thread is None\ - else panel.screen.toolbar.activity._thread._time + _time = 0.0 if panel.screen.activity._thread is None\ + else panel.screen.activity._thread._time # get rate _rate = config.Config().get_rate_value() # next time _next = _time + factor * _rate # get max - _max = panel.screen.toolbar.activity.max_time + _max = panel.screen.activity.max_time # little check return _next if _next < _max else _max def _get_previous_time(panel, factor): # get the current frame - _time = 0.0 if panel.screen.toolbar.activity._thread is None\ - else panel.screen.toolbar.activity._thread._time + _time = 0.0 if panel.screen.activity._thread is None\ + else panel.screen.activity._thread._time # get rate _rate = config.Config().get_rate_value() # previous time @@ -158,7 +158,7 @@ def _get_previous_time(panel, factor): def _on_remove_key_clicked(widget, panel): # shortcut - _activity = panel.screen.toolbar.activity + _activity = panel.screen.activity if _activity._thread._pause is False\ or panel.key is None: return @@ -179,10 +179,10 @@ def _on_key_press(widget, event, parent): _name = gtk.gdk.keyval_name(_keyval) _mod = gtk.accelerator_get_label(_keyval, event.state) # .. - if parent.screen != parent.screen.toolbar.activity.get_current_screen(): + if parent.screen != parent.screen.activity.get_current_screen(): return # key factory - elif parent.screen.toolbar.name == 'edit': + elif parent.screen.activity._current == 'edit': # POSITION if _name == 'Left' and _mod.startswith('Ctrl+'): # big left _on_position_clicked(widget, parent, 'x', -10) @@ -224,9 +224,9 @@ def _on_key_press(widget, event, parent): # IMAGE # TODO ... # IN EVERY CASE - if parent.screen.toolbar.name in ['edit', 'story']: + if parent.screen.activity._current in ['edit', 'story']: # shortcut - _thread = parent.screen.toolbar.activity._thread + _thread = parent.screen.activity._thread if _name == 'space': # play right _time = _get_next_time(parent, 1) _thread.set_time(time_=_time, pause=True) @@ -236,10 +236,10 @@ def _on_key_press(widget, event, parent): # PLAY elif _name == 'Return': if _thread._pause is True: - parent.screen.toolbar.play() + parent.screen.activity._toolbar.play() _thread.play() else: - parent.screen.toolbar.pause() + parent.screen.activity._toolbar.pause() _thread.pause() else: pass @@ -303,7 +303,7 @@ class PanelEdit(gtk.Frame): self._add_frame_remove() def __init_handler(self): - _activity = self.screen.toolbar.activity + _activity = self.screen.activity _handler_id = _activity._handler_id if _handler_id: _activity.disconnect(_handler_id) @@ -327,7 +327,7 @@ class PanelEdit(gtk.Frame): # hide frame sound self._frame_sound.hide() # shortcut - _activity = self.screen.toolbar.activity + _activity = self.screen.activity # set layer value self.entry_layer.set_text(str(self.key.layer)) # set x value |