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

[blewis svn gnome org]

Author: blewis
Date: Wed Jul 23 01:01:47 2008
New Revision: 1214
URL: http://svn.gnome.org/viewvc/pitivi?rev=1214&view=rev

Log:
* pitivi/ui/complextimeline.py:
deleting a source also deletes the linked source...the other way
caused problems for trimming of sources.


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	Wed Jul 23 01:01:47 2008
@@ -231,6 +231,7 @@
     def _objectRemoved(self, timeline, element):
         w = self.widgets[element]
         self.remove_child(w)
+        w.comp = None
         del self.widgets[element]
         del self.elements[w]
 
@@ -495,8 +496,10 @@
 
     def deleteSelected(self, unused_action):
         for obj in self._selected_sources:
-            obj.comp.removeSource(obj.element, remove_linked=False, 
-                collapse_neighbours=False)
+            if obj.comp:
+                obj.comp.removeSource(obj.element, remove_linked=True, 
+                    collapse_neighbours=False)
+        self._selected_sources = set()
         return True
 
     def activateRazor(self, unused_action):
@@ -584,7 +587,7 @@
 ## ZoomableWidgetInterface overrides
 
     def _selection_changed_cb(self, selected, deselected):
-        
+
         # TODO: filter this list for things other than sources, and put them
         # into appropriate lists
         for item in selected:
@@ -596,6 +599,8 @@
             parent = item.get_parent()
             self._selected_sources.remove(parent)
 
+## ZoomableWidgetInterface overrides
+
     def getDuration(self):
         return max([layer.composition.duration for layer in
             self.layerInfoList])