[pitivi] Make the timeline canvas request enough space to show two single-layer tracks.

[Edward Hervey <edwardrv src gnome org>]

commit 0bd3c3f6ea0c75f99695b4ce325240926da91410
Author: Alessandro Decina <alessandro d gmail com>
Date:   Thu Jul 30 20:14:42 2009 +0200

    Make the timeline canvas request enough space to show two single-layer tracks.

 pitivi/ui/timelinecanvas.py   |    7 ++++++-
 pitivi/ui/timelinecontrols.py |    2 +-
 pitivi/ui/track.py            |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/pitivi/ui/timelinecanvas.py b/pitivi/ui/timelinecanvas.py
index df60fee..67911a4 100644
--- a/pitivi/ui/timelinecanvas.py
+++ b/pitivi/ui/timelinecanvas.py
@@ -31,7 +31,8 @@ from pitivi.ui.point import Point
 from pitivi.ui.zoominterface import Zoomable
 from pitivi.settings import GlobalSettings
 from pitivi.ui.prefs import PreferencesDialog
-from pitivi.ui.common import TRACK_SPACING, unpack_cairo_pattern
+from pitivi.ui.common import TRACK_SPACING, unpack_cairo_pattern, \
+        LAYER_HEIGHT_EXPANDED, LAYER_SPACING
 
 # cursors to be used for resizing objects
 ARROW = gtk.gdk.Cursor(gtk.gdk.ARROW)
@@ -96,6 +97,10 @@ class TimelineCanvas(goocanvas.Canvas, Zoomable, Loggable):
         root.connect("motion-notify-event", self._selectionDrag)
         root.connect("button-press-event", self._selectionStart)
         root.connect("button-release-event", self._selectionEnd)
+        height = (LAYER_HEIGHT_EXPANDED + TRACK_SPACING + LAYER_SPACING) * 2
+        # add some padding for the horizontal scrollbar
+        height += 21
+        self.set_size_request(-1, height)
 
     def from_event(self, event):
         return Point(*self.convert_from_pixels(event.x, event.y))
diff --git a/pitivi/ui/timelinecontrols.py b/pitivi/ui/timelinecontrols.py
index 7246109..90ac15c 100644
--- a/pitivi/ui/timelinecontrols.py
+++ b/pitivi/ui/timelinecontrols.py
@@ -21,7 +21,7 @@ class TrackControls(gtk.Label):
 
     def __init__(self, track):
         gtk.Label.__init__(self)
-        self.set_alignment(0.5, 0)
+        self.set_alignment(0.5, 0.1)
         self.set_markup(track_name(track))
         self.track = track
         self.set_size_request(TRACK_CONTROL_WIDTH, LAYER_HEIGHT_EXPANDED)
diff --git a/pitivi/ui/track.py b/pitivi/ui/track.py
index 8e9a88c..ced7140 100644
--- a/pitivi/ui/track.py
+++ b/pitivi/ui/track.py
@@ -1,7 +1,7 @@
 from pitivi.ui.zoominterface import Zoomable
 from pitivi.ui.trackobject import TrackObject
 from pitivi.receiver import receiver, handler
-from common import LAYER_HEIGHT_EXPANDED, LAYER_HEIGHT_COLLAPSED, LAYER_SPACING
+from pitivi.ui.common import LAYER_HEIGHT_EXPANDED, LAYER_HEIGHT_COLLAPSED, LAYER_SPACING
 import goocanvas
 
 class Track(goocanvas.Group, Zoomable):