[pitivi/ges: 84/287] Misc fixes



commit 7351669400d156a61ed3068c8d2f1e70ccc9af0c
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Thu Dec 8 18:08:28 2011 -0300

    Misc fixes

 pitivi/project.py           |    5 +----
 pitivi/timeline/timeline.py |    4 ++--
 pitivi/ui/trackobject.py    |    9 +++++++--
 pitivi/ui/zoominterface.py  |    2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/pitivi/project.py b/pitivi/project.py
index 92ab35c..151080a 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -87,13 +87,10 @@ class Project(Signallable, Loggable):
         self._dirty = False
 
         self.timeline = ges.timeline_new_audio_video()
+
         # We add a Selection to the timeline as there is currently
         # no such feature in GES
         self.timeline.selection = Selection()
-        self.layer = ges.TimelineLayer()
-        self.layer.set_property("auto-transition", True)
-
-        self.timeline.add_layer(self.layer)
 
         self.pipeline = ges.TimelinePipeline()
         self.pipeline._setUp = False
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index e8235cb..8f07cac 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -387,7 +387,7 @@ class MoveContext(EditingContext, Loggable):
         # We make sure to work with sources for the drag
         # and drop
         obj = self.focus
-        if isinstance(self.focus, ges.TrackFileSource):
+        if isinstance(self.focus, ges.TrackSource):
             obj = self.focus.get_timeline_object()
         elif isinstance(self.focus, ges.TrackOperation):
             return
@@ -553,7 +553,7 @@ class TrimEndContext(EditingContext):
         #self.adjacent = timeline.edges.getObjsAdjacentToEnd(focus)
         #self.adjacent_originals = self._saveValues(self.adjacent)
         self.tracks = set([])
-        if isinstance(self.focus, ges.TrackFileSource):
+        if isinstance(self.focus, ges.TrackSource):
             focus_timeline_object = self.focus
             self.tracks.add(focus.get_track())
         else:
diff --git a/pitivi/ui/trackobject.py b/pitivi/ui/trackobject.py
index fd4e044..9731cdf 100644
--- a/pitivi/ui/trackobject.py
+++ b/pitivi/ui/trackobject.py
@@ -113,8 +113,9 @@ def  get_next_track_source(track, tckobj):
 
 class Selected (Signallable):
     """
-        A simple class that let us emit a selected-changed signal
-        when need
+    A simple class that let us emit a selected-changed signal
+    when needed, and that can be check directly to know if the
+    object is selected or not.
     """
 
     __signals__ = {
@@ -124,6 +125,10 @@ class Selected (Signallable):
         self._selected = False
 
     def __nonzero__(self):
+        """
+        checking a Selected object is the same as checking its _selected
+        property
+        """
         return self._selected
 
     def getSelected(self):
diff --git a/pitivi/ui/zoominterface.py b/pitivi/ui/zoominterface.py
index e8e35b9..5a2a850 100644
--- a/pitivi/ui/zoominterface.py
+++ b/pitivi/ui/zoominterface.py
@@ -1,6 +1,6 @@
 # PiTiVi , Non-linear video editor
 #
-#       pitivi/ui/complexlayer.py
+#       pitivi/ui/zoominterface.py
 #
 # Copyright (c) 2006, Edward Hervey <bilboed bilboed com>
 #



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]