[pitivi] timeline: Get rid of unused _projectmanager field
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] timeline: Get rid of unused _projectmanager field
- Date: Sun, 20 Mar 2016 23:58:54 +0000 (UTC)
commit 5a7441de7fd32e02b02c08adb861fd6aa60a87a9
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Wed Feb 17 00:51:57 2016 +0100
timeline: Get rid of unused _projectmanager field
Differential Revision: https://phabricator.freedesktop.org/D783
pitivi/timeline/timeline.py | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 5c869f8..98c3816 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -1135,17 +1135,14 @@ class Timeline(Gtk.EventBox, Zoomable, Loggable):
class TimelineContainer(Gtk.Grid, Zoomable, Loggable):
+ """Container for zoom box, ruler, timeline, scrollbars and toolbar."""
- """
- Container for zoom box, ruler, timeline, scrollbars and toolbar.
- """
-
- def __init__(self, instance):
+ def __init__(self, app):
Zoomable.__init__(self)
Gtk.Grid.__init__(self)
Loggable.__init__(self)
- self.app = instance
+ self.app = app
self._settings = self.app.settings
self._autoripple_active = self._settings.timelineAutoRipple
self._shiftMask = False
@@ -1155,7 +1152,6 @@ class TimelineContainer(Gtk.Grid, Zoomable, Loggable):
# it should be kept that way if it makes sense.
self.zoomed_fitted = True
- self._projectmanager = None
self._project = None
self.ges_timeline = None
self.__copiedGroup = None
@@ -1165,7 +1161,11 @@ class TimelineContainer(Gtk.Grid, Zoomable, Loggable):
self._settings.connect("edgeSnapDeadbandChanged",
self._snapDistanceChangedCb)
- self.setProjectManager(self.app.project_manager)
+
+ self.app.project_manager.connect("new-project-created",
+ self._projectCreatedCb)
+ self.app.project_manager.connect("new-project-loaded",
+ self._projectLoadedCb)
# Public API
@@ -1266,18 +1266,6 @@ class TimelineContainer(Gtk.Grid, Zoomable, Loggable):
layer.remove_clip(clip)
self._project.pipeline.commit_timeline()
- def setProjectManager(self, projectmanager):
- if self._projectmanager is not None:
- self._projectmanager.disconnect_by_func(self._projectLoadedCb)
-
- self._projectmanager = projectmanager
-
- if projectmanager is not None:
- projectmanager.connect(
- "new-project-created", self._projectCreatedCb)
- projectmanager.connect(
- "new-project-loaded", self._projectLoadedCb)
-
def zoomFit(self):
self.app.write_action("zoom-fit", {"optional-action-type": True})
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]