Changes of name class

UndoRedoMgr -> UndoManager UndoRedoGlyph -> UndoableGlyph So filenames are changed too undoredomgr.py -> undoManager.py undoredoglyph.py -> undoableGlyph.py
trufont · BlackFoundry · Oct 3, 2018 · Oct 3, 2018 · Oct 3, 2018 · Oct 5, 2018
commit 31449536bd317676c635d75c342d58e4a0ff5fb8
diff --git a/src/trufont/controls/propertiesView.py b/src/trufont/controls/propertiesView.py
@@ -14,10 14,10 @@
 from wx import GetTranslation as tr
 
 import logging
-from trufont.objects.undoredoglyph import UndoRedoGlyph
 from trufont.objects.undoableGlyph import UndoableGlyph
 from typing import Any, Collection, Tuple, List, Dict, Callable
 
-import trufont.objects.undoredomgr as undoredomgr
 import trufont.objects.undoManager as undomanager
 import trufont.util.func_copy as func_copy
 
 from tfont.converters.tfontConverter import TFontConverter
@@ -49,13 49,13 @@
 #-------------------------
 # Used by undoredo decorator
 #-------------------------
-def align_expand_params(layer: Layer, glyph: UndoRedoGlyph, operation: str):
 def align_expand_params(layer: Layer, glyph: UndoableGlyph, operation: str):
  """Used with align functions - Nothing to """
  return layer 
 
-@undoredomgr.layer_decorate_undoredo(align_expand_params, operation="Align Horiz Left", 
-  paths=True, guidelines=False, components=False, anchors=False)
-def _alignHLeft(layer: Layer, tglyph: UndoRedoGlyph, operation: str):
 @undomanager.layer_decorate_undo(align_expand_params, operation="Align Horiz Left", 
  paths=True, guidelines=False, components=False, anchors=False)
 def _alignHLeft(layer: Layer, tglyph: UndoableGlyph, operation: str):
  selectedPaths = []
  xMin_all = None
  for path in layer._paths:
@@ -74,9 74,9 @@ def _alignHLeft(layer: Layer, tglyph: UndoRedoGlyph, operation: str):
  delta = xMin_all - xMin
  path.transform(Transformation(xOffset=delta))
 
-@undoredomgr.layer_decorate_undoredo(align_expand_params, operation="Align Horiz Center", 
-  paths=True, guidelines=False, components=False, anchors=False)
-def _alignHCenter(layer: Layer, tglyph: UndoRedoGlyph, operation: str):
 @undomanager.layer_decorate_undo(align_expand_params, operation="Align Horiz Center", 
  paths=True, guidelines=False, components=False, anchors=False)
 def _alignHCenter(layer: Layer, tglyph: UndoableGlyph, operation: str):
  selectedPaths = []
  xMin_all, xMax_all = None, None
  for path in layer._paths:
@@ -100,9 100,9 @@ def _alignHCenter(layer: Layer, tglyph: UndoRedoGlyph, operation: str):
  path.transform(Transformation(xOffset=delta))
 
 
-@undoredomgr.layer_decorate_undoredo(align_expand_params, operation="Align Horiz Right", 
-  paths=True, guidelines=False, components=False, anchors=False)
-def _alignHRight(layer: Layer, tglyph: UndoRedoGlyph, operation: str):
 @undomanager.layer_decorate_undo(align_expand_params, operation="Align Horiz Right", 
  paths=True, guidelines=False, components=False, anchors=False)
 def _alignHRight(layer: Layer, tglyph: UndoableGlyph, operation: str):
  selectedPaths = []
  xMax_all = None
  for path in layer._paths:
@@ -122,9 122,9 @@ def _alignHRight(layer: Layer, tglyph: UndoRedoGlyph, operation: str):
  path.transform(Transformation(xOffset=delta))
 
 
-@undoredomgr.layer_decorate_undoredo(align_expand_params, operation="Align Vert Top", 
-  paths=True, guidelines=False, components=False, anchors=False)
-def _alignVTop(layer: Layer, tglyph: UndoRedoGlyph, operation: str):
 @undomanager.layer_decorate_undo(align_expand_params, operation="Align Vert Top", 
  paths=True, guidelines=False, components=False, anchors=False)
 def _alignVTop(layer: Layer, tglyph: UndoableGlyph, operation: str):
  selectedPaths = []
  yMax_all = None
  for path in layer._paths:
@@ -143,9 143,9 @@ def _alignVTop(layer: Layer, tglyph: UndoRedoGlyph, operation: str):
  delta = yMax_all - yMax
  path.transform(Transformation(yOffset=delta))
 
-@undoredomgr.layer_decorate_undoredo(align_expand_params, operation="Align Vert Center", 
-  paths=True, guidelines=False, components=False, anchors=False)
-def _alignVCenter(layer: Layer, tglyph: UndoRedoGlyph, operation: str):
 @undomanager.layer_decorate_undo(align_expand_params, operation="Align Vert Center", 
  paths=True, guidelines=False, components=False, anchors=False)
 def _alignVCenter(layer: Layer, tglyph: UndoableGlyph, operation: str):
  selectedPaths = []
  yMin_all, yMax_all = None, None
  for path in layer._paths:
@@ -169,9 169,9 @@ def _alignVCenter(layer: Layer, tglyph: UndoRedoGlyph, operation: str):
  path.transform(Transformation(yOffset=delta))
 
 
