[pitivi] timeline: Cleanup _addLayer

[Thibault Saunier <tsaunier src gnome org>]

commit cbabf0e611d74a7710bc6d84889f63c49741b198
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Thu Jul 9 15:55:03 2015 +0200

    timeline: Cleanup _addLayer
    
    Summary: Depends on D249
    
    Reviewers: Mathieu_Du, aleb
    
    Differential Revision: https://phabricator.freedesktop.org/D250

 pitivi/timeline/layer.py    |    4 ++--
 pitivi/timeline/timeline.py |   27 ++++++++++++---------------
 2 files changed, 14 insertions(+), 17 deletions(-)
---
diff --git a/pitivi/timeline/layer.py b/pitivi/timeline/layer.py
index d9ca818..62777b9 100644
--- a/pitivi/timeline/layer.py
+++ b/pitivi/timeline/layer.py
@@ -446,8 +446,8 @@ class Layer(Gtk.EventBox, timelineUtils.Zoomable, Loggable):
         for clip in bLayer.get_clips():
             self._addClip(clip)
 
-        self.before_sep = None
-        self.after_sep = None
+        self.before_sep = SpacedSeparator()
+        self.after_sep = SpacedSeparator()
 
     def release(self):
         for clip in self.bLayer.get_clips():
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index a186ac1..d035089 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -36,7 +36,7 @@ from pitivi.configure import get_ui_dir
 from pitivi.dialogs.prefs import PreferencesDialog
 from pitivi.settings import GlobalSettings
 from pitivi.timeline.elements import Clip, TrimHandle
-from pitivi.timeline.layer import SpacedSeparator, Layer, LayerControls
+from pitivi.timeline.layer import Layer, LayerControls
 from pitivi.timeline.ruler import ScaleRuler
 from pitivi.utils.loggable import Loggable
 from pitivi.utils.timeline import EditingContext, Selection, \
@@ -829,24 +829,21 @@ class Timeline(Gtk.EventBox, Zoomable, Loggable):
             i += 1
 
     def _addLayer(self, bLayer):
-        layer_widget = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-
-        bLayer.control_ui = LayerControls(bLayer, self.app)
-        bLayer.ui = Layer(bLayer, self)
-
-        bLayer.ui.before_sep = SpacedSeparator()
-        layer_widget.pack_start(bLayer.ui.before_sep, False, False, 0)
+        control = LayerControls(bLayer, self.app)
+        self.__layers_controls_vbox.pack_start(control, False, False, 0)
+        bLayer.control_ui = control
 
-        self._layers.append(bLayer.ui)
-        layer_widget.pack_start(bLayer.ui, True, True, 0)
-
-        bLayer.ui.after_sep = SpacedSeparator()
-        layer_widget.pack_start(bLayer.ui.after_sep, False, False, 0)
+        layer = Layer(bLayer, self)
+        bLayer.ui = layer
+        self._layers.append(layer)
+        layer.connect("remove-me", self._removeLayerCb)
 
+        layer_widget = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+        layer_widget.pack_start(layer.before_sep, False, False, 0)
+        layer_widget.pack_start(layer, True, True, 0)
+        layer_widget.pack_start(layer.after_sep, False, False, 0)
         self.__layers_vbox.pack_start(layer_widget, True, True, 0)
-        self.__layers_controls_vbox.pack_start(bLayer.control_ui, False, False, 0)
 
-        bLayer.ui.connect("remove-me", self._removeLayerCb)
         bLayer.connect("notify::priority", self.__layerPriorityChangedCb)
 
         self.show_all()