Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Francis <francis@sugarlabs.org>2012-05-26 01:00:09 (GMT)
committer Daniel Francis <francis@sugarlabs.org>2012-05-26 01:00:09 (GMT)
commita9841fa320cdbcb6e60e6afe771f9b6fba893071 (patch)
tree8fa976c0686e6617f0cd05f81824bddfb7d185ee
parentc3736630f7cd295b8b4fbeb22cc87ba352a39aa2 (diff)
Fixing frame previews
-rw-r--r--TODO4
-rw-r--r--activity.py6
-rw-r--r--frames_list.py8
3 files changed, 11 insertions, 7 deletions
diff --git a/TODO b/TODO
index 3ff22fe..a27dd03 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
New functions:
- - Create a treeview to manage the pictures. (Done)
- - Add and remove frames from the Treeview.
+ - Add and remove frames from the Treeview. (In progress)
+ - Connect the selected image in the FramesList to the animation canvas.
Fixes:
Void.
Bugs:
diff --git a/activity.py b/activity.py
index 1bb0774..b228cf9 100644
--- a/activity.py
+++ b/activity.py
@@ -88,10 +88,8 @@ class AnimateActivity(activity.Activity):
result = chooser.run()
if result == gtk.RESPONSE_ACCEPT:
jobject = chooser.get_selected_object()
- preview_pixbuf = \
- gtk.gdk.pixbuf_new_from_file_at_size(jobject.get_file_path(),
- 25, 25)
- self._frames_list.add_frame(preview_pixbuf)
+ pixbuf = gtk.gdk.pixbuf_new_from_file(jobject.get_file_path())
+ self._frames_list.add_frame(pixbuf)
self._animation.add_image(jobject.get_file_path())
else:
diff --git a/frames_list.py b/frames_list.py
index 778e107..76047f8 100644
--- a/frames_list.py
+++ b/frames_list.py
@@ -27,6 +27,7 @@ import gtk
class FramesList(gtk.ScrolledWindow):
def __init__(self):
super(FramesList, self).__init__()
+ self.set_size_request(225, -1)
self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
self.store = gtk.ListStore(int, gtk.gdk.Pixbuf)
self.treeview = gtk.TreeView(self.store)
@@ -45,4 +46,9 @@ class FramesList(gtk.ScrolledWindow):
def add_frame(self, pixbuf):
self.frames += 1
- self.store.append([self.frames, pixbuf])
+ width = pixbuf.get_width()
+ height = pixbuf.get_height()
+ preview_pixbuf = pixbuf.scale_simple(200,
+ 200 * height / width,
+ gtk.gdk.INTERP_TILES)
+ self.store.append([self.frames, preview_pixbuf])