[pitivi] Put back the implementation of TrackObject.setProperty and TimelineObject.setProperty and just call
- From: Edward Hervey <edwardrv src gnome org>
- To: svn-commits-list gnome org
- Subject: [pitivi] Put back the implementation of TrackObject.setProperty and TimelineObject.setProperty and just call
- Date: Wed, 18 Mar 2009 14:09:14 -0400 (EDT)
commit 222e9173bc87ffab01db04d037e3be1667ff2045
Author: Alessandro Decina <alessandro decina collabora co uk>
Date: Mon Mar 16 18:29:28 2009 +0100
Put back the implementation of TrackObject.setProperty and TimelineObject.setProperty and just call setObjectProperty from ui/trackobject.
---
pitivi/timeline/timeline.py | 4 ++--
pitivi/timeline/track.py | 9 ++++-----
pitivi/ui/trackobject.py | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 3ba6d3e..0ff1fa2 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -171,8 +171,8 @@ class TimelineObject(object, Signallable):
if not self.track_objects:
raise TimelineError()
- #for track_object in self.track_objects:
- # track_object.setObjectPriority(priority)
+ for track_object in self.track_objects:
+ track_object.setObjectPriority(priority)
self.emit('priority-changed', priority)
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index f7664b5..d5bf999 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -168,11 +168,10 @@ class TrackObject(object, Signallable):
return self.gnl_object.props.priority
def setPriority(self, priority):
- #if self.timeline_object is not None:
- # self.timeline_object.setPriority(priority)
- #else:
- # self.setObjectPriority(priority)
- self.setObjectPriority(priority)
+ if self.timeline_object is not None:
+ self.timeline_object.setPriority(priority)
+ else:
+ self.setObjectPriority(priority)
def setObjectPriority(self, priority):
self.gnl_object.props.priority = priority
diff --git a/pitivi/ui/trackobject.py b/pitivi/ui/trackobject.py
index 5a6cef5..1fbdd3e 100644
--- a/pitivi/ui/trackobject.py
+++ b/pitivi/ui/trackobject.py
@@ -127,7 +127,7 @@ class TrackObject(View, goocanvas.Group, Zoomable):
snap=True)
priority = int(max(0, (y - self._y_offset) // (LAYER_HEIGHT_EXPANDED +
LAYER_SPACING)))
- self._view.element.priority = priority
+ self._view.element.setObjectPriority(priority)
def __init__(self, element, track, timeline):
goocanvas.Group.__init__(self)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]