-@undoredomgr.layer_decorate_undoredo(align_expand_params, operation="Align Vert Bottom", 
-  paths=True, guidelines=False, components=False, anchors=False)
-def _alignVBottom(layer: Layer, tglyph: UndoRedoGlyph, operation: str):
 @undomanager.layer_decorate_undo(align_expand_params, operation="Align Vert Bottom", 
  paths=True, guidelines=False, components=False, anchors=False)
 def _alignVBottom(layer: Layer, tglyph: UndoableGlyph, operation: str):
  selectedPaths = []
  yMin_all = None
  for path in layer._paths:
@@ -553,7 553,7 @@ def _DrawText_Spacing(ctx, text, x, y, sp=1.2):
 #-------------------------
 def header_expand_params(obj, *args, **kwargs):
  """ use by decorator to get three params as
- layer, undoredomgr and operation """
  layer, undomanager and operation """
  return obj.layer, obj._tooltips[obj._underMouseBtn]
 #-------------------------
 
@@ -604,8 604,8 @@ def __init__(self, parent, font):
  def layer(self):
  return wx.GetTopLevelParent(self).activeLayer
 
- @undoredomgr.layer_decorate_undoredo(header_expand_params, 
-  paths=True, guidelines=False, components=False, anchors=False)
  @undomanager.layer_decorate_undo(header_expand_params, 
  paths=True, guidelines=False, components=False, anchors=False)
  def binaryPathOp(self, func):
  layer = self.layer
  paths = layer._paths
@@ -630,8 630,8 @@ def binaryPathOp(self, func):
  paths.extend(open_)
  trufont.TruFont.updateUI()
 
- @undoredomgr.layer_decorate_undoredo(header_expand_params, 
-  paths=True, guidelines=False, components=False, anchors=False)
  @undomanager.layer_decorate_undo(header_expand_params, 
  paths=True, guidelines=False, components=False, anchors=False)
  def removeOverlap(self):
  layer = self.layer
  paths = layer._paths
@@ -650,8 650,8 @@ def removeOverlap(self):
  paths.extend(others)
  trufont.TruFont.updateUI()
 
- @undoredomgr.layer_decorate_undoredo(header_expand_params, 
-  paths=True, guidelines=False, components=False, anchors=False)
  @undomanager.layer_decorate_undo(header_expand_params, 
  paths=True, guidelines=False, components=False, anchors=False)
  def transform(self, **kwargs):
  layer = self.layer
  transformation = Transformation(**kwargs)
@@ -1240,7 1240,7 @@ def OnPaint(self, event):
 #-------------------------
 def glyph_expand_params(obj, *args, **kwargs):
  """ use by decorator to get three params as
- layer, undoredomgr and operation """
  layer, undomanager and operation """
  return obj._layersView._activeLayer._parent
 
 #-------------------------
@@ -1268,7 1268,7 @@ def OnActiveLayerChanged(self, event):
  # wx methods
  # ----------
 
- @undoredomgr.glyph_decorate_undoredo(glyph_expand_params, operation="Add layer", layer=True)
  @undomanager.undoableglyph_decorate_undo(glyph_expand_params, operation="Add layer", layer=True)
  def DoCreateLayer(self):
  # this logic should probably be in the model
  view = self._layersView

diff --git a/src/trufont/drawingTools/baseTool.py b/src/trufont/drawingTools/baseTool.py
@@ -3,7 3,7 @@
 from trufont.util.drawing import CreatePath
 from trufont.util.canvasDelete import deleteUILayerSelection
 from trufont.util.canvasMove import moveFromKeysUILayerSelection
-from trufont.objects.undoredomgr import Action
 from trufont.objects.undoManager import Action
 from tfont.objects import Point
 import wx
 from wx import GetTranslation as tr
@@ -110,12 110,13 @@ def prepareUndo(self, group_name: str="unknown"):
  Also layer.endUndoGroup() will be called once, and only if prepareUndo()
  was called."""
  if not self.preparedUndo and self.layer:
- self.layer.beginUndoGroup(group_name)
  self.layer.beginUndo(group_name)
  self.preparedUndo = True
 
  def performUndo(self, operation:str, group_name: str="unknown"):
  if self.preparedUndo and self.layer:
- self.layer._parent.get_undoredo().append_action(Action(operation, *self.layer.endUndoGroup(group_name)))
  action = Action(operation, *self.layer.endUndo(group_name))
  self.layer._parent.get_undomanager().append_action(action)
  self.preparedUndo = False
 
  # we oughta eat the modifiers down/up events in baseTool to stop the

diff --git a/src/trufont/drawingTools/knifeTool.py b/src/trufont/drawingTools/knifeTool.py
@@ -4,7 4,7 @@
 import wx
 from wx import GetTranslation as tr
 
-import trufont.objects.undoredomgr as undoredomgr
 import trufont.objects.undoManager as undomanager
 
 _path = CreatePath()
 _path.MoveToPoint(1.0, 0.975)
@@ -77,9 77,9 @@ def OnMotion(self, event):
  else:
  super().OnMotion(event)
 
- @undoredomgr.layer_decorate_undoredo((lambda *args, **kwargs: args[0].layer), 
-  operation="Knife cut selection",
-  paths=True, guidelines=False, components=False, anchors=False)
  @undomanager.layer_decorate_undo((lambda *args, **kwargs: args[0].layer), 
  operation="Knife cut selection",
  paths=True, guidelines=False, components=False, anchors=False)
  def OnMouseUpLeftUp(self, event):
  """ make thios method to be sure that the super().OnMouseUp() call do not 
  bloc process of wx msgs """