fix some release packaging and programming errors

3 files changed, 84 insertions, 7 deletions

diff --git a/MANIFEST b/MANIFEST
index 77c6c1e..24a3af4 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,3 +1,6 @@
+prune ./docs
+prune ./po
+recursive-exclude *.swp
 activity.py
 setup.py
 atoidejouer/__init__.py
@@ -20,5 +23,67 @@ atoidejouer/ui/timeline.py
 atoidejouer/ui/toolbar.py
 activity/activity.info
 activity/activity-atoidejouer.svg
+lib/graphics.py
+lib/pytweener.py
+lib/proximity.py
+lib/__init__.py
+lib/euclid.py
 locale/en/LC_MESSAGES/org.laptop.AToiDeJouerActivity.mo
 locale/fr/LC_MESSAGES/org.laptop.AToiDeJouerActivity.mo
+static/data/config/config.ini
+static/data/graphics/mask_default.png
+static/data/graphics/blank.png
+static/data/graphics/sound.png
+static/data/graphics/background_default.png
+static/data/icons/repeat_grey.png
+static/data/icons/export.png
+static/data/icons/repeat.png
+static/data/icons/more_small.png
+static/data/icons/less_small.png
+static/data/icons/y_down.png
+static/data/icons/x_right_right.png
+static/data/icons/play.png
+static/data/icons/remove_sequence.png
+static/data/icons/go_left_small.png
+static/data/icons/stop.png
+static/data/icons/move_up_up.png
+static/data/icons/x_right.png
+static/data/icons/y_up.png
+static/data/icons/x_left.png
+static/data/icons/y_down_down.png
+static/data/icons/x_left_left.png
+static/data/icons/blank.png
+static/data/icons/move_down_down.png
+static/data/icons/remove_item.png
+static/data/icons/pause.png
+static/data/icons/import.png
+static/data/icons/move_down.png
+static/data/icons/less.png
+static/data/icons/delete.png
+static/data/icons/go_left.png
+static/data/icons/y_up_up.png
+static/data/icons/more.png
+static/data/icons/go_right.png
+static/data/icons/move_up.png
+static/data/icons/go_right_small.png
+static/ext/stories/blank
+static/ext/graphics/PROMENEUR.png
+static/ext/graphics/OVERLAY.png
+static/ext/graphics/blank
+static/ext/graphics/CHIEN.png
+static/ext/graphics/CIEL.png
+static/ext/graphics/ROUTE.png
+static/ext/graphics/CHIEN_INV.png
+static/ext/graphics/PROMENEUR_INV.png
+static/ext/graphics/MAISONS.png
+static/ext/sounds/blank
+static/ext/sounds/demo1.ogg
+static/ext/sequences/graphics/arbre.seq
+static/ext/sequences/graphics/maisons.seq
+static/ext/sequences/graphics/route.seq
+static/ext/sequences/graphics/chien.seq
+static/ext/sequences/graphics/bonhomme.seq
+static/ext/sequences/graphics/blank
+static/ext/sequences/graphics/ciel.seq
+static/ext/sequences/sounds/test.seq
+static/ext/sequences/sounds/blank
diff --git a/atoidejouer/ui/panel.py b/atoidejouer/ui/panel.py
index 7cf2da5..13f723c 100644
--- a/atoidejouer/ui/panel.py
+++ b/atoidejouer/ui/panel.py
@@ -343,8 +343,10 @@ def _on_key_press(widget, event, panel):
         logger.debug('[panel] _on_key_press - _name: %s' % _name)
         logger.debug('[panel] _on_key_press - _mod: %s' % _mod)
         # DEBUG
+        if panel.screen != panel.screen.toolbar.activity.get_current_screen():
+            return
         # key factory
-        if panel.screen.toolbar.name == 'graphics':
+        elif panel.screen.toolbar.name == 'graphics':
             # POSITION
             if _name == 'Left' and _mod.startswith('Ctrl+'): # big left
                 _on_position_clicked(widget, panel, 'x', -10)
@@ -363,13 +365,13 @@ def _on_key_press(widget, event, panel):
             elif _name == 'Down': # bottom
                 _on_position_clicked(widget, panel, 'y', 1)
             # LAYOUT
-            elif _name == 'Page Up' and _mod.startswith('Ctrl+'):
+            elif _name == 'Page_Up' and _mod.startswith('Ctrl+'):
                 _on_layout_clicked(widget, panel, 'move_up_up')
-            elif _name == 'Page Up':
+            elif _name == 'Page_Up':
                 _on_layout_clicked(widget, panel, 'move_up')
-            elif _name == 'Page Down' and _mod.startswith('Ctrl+'):
+            elif _name == 'Page_Down' and _mod.startswith('Ctrl+'):
                 _on_layout_clicked(widget, panel, 'move_down_down')
-            elif _name == 'Page Down':
+            elif _name == 'Page_Down':
                 _on_layout_clicked(widget, panel, 'move_down')
             # TIME
             elif _name == 'plus' and _mod.startswith('Ctrl+'):
@@ -420,8 +422,12 @@ def _on_key_press(widget, event, panel):
                 pass
             # avoid propagation for rendering issue
             widget.emit_stop_by_name('key-press-event')
+            # ..
+            return False
+        else:
+            return False
     else:
-        pass
+        return False
 
 
 class Panel(gtk.Frame):
diff --git a/atoidejouer/ui/screens.py b/atoidejouer/ui/screens.py
index 3161d97..728e0ba 100644
--- a/atoidejouer/ui/screens.py
+++ b/atoidejouer/ui/screens.py
@@ -126,6 +126,12 @@ class ScreenStory(graphics.Scene):
     def _check_clear(self):
         # need clear
         if self._get_keys('graphics').get_clear(self.toolbar.name) is True:
+            # hide previous
+            for _image in self.__graphics.values():
+                _image.visible = False
+                del _image
+            # ..
+            self.__graphics = dict()
             # ..
             self.__sizes = dict()
             # done
@@ -652,7 +658,7 @@ class ScreenActivity(gtk.ScrolledWindow):
 
     def __init__(self, activity_):
         gtk.ScrolledWindow.__init__(self)
-        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+        self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
         # keep toolbar
         self._activity = activity_
         # keep result label