[pitivi] Use @property to define properties
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Use @property to define properties
- Date: Thu, 17 Dec 2015 10:01:26 +0000 (UTC)
commit fd4d730346c240d64e059979d177dc0a1080275f
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Thu Oct 29 23:28:02 2015 +0100
Use @property to define properties
Reviewed-by: Thibault Saunier <tsaunier gnome org>
Differential Revision: https://phabricator.freedesktop.org/D536
pitivi/clipproperties.py | 40 ++++++++++++++++++----------------------
pitivi/mainwindow.py | 2 +-
pitivi/undo/timeline.py | 12 ++++++------
pitivi/utils/timeline.py | 8 ++++----
4 files changed, 29 insertions(+), 33 deletions(-)
---
diff --git a/pitivi/clipproperties.py b/pitivi/clipproperties.py
index cb00ae6..94ac235 100644
--- a/pitivi/clipproperties.py
+++ b/pitivi/clipproperties.py
@@ -88,18 +88,17 @@ class ClipProperties(Gtk.Box, Loggable):
viewport.add(self.effect_expander)
self.pack_start(viewport, True, True, 0)
- def _setProject(self, project):
- self._project = project
- if project:
- self.effect_expander._connectTimelineSelection(
- self.app.gui.timeline_ui.timeline)
- if self.transformation_expander:
- self.transformation_expander.timeline = self.app.gui.timeline_ui.timeline
-
- def _getProject(self):
+ @property
+ def project(self):
return self._project
- project = property(_getProject, _setProject)
+ @project.setter
+ def project(self, project):
+ self._project = project
+ if project:
+ timeline = self.app.gui.timeline_ui.timeline
+ self.effect_expander.timeline = timeline
+ self.transformation_expander.timeline = timeline
def createInfoBar(self, text):
label = Gtk.Label(label=text)
@@ -250,10 +249,12 @@ class EffectProperties(Gtk.Expander, Loggable):
self._config_ui_h_pos = self._vcontent.get_position()
self.settings.effectVPanedPosition = self._config_ui_h_pos
- def _getTimeline(self):
+ @property
+ def timeline(self):
return self._timeline
- def _setTimeline(self, timeline):
+ @timeline.setter
+ def timeline(self, timeline):
if self.connected:
self._timeline.selection.disconnect_by_func(
self._selectionChangedCb)
@@ -263,8 +264,6 @@ class EffectProperties(Gtk.Expander, Loggable):
"selection-changed", self._selectionChangedCb)
self.connected = bool(timeline)
- timeline = property(_getTimeline, _setTimeline)
-
def _selectionChangedCb(self, selection,):
for clip in self.clips:
clip.disconnect_by_func(self._trackElementAddedCb)
@@ -295,9 +294,6 @@ class EffectProperties(Gtk.Expander, Loggable):
self.selected_effects = selec
self.updateAll()
- def _connectTimelineSelection(self, timeline):
- self.timeline = timeline
-
def _removeEffectCb(self, toolbutton):
if not self.selection.get_selected()[1]:
# Cannot remove nothing,
@@ -664,15 +660,15 @@ class TransformationProperties(Gtk.Expander, Loggable):
self.__setSource()
self.hide()
- def _getTimeline(self):
+ @property
+ def timeline(self):
return self._timeline
- def _setTimeline(self, timeline):
+ @timeline.setter
+ def timeline(self, timeline):
if self.timeline:
self.timeline.selection.disconnect_by_func(self._selectionChangedCb)
self._timeline = timeline
if timeline:
- self._timeline.selection.connect(
+ timeline.selection.connect(
'selection-changed', self._selectionChangedCb)
-
- timeline = property(_getTimeline, _setTimeline)
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index d1c7621..6989b1a 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -1097,7 +1097,7 @@ class PitiviMainWindow(Gtk.ApplicationWindow, Loggable):
"rendering-settings-changed", self._renderingSettingsChangedCb)
self.viewer.setPipeline(project.pipeline)
- self.app.timeline_log_observer.setPipeline(project.pipeline)
+ self.app.timeline_log_observer.pipeline = project.pipeline
self._renderingSettingsChangedCb(project)
self.clipconfig.project = project
# FIXME GES port undo/redo
diff --git a/pitivi/undo/timeline.py b/pitivi/undo/timeline.py
index 1799120..c4fbacd 100644
--- a/pitivi/undo/timeline.py
+++ b/pitivi/undo/timeline.py
@@ -513,14 +513,14 @@ class TimelineLogObserver(Loggable):
self._pipeline = None
Loggable.__init__(self)
- def setPipeline(self, pipeline):
- self._pipeline = pipeline
- self.children_props_tracker.pipeline = pipeline
-
- def getPipeline(self):
+ @property
+ def pipeline(self):
return self._pipeline
- pipeline = property(getPipeline, setPipeline)
+ @pipeline.setter
+ def pipeline(self, pipeline):
+ self._pipeline = pipeline
+ self.children_props_tracker.pipeline = pipeline
def startObserving(self, timeline):
self._connectToTimeline(timeline)
diff --git a/pitivi/utils/timeline.py b/pitivi/utils/timeline.py
index 1909346..62c839a 100644
--- a/pitivi/utils/timeline.py
+++ b/pitivi/utils/timeline.py
@@ -72,15 +72,15 @@ class Selected(GObject.Object):
"""
return self._selected
- def getSelected(self):
+ @property
+ def selected(self):
return self._selected
- def setSelected(self, selected):
+ @selected.setter
+ def selected(self, selected):
self._selected = selected
self.emit("selected-changed", selected)
- selected = property(getSelected, setSelected)
-
class Selection(GObject.Object, Loggable):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]