[pitivi: 11/18] mainwindow.py, viewer.py: hide viewer slider when timeline is current pipeline
- From: Edward Hervey <edwardrv src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pitivi: 11/18] mainwindow.py, viewer.py: hide viewer slider when timeline is current pipeline
- Date: Wed, 9 Dec 2009 11:04:18 +0000 (UTC)
commit 68c4e426fe1340d4d142a2e9eea62121e7e79a0f
Author: Brandon Lewis <brandon_lewis alum berkeley edu>
Date: Tue Dec 8 14:26:12 2009 -0800
mainwindow.py,viewer.py: hide viewer slider when timeline is current pipeline
closes bug 590632
pitivi/ui/mainwindow.py | 2 ++
pitivi/ui/viewer.py | 13 ++++++++++++-
2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index e97ad29..41b60bf 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -1026,6 +1026,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
action = ViewAction()
action.addProducers(factory)
self.viewer.setPipeline(None)
+ self.viewer.showSlider()
# FIXME: why do I have to call viewer.setAction ?
self.viewer.setAction(action)
self.viewer.setPipeline(pipeline)
@@ -1035,6 +1036,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
self.debug("position:%s", gst.TIME_ARGS (position))
if self.viewer.action != self.project.view_action:
self.viewer.setPipeline(None)
+ self.viewer.hideSlider()
self.viewer.setAction(self.project.view_action)
self.viewer.setPipeline(self.project.pipeline)
# get the pipeline settings and set the DAR of the viewer
diff --git a/pitivi/ui/viewer.py b/pitivi/ui/viewer.py
index b1c3783..dde0a02 100644
--- a/pitivi/ui/viewer.py
+++ b/pitivi/ui/viewer.py
@@ -273,6 +273,16 @@ class PitiviViewer(gtk.VBox, Loggable):
height = int(width / self.aframe.props.ratio)
self.aframe.set_size_request(width , height)
+ _showingSlider = True
+
+ def showSlider(self):
+ self._showingSlider = True
+ self.slider.show()
+
+ def hideSlider(self):
+ self._showingSlider = False
+ self.slider.hide()
+
def showControls(self):
if not self.action:
return
@@ -282,7 +292,8 @@ class PitiviViewer(gtk.VBox, Loggable):
self.playpause_button.show()
self.next_button.show()
self.forward_button.show()
- self.slider.show()
+ if self._showingSlider:
+ self.slider.show()
else:
self.rewind_button.hide()
self.back_button.hide()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]