[pitivi] track: add expanded property, ui.track: use expanded property to determine height
- From: Edward Hervey <edwardrv src gnome org>
- To: svn-commits-list gnome org
- Subject: [pitivi] track: add expanded property, ui.track: use expanded property to determine height
- Date: Wed, 18 Mar 2009 14:08:34 -0400 (EDT)
commit 09c49b66723448b148186a2af7e4eade36b02575
Author: Brandon Lewis <brandon_lewis berkeley edu>
Date: Sun Mar 15 00:03:35 2009 -0700
track: add expanded property, ui.track: use expanded property to determine height
---
pitivi/timeline/timeline.py | 3 ++-
pitivi/timeline/track.py | 13 +++++++++++++
pitivi/ui/common.py | 7 +++++++
pitivi/ui/timeline.py | 1 -
pitivi/ui/track.py | 7 +++++--
5 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index a9fb1e9..0ff1fa2 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -437,7 +437,8 @@ class Timeline(object ,Signallable):
__signals__ = {
'duration-changed': ['duration'],
'track-added': ['track'],
- 'track-removed': ['track']
+ 'track-removed': ['track'],
+ 'track-order-changed' :[],
}
def __init__(self):
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index c858b1f..52d59cb 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -301,6 +301,7 @@ class Track(object, Signallable):
'track-object-added': ['track_object'],
'track-object-removed': ['track_object'],
'max-priority-changed': ['track_object']
+ 'expanded-changed': [],
}
def __init__(self, stream):
@@ -365,6 +366,18 @@ class Track(object, Signallable):
max_priority = property(_getMaxPriority)
+ _expanded = True
+
+ def setExpanded(self, expanded):
+ if self._expanded != expanded:
+ self._expanded = expanded
+ self.emit("expanded-changed")
+
+ def getExpanded(self):
+ return self._expanded
+
+ expanded = property(getExpanded, setExpanded)
+
__max_priority = 0
@property
diff --git a/pitivi/ui/common.py b/pitivi/ui/common.py
new file mode 100644
index 0000000..b9c772a
--- /dev/null
+++ b/pitivi/ui/common.py
@@ -0,0 +1,7 @@
+from pitivi.settings import GlobalSettings
+
+GlobalSettings.addConfigSection("user-interface")
+LAYER_HEIGHT_EXPANDED = 50
+LAYER_HEIGHT_COLLAPSED = 10
+LAYER_SPACING = 5
+TRACK_SPACING = 5
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index 6c43c5a..53d7628 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -285,7 +285,6 @@ class Timeline(gtk.Table, Loggable, Zoomable):
self.hadj.set_value(position)
return False
-
## Timeline callbacks
timeline = receiver()
diff --git a/pitivi/ui/track.py b/pitivi/ui/track.py
index 75ed2d6..f03da4c 100644
--- a/pitivi/ui/track.py
+++ b/pitivi/ui/track.py
@@ -1,7 +1,7 @@
from pitivi.ui.zoominterface import Zoomable
from pitivi.ui.trackobject import TrackObject
from pitivi.receiver import receiver, handler
-from common import LAYER_HEIGHT_EXPANDED, LAYER_SPACING
+from common import LAYER_HEIGHT_EXPANDED, LAYER_HEIGHT_COLLAPSED, LAYER_SPACING
import goocanvas
class Track(goocanvas.Group, Zoomable):
@@ -18,7 +18,10 @@ class Track(goocanvas.Group, Zoomable):
## Properties
def getHeight(self):
- return (1 + self.max_priority) * (LAYER_HEIGHT_EXPANDED + LAYER_SPACING)
+ if self.track.expanded:
+ return (1 + self.max_priority) * (LAYER_HEIGHT_EXPANDED + LAYER_SPACING)
+ else:
+ return LAYER_HEIGHT_COLLAPSED + LAYER_SPACING
height = property(getHeight)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]