[pitivi/ges: 89/287] Misc fixes after GES port

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit 1b65261ace99dabb7b9ca3fcf1dc05da472a9e50
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Tue Dec 13 20:51:37 2011 -0300

    Misc fixes after GES port

 pitivi/timeline/timeline.py |   16 ++++++----------
 pitivi/ui/clipproperties.py |   10 ++++------
 pitivi/ui/timeline.py       |   16 +++++++++++++---
 pitivi/ui/view.py           |    1 -
 4 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index ab5ff0c..5a5449c 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -594,7 +594,6 @@ class TrimStartContext(EditingContext):
         self._restoreValues(self.ripple_originals)
 
     def _defaultTo(self, position, priority):
-        start = self.focus.props.start
         earliest = max(0, position - self.focus.starting_start)
         self.focus.props.in_point = earliest
         self.focus.props.start = position
@@ -613,8 +612,7 @@ class TrimStartContext(EditingContext):
         timeline_objects = [self.focus_timeline_object]
         EditingContext.finish(self)
 
-        left_gap, right_gap = self._getGapsForLayer(timeline_objects,
-            self.tracks)
+        left_gap, right_gap = self._getGapsForLayer(timeline_objects)
 
         if left_gap is invalid_gap:
             self._defaultTo(initial_position, obj.priority)
@@ -626,8 +624,6 @@ class TrimStartContext(EditingContext):
 class TrimEndContext(EditingContext):
     def __init__(self, timeline, focus, other):
         EditingContext.__init__(self, timeline, focus, other)
-        #self.adjacent = timeline.edges.getObjsAdjacentToEnd(focus)
-        #self.adjacent_originals = self._saveValues(self.adjacent)
         self.tracks = set([])
         if isinstance(self.focus, ges.TrackSource):
             focus_timeline_object = self.focus
@@ -649,8 +645,8 @@ class TrimEndContext(EditingContext):
                   if obj.props.start > reference]
 
         self.ripple_originals = self._saveValues(ripple)
-        self.ripple_offsets = self._getOffsets(reference, self.focus.props.priority,
-            ripple)
+        self.ripple_offsets = self._getOffsets(reference,
+            self.focus.get_layer().props.priority, ripple)
 
     def _rollTo(self, position, priority):
         if self._snap:
@@ -671,7 +667,7 @@ class TrimEndContext(EditingContext):
             position = self.snapToEdge(position)
         position = min(latest, max(position, earliest))
         duration = position - self.focus.start
-        self.focus.setDuration(duration)
+        self.focus.props.duration = duration
         for obj, (s_offset, p_offset) in self.ripple_offsets.iteritems():
             obj.setStart(position + s_offset)
 
@@ -705,10 +701,10 @@ class TrimEndContext(EditingContext):
                 self.tracks)
 
         if right_gap is invalid_gap:
-            self._defaultTo(absolute_initial_duration, obj.priority)
+            self._defaultTo(absolute_initial_duration, obj.props.priority)
             left_gap, right_gap = Gap.findAroundObject(self.focus_timeline_object)
             duration = absolute_initial_duration + right_gap.duration
-            self._defaultTo(duration, obj.priority)
+            self._defaultTo(duration, obj.props.priority)
 
 
 class Selection(Signallable):
diff --git a/pitivi/ui/clipproperties.py b/pitivi/ui/clipproperties.py
index 6ccd754..b367a85 100644
--- a/pitivi/ui/clipproperties.py
+++ b/pitivi/ui/clipproperties.py
@@ -267,14 +267,13 @@ class EffectProperties(gtk.Expander, gtk.HBox):
     def _vcontentNotifyCb(self, paned, gparamspec):
         if gparamspec.name == 'position':
             self._config_ui_h_pos = self._vcontent.get_position()
-            self.app.settings.effectVPanedPosition = self._config_ui_h_pos
+            self.settings.effectVPanedPosition = self._config_ui_h_pos
 
     def _getTimeline(self):
         return self._timeline
 
     def _setTimeline(self, timeline):
         self._timeline = timeline
-        #if not self.connected:
         self._timeline.selection.connect("selection-changed", self._selectionChangedCb)
         self.connected = True
 
@@ -465,11 +464,10 @@ class EffectProperties(gtk.Expander, gtk.HBox):
 
     def _updateEffectConfigUi(self):
         if self._config_ui_h_pos is None:
-            self._config_ui_h_pos =\
-                        self.app.gui.settings.effectVPanedPosition
+            self._config_ui_h_pos = self.app.gui.settings.effectVPanedPosition
             if self._config_ui_h_pos is None:
-                self._config_ui_h_pos =\
-                        self.app.gui.settings.mainWindowHeight // 3
+                self._config_ui_h_pos = self.app.gui.settings.mainWindowHeight // 3
+
         if self.selection.get_selected()[1]:
             track_effect = self.storemodel.get_value(self.selection.get_selected()[1],
                                                COL_TRACK_EFFECT)
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index af07c7a..3c5458a 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -815,15 +815,25 @@ class Timeline(gtk.Table, Loggable, Zoomable):
 
     def ungroupSelected(self, unused_action):
         if self.timeline:
+            self.debug("Ungouping selected clips %s" % self.timeline.selection)
+
+            self.timeline.enable_update(False)
             self.app.action_log.begin("ungroup")
             for tlobj in self.timeline.selection:
                 tlobj.objects_set_locked(False)
+            self.timeline.enable_update(True)
             self.app.action_log.commit()
 
     def groupSelected(self, unused_action):
         if self.timeline:
+            self.debug("Gouping selected clips %s" % self.timeline.selection)
+
+            self.timeline.enable_update(False)
+            self.app.action_log.begin("group")
             for tlobj in self.timeline.selection:
-                tlobj.set_locked(True)
+                tlobj.objects_set_locked(True)
+            self.app.action_log.commit()
+            self.timeline.enable_update(True)
 
     def alignSelected(self, unused_action):
         if "NumPy" in soft_deps:
@@ -833,10 +843,10 @@ class Timeline(gtk.Table, Loggable, Zoomable):
             progress_dialog = AlignmentProgressDialog(self.app)
             progress_dialog.window.show()
             self.app.action_log.begin("align")
-            self.timeline.disableUpdates()
+            self.timeline.enable_update(False)
 
             def alignedCb():  # Called when alignment is complete
-                self.timeline.enableUpdates()
+                self.timeline.enable_update(True)
                 self.app.action_log.commit()
                 progress_dialog.window.destroy()
 
diff --git a/pitivi/ui/view.py b/pitivi/ui/view.py
index 2814e8b..d625ac5 100644
--- a/pitivi/ui/view.py
+++ b/pitivi/ui/view.py
@@ -1,4 +1,3 @@
-from pitivi.receiver import receiver, handler
 import controller