[pitivi] Make TrackControls be a Label and not an Expander.

[Edward Hervey <edwardrv src gnome org>]

commit 657ba3379772c25aac3d2ee9bf78fa9a8be890e2
Author: Alessandro Decina <alessandro d gmail com>
Date:   Wed Jul 29 15:13:10 2009 +0200

    Make TrackControls be a Label and not an Expander.
    
    We made the expander unsensitive in the last release since expanding/collapsing
    didn't look that good. Now i'm removing the expander altogether.

 pitivi/ui/timeline.py         |    6 -----
 pitivi/ui/timelinecontrols.py |   44 +++-------------------------------------
 2 files changed, 4 insertions(+), 46 deletions(-)
---
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index b9cbfa1..60c734d 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -142,8 +142,6 @@ class Timeline(gtk.Table, Loggable, Zoomable):
 
         # controls for tracks and layers
         self._controls = TimelineControls()
-        self._controls.connect('track-expanded',
-                self._timelineControlsTrackExpandedCb)
         controlwindow = gtk.ScrolledWindow(None, self.vadj)
         controlwindow.set_policy(gtk.POLICY_NEVER, gtk.POLICY_NEVER)
         controlwindow.add_with_viewport(self._controls)
@@ -231,10 +229,6 @@ class Timeline(gtk.Table, Loggable, Zoomable):
         self._canvas.connect("button-release-event", self._buttonRelease)
         self._canvas.connect("key-press-event", self._keyPressEventCb)
 
-    def _timelineControlsTrackExpandedCb(self, timeline_controls,
-            track, expanded):
-        self._canvas.setExpanded(track, expanded)
-
 
 ## Event callbacks
 
diff --git a/pitivi/ui/timelinecontrols.py b/pitivi/ui/timelinecontrols.py
index 6c53fe8..f2425f4 100644
--- a/pitivi/ui/timelinecontrols.py
+++ b/pitivi/ui/timelinecontrols.py
@@ -16,32 +16,14 @@ def track_name(track):
     elif stream_type == stream.TextStream:
         return _("<b>Text:</b>")
 
-class TrackControls(gtk.Expander):
-
+class TrackControls(gtk.Label):
     __gtype_name__ = 'TrackControls'
 
-    __gsignals__ = {
-        "activate" : "override",
-    }
-
     def __init__(self, track):
-        gtk.Expander.__init__(self, track_name(track))
-        self.props.use_markup = True
-        self.set_expanded(True)
-        self.set_sensitive(False)
+        gtk.Label.__init__(self)
+        self.set_markup(track_name(track))
         self.track = track
-
-    def set_expanded(self, expanded):
-        if expanded != self.props.expanded:
-            if expanded:
-                self.set_size_request(TRACK_CONTROL_WIDTH, LAYER_HEIGHT_EXPANDED)
-            else:
-                self.set_size_request(TRACK_CONTROL_WIDTH, LAYER_HEIGHT_COLLAPSED)
-
-        gtk.Expander.set_expanded(self, expanded)
-
-    def do_activate(self):
-        self.props.expanded = not self.props.expanded
+        self.set_size_request(TRACK_CONTROL_WIDTH, LAYER_HEIGHT_EXPANDED)
 
     def _setTrack(self):
         if self.track:
@@ -56,11 +38,6 @@ class TrackControls(gtk.Expander):
             LAYER_SPACING))
 
 class TimelineControls(gtk.VBox):
-    __gsignals__ = {
-        "track-expanded" : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
-                (gobject.TYPE_PYOBJECT, gobject.TYPE_BOOLEAN))
-    }
-
     def __init__(self):
         gtk.VBox.__init__(self)
         self._tracks = []
@@ -81,7 +58,6 @@ class TimelineControls(gtk.VBox):
     @handler(timeline, "track-added")
     def _trackAdded(self, timeline, track):
         track = TrackControls(track)
-        self._connectToTrackControls(track)
         self._tracks.append(track)
         self.pack_start(track, False, False)
         track.show()
@@ -89,17 +65,5 @@ class TimelineControls(gtk.VBox):
     @handler(timeline, "track-removed")
     def _trackRemoved(self, unused_timeline, position):
         track = self._tracks[position]
-        self._disconnectFromTrackControls(track)
         del self._tracks[position]
         self.remove(track)
-
-    def _connectToTrackControls(self, track_controls):
-        track_controls.connect("notify::expanded",
-                self._trackControlsExpandedCb)
-
-    def _disconnectFromTrackControls(self, track_controls):
-        track_controls.disconnect_by_func(self._trackControlsExpandedCb)
-
-    def _trackControlsExpandedCb(self, track_controls, pspec):
-        self.emit('track-expanded', track_controls.track,
-                track_controls.props.expanded)