pitivi r1153 - in branches/SOC_2008_BLEWIS: . pitivi/ui

[blewis svn gnome org]

Author: blewis
Date: Mon Jun 30 12:11:19 2008
New Revision: 1153
URL: http://svn.gnome.org/viewvc/pitivi?rev=1153&view=rev

Log:
reviewed by: <delete if not using a buddy>
* pitivi/ui/complextimeline.py:
fledgeling start on a goocanvas complex timeline. You can move sources and
scroll, but zooming, labels and thumbnails for sources, and trimming are
still to come.


Modified:
   branches/SOC_2008_BLEWIS/ChangeLog
   branches/SOC_2008_BLEWIS/pitivi/ui/complextimeline.py

Modified: branches/SOC_2008_BLEWIS/pitivi/ui/complextimeline.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/ui/complextimeline.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/ui/complextimeline.py	Mon Jun 30 12:11:19 2008
@@ -42,8 +42,7 @@
     goocanvas.Rect,
     {
         "height" : VIDEO_TRACK_HEIGHT, 
-        "stroke_color" : "black",
-        "fill_color_rgba" : 0x55663388
+        "fill_color_rgba" : 0x556633FF
     },
     {}
 )
@@ -61,8 +60,6 @@
 BACKGROUND = (
     goocanvas.Rect,
     {
-        "height" : 32.0,
-        "width" : 100,
         "stroke_color" : "gray",
         "fill_color" : "gray",
     },
@@ -95,10 +92,10 @@
         self._zoom_adjustment.lower = 0.1
         self._zoom_adjustment.upper = 10
         self._zoom_adjustment.connect("value-changed", self._adjust_zoom)
-        self.set_zoom_ratio(1.0)
+        self.set_zoom_ratio(10.0)
         self.object_style = None
         self.bg = make_item(BACKGROUND)
-        #self.add_child(self.bg)
+        self.add_child(self.bg)
 
     def get_zoom_adjustment(self):
         return self._zoom_adjustment
@@ -132,7 +129,7 @@
         w = self.make_element_widget(element)
         self.widgets[element] = w
         self.elements[w] = element
-        self.add_child(w)
+        self.add_child(w, (0, 0))
 
     def _objectRemoved(self, timeline, element):
         w = self.widgets[element]
@@ -197,6 +194,7 @@
     def _request_size(self, item, prop):
         self.set_size_request(int(self.layers.width), int(
             self.layers.height))
+        print self.layers.width, self.layers.height
         self.set_bounds(0, 0, self.layers.width, self.layers.height)
         return True