use BackSpace shortcut for key and sequence removal

6 files changed, 12 insertions, 12 deletions

diff --git a/activity.py b/activity.py
index 9d2965b..45a1740 100644
--- a/activity.py
+++ b/activity.py
@@ -67,7 +67,6 @@ class ThreadAnim(threading.Thread):
         _s = self._activity.get_current_screen()
         # do pause on toolbar
         if pause is True:
-            # ..
             if hasattr(_s.toolbar, 'pause'):
                 _s.toolbar.pause()
             else:
@@ -75,24 +74,24 @@ class ThreadAnim(threading.Thread):
         else:
             # update scene
             if hasattr(_s, 'scene'):
-                # ..
                 _s.scene.refresh()
             else:
                 _s.refresh()
             # update timeline
             if hasattr(_s, 'timeline'):
-                # ..
                 _s.timeline.refresh()
             else:
                 pass
             # update panel
             if hasattr(_s, 'panel'):
-                # ..
                 _s.panel.refresh()
             else:
                 pass
             # update slider
-            _s.toolbar.refresh(self._time)
+            if hasattr(_s, 'toolbar'):
+                _s.toolbar.refresh(self._time)
+            else:
+                pass
 
     def run(self):
         # ...
diff --git a/atoidejouer/ui/panel.py b/atoidejouer/ui/panel.py
index 5059622..cabcf03 100644
--- a/atoidejouer/ui/panel.py
+++ b/atoidejouer/ui/panel.py
@@ -381,9 +381,9 @@ def _on_key_press(widget, event, panel):
             elif _name == '-':
                 _on_time_clicked(widget, panel, -1)
             # DELETE
-            elif _name == 'Delete' and _mod.startswith('Ctrl+'):
+            elif _name == 'BackSpace' and _mod.startswith('Ctrl+'):
                 _on_remove_sequence_clicked(widget, panel)
-            elif _name == 'Delete':
+            elif _name == 'BackSpace':
                 _on_remove_key_clicked(widget, panel)
             # IMAGE
             # TODO ...
diff --git a/atoidejouer/ui/screens.py b/atoidejouer/ui/screens.py
index eacc061..b6076d1 100644
--- a/atoidejouer/ui/screens.py
+++ b/atoidejouer/ui/screens.py
@@ -847,7 +847,8 @@ class ScreenActivity(gtk.ScrolledWindow):
             # should be a dir
             if os.path.isdir(_path):
                 # set export button text
-                _button_text = _('Export to media \'%s\'' % _media)
+                _button_text = _('Export to media "%(media)s"'\
+                        % {'media': _media})
                 # init button
                 _button = self._get_button('export', _button_text, 'export',
                         msg_label=self.msg_label_export, value=_media)
diff --git a/po/messages.pot b/po/messages.pot
index a6da43e..6ad97de 100644
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -110,7 +110,7 @@ msgstr ""
 
 #: ../atoidejouer/ui/screens.py:845
 #, python-format
-msgid "Export to media '%s'"
+msgid "Export to media '%(media)s'"
 msgstr ""
 
 #: ../atoidejouer/ui/screens.py:786
diff --git a/po/org.laptop.AToiDeJouerActivity_en.po b/po/org.laptop.AToiDeJouerActivity_en.po
index 0932277..4448fa4 100644
--- a/po/org.laptop.AToiDeJouerActivity_en.po
+++ b/po/org.laptop.AToiDeJouerActivity_en.po
@@ -110,7 +110,7 @@ msgstr ""
 
 #: ../atoidejouer/ui/screens.py:845
 #, python-format
-msgid "Export to media '%s'"
+msgid "Export to media '%(media)s'"
 msgstr ""
 
 #: ../atoidejouer/ui/screens.py:786
diff --git a/po/org.laptop.AToiDeJouerActivity_fr.po b/po/org.laptop.AToiDeJouerActivity_fr.po
index 90bebce..cf7c5a9 100644
--- a/po/org.laptop.AToiDeJouerActivity_fr.po
+++ b/po/org.laptop.AToiDeJouerActivity_fr.po
@@ -125,8 +125,8 @@ msgstr "Facile"
 
 #: ../atoidejouer/ui/screens.py:845
 #, python-format
-msgid "Export to media '%s'"
-msgstr "Exporter vers '%s'"
+msgid "Export to media '%(media)s'"
+msgstr "Exporter vers '%(media)s'"
 
 #: ../atoidejouer/ui/screens.py:786
 msgid "FRAME RATE"