[pitivi] project.py, mainwindow.py, ui.timeline.py: pass old, new settings in settings-changed signal
- From: Edward Hervey <edwardrv src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pitivi] project.py, mainwindow.py, ui.timeline.py: pass old, new settings in settings-changed signal
- Date: Wed, 4 Nov 2009 15:44:18 +0000 (UTC)
commit 275ba1836a15830b318a35701ad3854aee97185e
Author: Brandon Lewis <brandon_lewis berkeley edu>
Date: Mon Oct 19 09:33:14 2009 -0700
project.py,mainwindow.py,ui.timeline.py: pass old, new settings in settings-changed signal
pitivi/project.py | 5 +++--
pitivi/ui/mainwindow.py | 6 +++---
pitivi/ui/timeline.py | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/pitivi/project.py b/pitivi/project.py
index 1fc1ca5..fc4776e 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -63,7 +63,7 @@ class Project(Signallable, Loggable):
"""
__signals__ = {
- "settings-changed" : None,
+ "settings-changed" : ['old', 'new'],
}
def __init__(self, name="", uri=None, **kwargs):
@@ -112,8 +112,9 @@ class Project(Signallable, Loggable):
If settings is None, the current settings will be unset
"""
self.log("Setting %s as the project's settings", settings)
+ oldsettings = self.settings
self.settings = settings
- self.emit('settings-changed')
+ self.emit('settings-changed', oldsettings, settings)
def unsetSettings(self, unused_settings):
""" Remove the currently configured settings."""
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index ffcda41..48ca119 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -907,10 +907,10 @@ class PitiviMainWindow(gtk.Window, Loggable):
project = receiver(_setProject)
@handler(project, "settings-changed")
- def _settingsChangedCb(self, project):
+ def _settingsChangedCb(self, project, old, new):
if self.viewer.action == self.project.view_action:
- sett = self.project.getSettings()
- self.viewer.setDisplayAspectRatio(float(sett.videopar * sett.videowidth) / float(sett.videoheight))
+ self.viewer.setDisplayAspectRatio(float(new.videopar *
+ new.videowidth) / float(new.videoheight))
def _sourceListMissingPluginsCb(self, project, uri, factory,
details, descriptions, missingPluginsCallback):
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index 965b928..3366e0b 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -415,13 +415,13 @@ class Timeline(gtk.Table, Loggable, Zoomable):
self._canvas.zoomChanged()
self.ruler.setProjectFrameRate(self.project.getSettings().videorate)
self.ruler.zoomChanged()
- self._settingsChangedCb(self.project)
+ self._settingsChangedCb(self.project, None, self.project.getSettings())
project = receiver(_setProject)
@handler(project, "settings-changed")
- def _settingsChangedCb(self, project):
- rate = self.project.getSettings().videorate
+ def _settingsChangedCb(self, project, old, new):
+ rate = new.videorate
self.rate = float(1 / rate)
self.ruler.setProjectFrameRate(rate)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]