[pitivi: 12/27] viewer: Pass the all app to it so we can access the UI, and everything we need
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi: 12/27] viewer: Pass the all app to it so we can access the UI, and everything we need
- Date: Wed, 11 May 2011 14:06:11 +0000 (UTC)
commit 903bd3e609fed098423e05c2ea7d390083de7dda
Author: Thibault Saunier <thibault saunier collabora co uk>
Date: Mon Mar 7 11:00:42 2011 +0100
viewer: Pass the all app to it so we can access the UI, and everything we need
pitivi/ui/mainwindow.py | 3 +--
pitivi/ui/viewer.py | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index 056b71a..31a19f8 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -460,8 +460,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
self.propertiestabs.show()
# Viewer
- self.viewer = PitiviViewer(instance.settings,
- undock_action=self.undock_action)
+ self.viewer = PitiviViewer(instance, 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 674ae2e..58e3a3b 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, settings, undock_action=None, action=None,
+ def __init__(self, app, undock_action=None, action=None,
pipeline=None):
"""
@param action: Specific action to use instead of auto-created one
@@ -89,7 +89,8 @@ class PitiviViewer(gtk.VBox, Loggable):
"""
gtk.VBox.__init__(self)
self.set_border_width(SPACING)
- self.settings = settings
+ self.settings = app.settings
+ self.app = app
Loggable.__init__(self)
self.log("New PitiviViewer")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]