diff options
author | florent <florent.pigout@gmail.com> | 2011-05-02 01:18:41 (GMT) |
---|---|---|
committer | florent <florent.pigout@gmail.com> | 2011-05-02 01:18:41 (GMT) |
commit | c378668aab21e91420318d11431756b0a6fcce41 (patch) | |
tree | 53e2b59b529e29da2dea2f5c957ad7c2337458c0 | |
parent | 808ca8f5f829adb740a686cd9bf727592202ce56 (diff) |
enhance graphic removal and remove sequence if empty [ok]
-rw-r--r-- | atoidejouer/ui/notebook.py | 2 | ||||
-rw-r--r-- | atoidejouer/ui/toolbar.py | 47 |
2 files changed, 21 insertions, 28 deletions
diff --git a/atoidejouer/ui/notebook.py b/atoidejouer/ui/notebook.py index 98fe9d5..396e444 100644 --- a/atoidejouer/ui/notebook.py +++ b/atoidejouer/ui/notebook.py @@ -176,8 +176,6 @@ def _on_button_click(button, notebook): _keys.remove_sequence(_seq_name) # .. notebook._get_store_sequence() - # update edit screen - # _activity.remove_screen(_type) # remove item in treview notebook.remove_current_row() # remove current sequence diff --git a/atoidejouer/ui/toolbar.py b/atoidejouer/ui/toolbar.py index 04efb49..a8e6a55 100644 --- a/atoidejouer/ui/toolbar.py +++ b/atoidejouer/ui/toolbar.py @@ -84,8 +84,6 @@ def _cb_seq_remove(widget, toolbar): if os.path.exists(_seq_path): # do clean os.remove(_seq_path) - # update sequences in keys - # toolbar.story_keys.check_sequences() # and clear all at the end _screen.sequence_preview.clear() # clear entry @@ -107,33 +105,30 @@ def _cb_seq_save(widget, toolbar): # type shortcut 'graphic' or 'sound' _type = _screen.notebook._type # little check - if _name.strip() == ''\ - or _nb_of_items == 0: - # do nothing - pass + if _name.strip() == '': + return + elif _nb_of_items == 0: + # 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) - # shortcut - _items = _screen.sequence_preview.items - if len(_items) == 0: - # 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: - # open file - _file = open(_seq_path, 'wb') - # update - for _filename in _items: - _file.write('%s\n' % _filename) - _file.close() - # update notebook - _screen.notebook._get_store_sequence() + # open file + _file = open(_seq_path, 'wb') + # update + for _filename in _screen.sequence_preview.items: + _file.write('%s\n' % _filename) + _file.close() + # update notebook + _screen.notebook._get_store_sequence() def _show_browser(toolbar, cls): |