[pitivi: 5/9] Fix Timeline.groupSelection and Timeline.ungroupSelection.
- From: Edward Hervey <edwardrv src gnome org>
- To: svn-commits-list gnome org
- Subject: [pitivi: 5/9] Fix Timeline.groupSelection and Timeline.ungroupSelection.
- Date: Fri, 8 May 2009 04:44:30 -0400 (EDT)
commit 1d28b451b7c9ca27f5481f4548d70772ef85c19f
Author: Alessandro Decina <alessandro d gmail com>
Date: Thu May 7 17:17:13 2009 +0200
Fix Timeline.groupSelection and Timeline.ungroupSelection.
Those functions weren't updated when selection code was moved out of
Timeline.
---
pitivi/timeline/timeline.py | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 20049f9..e6aae87 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -307,6 +307,13 @@ class Selection(Signallable):
self.emit("selection-changed")
+ def getSelectedTrackObjs(self):
+ objects = []
+ for timeline_object in self.selected:
+ objects.extend(timeline_object.track_objects)
+
+ return set(objects)
+
def __len__(self):
return len(self.selected)
@@ -482,7 +489,6 @@ class Timeline(Signallable, Loggable):
self.selection.connect("selection-changed", self._selectionChanged)
self.timeline_objects = []
self.duration = 0
- self.timeline_selection = set()
self.links = []
self.dead_band = 10
self.edges = TimelineEdges()
@@ -666,14 +672,14 @@ class Timeline(Signallable, Loggable):
self.emit("selection-changed")
def groupSelection(self):
- if len(self.timeline_selection) < 2:
+ if len(self.selection.selected) < 2:
return
# FIXME: pass a proper factory
new_timeline_object = TimelineObject(factory=None)
tracks = []
- for timeline_object in self.timeline_selection:
+ for timeline_object in self.selection.selected:
for track_object in timeline_object.track_objects:
new_track_object = track_object.copy()
tracks.append(track_object.track)
@@ -684,12 +690,12 @@ class Timeline(Signallable, Loggable):
self.addTimelineObject(new_timeline_object)
- for timeline_object in list(self.timeline_selection):
+ for timeline_object in list(self.selection.selected):
timeline_object.selected = False
self.removeTimelineObject(timeline_object, deep=True)
def ungroupSelection(self):
- for timeline_object in list(self.timeline_selection):
+ for timeline_object in list(self.selection.selected):
if len(timeline_object.track_objects) == 1:
continue
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]