diff options
Diffstat (limited to 'atoidejouer/ui/toolbar.py')
| -rw-r--r-- | atoidejouer/ui/toolbar.py | 219 |
1 files changed, 22 insertions, 197 deletions
diff --git a/atoidejouer/ui/toolbar.py b/atoidejouer/ui/toolbar.py index 65be152..88fdd51 100644 --- a/atoidejouer/ui/toolbar.py +++ b/atoidejouer/ui/toolbar.py @@ -45,69 +45,9 @@ def _clean_dir(dir_path): os.removedirs(dir_path) -def _cb_seq_new(widget, toolbar): - # get screen - _screen = toolbar.activity.get_current_screen() - # remove items from preview boxes - _screen.sequence_preview.clear() - # .. - _screen.notebook.current_sequence = None - # clear entry - toolbar._sequence_entry.set_text("") - - NON_ALPHA_NUM_PATTERN = re.compile('[\W_]+') -def _cb_seq_name(entry): - # ensure good string - _str = NON_ALPHA_NUM_PATTERN.sub('-', entry.get_text()) - # update entry - entry.set_text(_str) - - -def _cb_seq_remove(widget, toolbar): - # get sequence name - _name = toolbar._sequence_entry.get_text() - # get screen - _screen = toolbar.activity.get_current_screen() - # type shortcut 'graphic' or 'sound' - _type = _screen.notebook._type - # little check - if _name.strip() == '': - # do nothing - pass - else: - # get sequence path - _seq_path = storage.get_sequence_path(_type, _name) - # remove dir - if os.path.exists(_seq_path): - # do clean - os.remove(_seq_path) - # and clear all at the end - _screen.sequence_preview.clear() - # clear entry - toolbar._sequence_entry.set_text("") - # update notebook - _screen.notebook._get_store_sequence() - # update focus - _screen.notebook.focus_current_seq() - # nothing to do - else: - pass - - -def _cb_seq_save(widget, toolbar, remove=False): - storage.sequence_save(toolbar, remove=remove) - # get screen - _screen = toolbar.activity.get_current_screen() - # get sequence name - _name = toolbar._sequence_entry.get_text() - # update focus - _screen.notebook.focus_current_seq(name=_name) - - - def _show_browser(toolbar, cls): # next screen name _screen_name = '%s_add' % toolbar.name @@ -139,7 +79,7 @@ def _show_browser(toolbar, cls): def _cb_add(widget, toolbar): # browser screen factory - if toolbar.name == 'graphics': + if toolbar.name == 'edit': _show_browser(toolbar, screens.ScreenBrowserGraphics) # .. elif toolbar.name == 'sounds': @@ -150,19 +90,6 @@ def _cb_add(widget, toolbar): logger.error('[toolbar] _cb_add - unknown: %s' % toolbar.name) -def _cb_remove(widget, toolbar): - # browser screen factory - if toolbar.name == 'graphics': - pass - # .. - elif toolbar.name == 'sounds': - pass - # ?? - else: - # ERROR - logger.error('[toolbar] _cb_remove - name: %s' % toolbar.name) - - def _cb_frame_after(widget, toolbar): if toolbar._frame_entry is None: pass @@ -171,8 +98,6 @@ def _cb_frame_after(widget, toolbar): _value = int(toolbar._frame_entry.get_text()) # inc it _update_frame_entry(widget, toolbar, _value + 1) - # update sequence file - _cb_seq_save(widget, toolbar) def _cb_frame_before(widget, toolbar): @@ -183,8 +108,6 @@ def _cb_frame_before(widget, toolbar): _value = int(toolbar._frame_entry.get_text()) # dec it _update_frame_entry(widget, toolbar, _value - 1) - # update sequence file - _cb_seq_save(widget, toolbar) def _update_frame_entry(entry, toolbar, value): @@ -229,16 +152,7 @@ def _cb_import(widget, toolbar): # shortcut _filenames = _screen.sequence_preview.items # add sequence to the story keys - if toolbar.story_keys.add_sequence(_sequence_name, _filenames): - # screen name factory - _screen_name = toolbar.name.replace('_add', '') - # get screen now - _screen = toolbar.activity.get_screen(_screen_name) - # add sequence to the timeline - _screen.timeline.add_sequence(_sequence_name) - # already added - else: - pass + # toolbar.story_keys.add_sequence(_sequence_name, _filenames) def _cb_play(widget, toolbar): @@ -272,7 +186,7 @@ def _cb_view_fullscreen(widget, toolbar): # replace fullscreen button with return button toolbar._replace_button('view_fullscreen', 'view_return') # ask_clear - toolbar.story_keys.ask_clear() + # toolbar.story_keys.ask_clear() # get current screen _screen = toolbar.activity.get_current_screen() # enbale fullscreen @@ -283,7 +197,7 @@ def _cb_view_return(widget, toolbar): # remove return button with fullscreen button toolbar._replace_button('view_return', 'view_fullscreen') # ask_clear - toolbar.story_keys.ask_clear() + # toolbar.story_keys.ask_clear() # get current screen _screen = toolbar.activity.get_current_screen() # disable fullscreen @@ -309,7 +223,7 @@ def _cb_format_value(widget, value, toolbar): # return formated value return '%1d:%02d' % divmod(value, 60) -TOOLBAR_INDEXES = ['activity', 'story', 'graphics', 'sounds', 'help'] +TOOLBAR_INDEXES = ['activity', 'story', 'edit', 'help'] def _cb_help_back(widget, toolbar): _previous = toolbar.activity._previous @@ -333,12 +247,7 @@ BUTTONS = { 'open' : ['media', _cb_open], 'pause' : ['media-playback-pause', _cb_pause], 'play' : ['media-playback-start', _cb_play], - 'remove' : ['list-remove', _cb_remove], 'separator' : [None, None], - 'seq_new' : ['document-generic', _cb_seq_new], - 'seq_name' : [None, _cb_seq_name], - 'seq_remove' : ['button_cancel', _cb_seq_remove], - 'seq_save' : ['dialog-apply', _cb_seq_save], 'slider' : [None, _cb_slider], 'stop' : ['media-playback-stop', _cb_stop], 'view_fullscreen' : ['view-fullscreen', _cb_view_fullscreen], @@ -346,42 +255,18 @@ BUTTONS = { } TOOLBARS = { - 'graphics' : [ - ['stop', 'play', 'slider', # 'backward', 'forward' - 'separator', - 'add'], - [] - ], - 'graphics_add' : [ - ['seq_new', 'seq_name', 'seq_save', 'seq_remove', - # 'separator', - # 'add', 'remove', - # ''separator', - # 'frame_before', 'frame_entry', 'frame_after' - ], - ['import', 'back'] - ], - 'sounds' : [ - ['stop', 'play', 'slider', # 'backward', 'forward' - 'separator', - 'add'], - [] - ], - 'sounds_add' : [ - ['seq_new', 'seq_name', 'seq_save', 'seq_remove', - # 'separator', - # 'add', 'remove', - # ''separator', - # 'frame_before', 'frame_entry', 'frame_after' - ], - ['import', 'back'] - ], 'story' : [ ['stop', 'play', 'slider', # 'backward', 'forward' 'separator', 'view_fullscreen'], [] ], + 'edit' : [ + ['stop', 'play', 'slider', 'backward', 'forward' + # 'separator', 'add' + ], + [] + ], 'help' : [ [], ['help_back'] @@ -389,74 +274,30 @@ TOOLBARS = { } TITLES = { - 'graphics' : { - 'toolbox': _('Graphic'), - 'buttons': { - # 'backward': _('Seek Backward'), - # 'forward': _('Seek Forward'), - 'pause': _('Pause Story'), - 'play': _('Play Story'), - 'slider': _('Progress Bar'), - 'stop': _('Stop Story'), - 'add': _('Add Graphic'), - } - }, - 'graphics_add' : { - 'toolbox': None, - 'buttons': { - 'add': _('Add Graphic'), - 'back': _('Back'), - 'frame_after': _('Frame Before'), - 'frame_before': _('Frame After'), - 'frame_entry': None, - 'import': _('Import Sequence'), - 'remove': _('Remove Graphic'), - 'seq_new': _('New Sequence'), - 'seq_name': None, - 'seq_remove': _('Remove Sequence'), - 'seq_save': _('Save Sequence'), - } - }, - 'sounds' : { - 'toolbox': _('Sound'), + 'story' : { + 'toolbox': _('Story'), 'buttons': { + # 'open': _('Open Story'), # 'backward': _('Seek Backward'), # 'forward': _('Seek Forward'), 'pause': _('Pause Story'), 'play': _('Play Story'), 'slider': _('Progress Bar'), 'stop': _('Stop Story'), - 'add': _('Add Sound'), + 'view_fullscreen': _('Fullscreen'), + 'view_return': _('Default Screen'), } }, - 'sounds_add' : { - 'toolbox': None, + 'edit' : { + 'toolbox': _('Edit'), 'buttons': { - 'add': _('Add Sound'), - 'back': _('Back'), - 'frame_after': _('Frame Before'), - 'frame_before': _('Frame After'), - 'frame_entry': None, - 'import': _('Import Sequence'), - 'remove': _('Remove Sound'), - 'seq_new': _('New Sound'), - 'seq_name': None, - 'seq_remove': _('Remove Sequence'), - 'seq_save': _('Save Sequence'), - } - }, - 'story' : { - 'toolbox': _('Story'), - 'buttons': { - # 'open': _('Open Story'), - # 'backward': _('Seek Backward'), - # 'forward': _('Seek Forward'), + 'backward': _('Seek Backward'), + 'forward': _('Seek Forward'), 'pause': _('Pause Story'), 'play': _('Play Story'), 'slider': _('Progress Bar'), 'stop': _('Stop Story'), - 'view_fullscreen': _('Fullscreen'), - 'view_return': _('Default Screen'), + 'add': _('Add Graphic'), } }, 'help' : { @@ -464,7 +305,7 @@ TITLES = { 'buttons': { 'help_back': _('Back') } - } + }, } @@ -477,12 +318,6 @@ class Toolbar(gtk.Toolbar): self.set_name(name) # keep activity self.activity = activity - # .. - if self.name == 'graphics'\ - or self.name == 'story': - self.story_keys = self.activity.graphic_keys - else: - self.story_keys = self.activity.sound_keys # adjustment self._adjustment = None self._number_of_keys = self.activity._number_of_keys @@ -639,16 +474,6 @@ class Toolbar(gtk.Toolbar): _buton = gtk.ToolItem() _buton.set_expand(True) _buton.add(_hscale) - elif button_id == 'seq_name': - self._sequence_entry = gtk.Entry() - # show - self._sequence_entry.show() - # .. - self._sequence_entry.connect('changed', _cb) - # .. - _buton = gtk.ToolItem() - _buton.set_expand(True) - _buton.add(self._sequence_entry) elif button_id == 'frame_entry': # ... self._frame_entry = gtk.Entry() |