[pitivi] undo: Remove unused done/undone signals
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] undo: Remove unused done/undone signals
- Date: Mon, 23 May 2016 08:38:33 +0000 (UTC)
commit 194d3f3095510a667576091b9242c1b9f9490a63
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Wed May 4 23:01:59 2016 +0200
undo: Remove unused done/undone signals
Differential Revision: https://phabricator.freedesktop.org/D990
pitivi/undo/timeline.py | 20 -------------
pitivi/undo/undo.py | 14 ---------
tests/test_undo.py | 69 +---------------------------------------------
3 files changed, 2 insertions(+), 101 deletions(-)
---
diff --git a/pitivi/undo/timeline.py b/pitivi/undo/timeline.py
index 3f5b7d6..077dbb7 100644
--- a/pitivi/undo/timeline.py
+++ b/pitivi/undo/timeline.py
@@ -53,12 +53,10 @@ class TrackElementPropertyChanged(UndoableAction):
def do(self):
self.track_element.set_child_property(
self.property_name, self.new_value)
- self._done()
def undo(self):
self.track_element.set_child_property(
self.property_name, self.old_value)
- self._undone()
def asScenarioAction(self):
st = Gst.Structure.new_empty("set-child-property")
@@ -157,7 +155,6 @@ class TrackElementAdded(UndoableAction):
for prop_name, prop_value in self.track_element_props:
self.track_element.set_child_property(prop_name, prop_value)
self._props_changed = []
- self._done()
def undo(self):
props = self.track_element.list_children_properties()
@@ -170,7 +167,6 @@ class TrackElementAdded(UndoableAction):
self.track_element)
del self.track_element
self.track_element = None
- self._undone()
def asScenarioAction(self):
st = Gst.Structure.new_empty("container-add-child")
@@ -207,14 +203,12 @@ class TrackElementRemoved(UndoableAction):
self.track_element)
del self.track_element
self.track_element = None
- self._done()
def undo(self):
self.track_element = self.clip.add_asset(self.asset)
for prop_name, prop_value in self.track_element_props:
self.track_element.set_child_property(prop_name, prop_value)
self._props_changed = []
- self._undone()
def asScenarioAction(self):
st = Gst.Structure.new_empty("container-remove-child")
@@ -305,12 +299,10 @@ class ClipPropertyChanged(UndoableAction):
def do(self):
self.clip.set_property(
self.property_name.replace("-", "_"), self.new_value)
- self._done()
def undo(self):
self.clip.set_property(
self.property_name.replace("-", "_"), self.old_value)
- self._undone()
class ClipAdded(UndoableAction):
@@ -324,12 +316,10 @@ class ClipAdded(UndoableAction):
self.clip.set_name(None)
self.layer.add_clip(self.clip)
self.layer.get_timeline().get_asset().pipeline.commit_timeline()
- self._done()
def undo(self):
self.layer.remove_clip(self.clip)
self.layer.get_timeline().get_asset().pipeline.commit_timeline()
- self._undone()
def asScenarioAction(self):
timeline = self.layer.get_timeline()
@@ -360,13 +350,11 @@ class ClipRemoved(UndoableAction):
def do(self):
self.layer.remove_clip(self.clip)
self.layer.get_timeline().get_asset().pipeline.commit_timeline()
- self._done()
def undo(self):
self.clip.set_name(None)
self.layer.add_clip(self.clip)
self.layer.get_timeline().get_asset().pipeline.commit_timeline()
- self._undone()
def asScenarioAction(self):
timeline = self.layer.get_timeline()
@@ -454,11 +442,9 @@ class ControlSourceValueAdded(UndoableAction):
def do(self):
self.control_source.set(self.keyframe.timestamp,
self.keyframe.value)
- self._done()
def undo(self):
self.control_source.unset(self.keyframe.timestamp)
- self._undone()
def asScenarioAction(self):
st = Gst.Structure.new_empty("add-keyframe")
@@ -481,12 +467,10 @@ class ControlSourceValueRemoved(UndoableAction):
def do(self):
self.control_source.unset(self.keyframe.timestamp)
- self._undone()
def undo(self):
self.control_source.set(self.keyframe.timestamp,
self.keyframe.value)
- self._done()
def asScenarioAction(self):
st = Gst.Structure.new_empty("remove-keyframe")
@@ -507,11 +491,9 @@ class ControlSourceKeyframeChanged(UndoableAction):
def do(self):
self._applySnapshot(self.new_snapshot)
- self._done()
def undo(self):
self._applySnapshot(self.old_snapshot)
- self._undone()
def _applySnapshot(self, snapshot):
time, value = snapshot
@@ -528,12 +510,10 @@ class ActivePropertyChanged(UndoableAction):
def do(self):
self.effect_action.track_element.active = self.active
self.active = not self.active
- self._done()
def undo(self):
self.effect_action.track_element.active = self.active
self.active = not self.active
- self._undone()
class TimelineObserver(Loggable):
diff --git a/pitivi/undo/undo.py b/pitivi/undo/undo.py
index a310a95..8e97f37 100644
--- a/pitivi/undo/undo.py
+++ b/pitivi/undo/undo.py
@@ -22,7 +22,6 @@
Base classes for undo/redo.
"""
import contextlib
-import weakref
from gi.repository import GObject
@@ -50,11 +49,6 @@ class UndoableAction(GObject.Object, Loggable):
to allow reverting the change if needed later on.
"""
- __gsignals__ = {
- "done": (GObject.SIGNAL_RUN_LAST, None, ()),
- "undone": (GObject.SIGNAL_RUN_LAST, None, ()),
- }
-
def __init__(self):
GObject.Object.__init__(self)
Loggable.__init__(self)
@@ -68,12 +62,6 @@ class UndoableAction(GObject.Object, Loggable):
def asScenarioAction(self):
raise NotImplementedError()
- def _done(self):
- self.emit("done")
-
- def _undone(self):
- self.emit("undone")
-
class FinalizingAction:
"""
@@ -110,7 +98,6 @@ class UndoableActionStack(UndoableAction):
def do(self):
self._runAction(self.undone_actions, "do")
self.done_actions = self.undone_actions[::-1]
- self.emit("done")
if self.finalizing_action:
self.finalizing_action.do()
@@ -118,7 +105,6 @@ class UndoableActionStack(UndoableAction):
def undo(self):
self._runAction(self.done_actions, "undo")
self.undone_actions = self.done_actions[::-1]
- self.emit("undone")
if self.finalizing_action:
self.finalizing_action.do()
diff --git a/tests/test_undo.py b/tests/test_undo.py
index 19ce2d9..de2113d 100644
--- a/tests/test_undo.py
+++ b/tests/test_undo.py
@@ -35,80 +35,28 @@ class DummyUndoableAction(UndoableAction):
def do(self):
self.done_ = True
- self._done()
def undo(self):
self.done_ = False
- self._undone()
-
-
-class TestUndoableAction(TestCase):
-
- def testSimpleSignals(self):
- """
- Test signal emission from _done() and _undone().
- """
- state = {"done": False}
-
- def doneCb(action, val):
- state["done"] = val
-
- action = DummyUndoableAction()
- action.connect("done", doneCb, True)
- action.connect("undone", doneCb, False)
-
- action.undo()
- self.assertFalse(state["done"])
-
- action.do()
- self.assertTrue(state["done"])
class TestUndoableActionStack(TestCase):
- def testDoUndoEmpty(self):
- """
- Undo an empty stack.
- """
- state = {"done": True}
-
- def doneCb(action, value):
- state["done"] = value
-
- stack = UndoableActionStack("meh")
- stack.connect("done", doneCb, True)
- stack.connect("undone", doneCb, False)
-
- stack.undo()
- self.assertFalse(state["done"])
-
- stack.do()
- self.assertTrue(state["done"])
-
def testUndoDo(self):
"""
Test an undo() do() sequence.
"""
- state = {"done": True, "actions": 2}
-
- def doneCb(action, value):
- state["done"] = value
-
- state["done"] = 2
+ state = {"actions": 2}
class Action(UndoableAction):
def do(self):
state["actions"] += 1
- self._done()
def undo(self):
state["actions"] -= 1
- self._undone()
stack = UndoableActionStack("meh")
- stack.connect("done", doneCb, True)
- stack.connect("undone", doneCb, False)
action1 = Action()
action2 = Action()
stack.push(action1)
@@ -116,22 +64,15 @@ class TestUndoableActionStack(TestCase):
stack.undo()
self.assertEqual(state["actions"], 0)
- self.assertFalse(state["done"])
stack.do()
self.assertEqual(state["actions"], 2)
- self.assertTrue(state["done"])
def testUndoError(self):
"""
Undo a stack containing a failing action.
"""
- state = {"done": True}
-
- def doneCb(action, value):
- state["done"] = value
-
- state["actions"] = 2
+ state = {"actions": 2}
class Action(UndoableAction):
@@ -140,13 +81,10 @@ class TestUndoableActionStack(TestCase):
if state["actions"] == 1:
self.__class__.undo = self.__class__.undo_fail
- self._undone()
-
def undo_fail(self):
raise UndoError("meh")
stack = UndoableActionStack("meh")
- stack.connect("done", doneCb)
action1 = Action()
action2 = Action()
stack.push(action1)
@@ -154,7 +92,6 @@ class TestUndoableActionStack(TestCase):
self.assertRaises(UndoError, stack.undo)
self.assertEqual(state["actions"], 1)
- self.assertTrue(state["done"])
class TestUndoableActionLog(TestCase):
@@ -411,11 +348,9 @@ class TestUndoableActionLog(TestCase):
def do(self):
call_sequence.append("do%s" % self.n)
- self._done()
def undo(self):
call_sequence.append("undo%s" % self.n)
- self._undone()
action1 = Action(1)
action2 = Action(2)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]