[pitivi: 1/18] Pass only the settings, not the whole app, to PitiviViewer
- From: Edward Hervey <edwardrv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi: 1/18] Pass only the settings, not the whole app, to PitiviViewer
- Date: Fri, 18 Mar 2011 12:09:36 +0000 (UTC)
commit 0ebc87820d3feb5d25999dee8ce2261b35d6f471
Author: Alex BÄ?luÈ? <alexandru balut gmail com>
Date: Sun Dec 12 15:39:13 2010 +0100
Pass only the settings, not the whole app, to PitiviViewer
pitivi/application.py | 2 +-
pitivi/ui/mainwindow.py | 3 ++-
pitivi/ui/viewer.py | 5 ++---
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/pitivi/application.py b/pitivi/application.py
index ba84a66..49438ef 100644
--- a/pitivi/application.py
+++ b/pitivi/application.py
@@ -303,7 +303,7 @@ When -r is specified, the given project file is rendered without opening the GUI
self.gui = None
elif options.preview:
# init ui for previewing
- self.gui = PitiviViewer(self)
+ self.gui = PitiviViewer(self.settings)
self.window = gtk.Window()
self.window.connect("delete-event", self._deleteCb)
self.window.add(self.gui)
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index b365c9a..e78ac94 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -465,7 +465,8 @@ class PitiviMainWindow(gtk.Window, Loggable):
self.propertiestabs.show()
# Viewer
- self.viewer = PitiviViewer(instance, undock_action=self.undock_action)
+ self.viewer = PitiviViewer(instance.settings,
+ undock_action=self.undock_action)
# drag and drop
self.viewer.drag_dest_set(gtk.DEST_DEFAULT_DROP | gtk.DEST_DEFAULT_MOTION,
[dnd.FILESOURCE_TUPLE, dnd.URI_TUPLE],
diff --git a/pitivi/ui/viewer.py b/pitivi/ui/viewer.py
index 136b8ad..badf716 100644
--- a/pitivi/ui/viewer.py
+++ b/pitivi/ui/viewer.py
@@ -81,7 +81,7 @@ class PitiviViewer(gtk.VBox, Loggable):
@type action: L{ViewAction}
"""
- def __init__(self, app, undock_action=None, action=None,
+ def __init__(self, settings, undock_action=None, action=None,
pipeline=None):
"""
@param action: Specific action to use instead of auto-created one
@@ -89,8 +89,7 @@ class PitiviViewer(gtk.VBox, Loggable):
"""
gtk.VBox.__init__(self)
self.set_border_width(SPACING)
- self.app = app
- self.settings = app.settings
+ self.settings = settings
Loggable.__init__(self)
self.log("New PitiviViewer")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]