1 files changed, 6 insertions, 59 deletions

diff --git a/atoidejouer/ui/toolbar.py b/atoidejouer/ui/toolbar.py
index 7dc33cb..6b7fd4a 100644
--- a/atoidejouer/ui/toolbar.py
+++ b/atoidejouer/ui/toolbar.py
@@ -96,44 +96,8 @@ def _cb_seq_remove(widget, toolbar):
 
 
 def _cb_seq_save(widget, toolbar, remove=False):
-    # get sequence name
-    _name = toolbar._sequence_entry.get_text()
-    # get screen
-    _screen = toolbar.activity.get_current_screen()
-    # get nb of graphics
-    _nb_of_items = _screen.sequence_preview.number_of_items()
-    # type shortcut 'graphic' or 'sound'
-    _type = _screen.notebook._type
-    # little check
-    if _name.strip() == '':
-        return
-    elif _nb_of_items == 0\
-    and remove is True:
-        # get sequence path
-        _seq_path = storage.get_sequence_path(_type, _name)
-        # remove from files
-        os.remove(_seq_path)
-        # ..
-        _keys = toolbar.activity.graphic_keys\
-                if toolbar.name == 'graphics_add'\
-                else toolbar.activity.sound_keys
-        # remove from keys
-        _keys.remove_sequence(_name)
-    else:
-        # get sequence path
-        _seq_path = storage.get_sequence_path(_type, _name)
-        # open file
-        _file = open(_seq_path, 'wb')
-        # update
-        for _filename in _screen.sequence_preview.items:
-            _filename = _filename.strip()
-            if _filename == '':
-                continue
-            else:
-                _file.write('%s\n' % _filename)
-        _file.close()
-    # update notebook
-    _screen.notebook._get_store_sequence()
+    # ..
+    storage.sequence_save(toolbar, remove=remove)
 
 
 def _show_browser(toolbar, cls):
@@ -165,23 +129,6 @@ def _cb_add(widget, toolbar):
     # browser screen factory
     if toolbar.name == 'graphics':
         _show_browser(toolbar, screens.ScreenBrowserGraphics)
-    # add graphic to the sequence
-    elif toolbar.name in ['graphics_add', 'sounds_add']:
-        # get current screen
-        _screen = toolbar.activity.get_current_screen()
-        # get graphic name
-        _item_name = _screen.notebook.current_item
-        # ..
-        _sequence_name = _screen.notebook.current_sequence
-        if _sequence_name is None\
-        or _sequence_name.strip() == ''\
-        or _item_name is None:
-            pass
-        else:
-            # udpate sequence preview
-            _screen.sequence_preview.add_item(_item_name)
-            # update sequence file
-            _cb_seq_save(widget, toolbar)
     # ..
     elif toolbar.name == 'sounds':
         _show_browser(toolbar, screens.ScreenBrowserSounds)
@@ -398,8 +345,8 @@ TOOLBARS = {
         'graphics_add' : [
             ['seq_new', 'seq_name', 'seq_save', 'seq_remove',
              'separator',
-             'add', 'remove',
-             'separator',
+             # 'add', 'remove',
+             # ''separator',
              'frame_before', 'frame_entry', 'frame_after'],
             ['import', 'back']
             ],
@@ -412,8 +359,8 @@ TOOLBARS = {
         'sounds_add' : [
             ['seq_new', 'seq_name', 'seq_save', 'seq_remove',
              'separator',
-             'add', 'remove',
-             'separator',
+             # 'add', 'remove',
+             # ''separator',
              'frame_before', 'frame_entry', 'frame_after'],
             ['import', 'back']
             ],