diff options
| author | Lasse Fister | 2015-10-06 04:54:00 +0200 |
|---|---|---|
| committer | Adrien Tétar | 2015-10-08 17:46:16 +0200 |
| commit | 837fa4549c457786a33150082a7528afd3484eaf (patch) | |
| tree | dbf5e8c3c657681d099147dd15de1b1325196c36 /Lib/defconQt/glyphView.py | |
| parent | 11b7f3d41fbd3140b694643587479e8927b4c019 (diff) | |
| download | trufont-837fa4549c457786a33150082a7528afd3484eaf.tar.bz2 | |
first set of fixes to upgrade to ufo_v3
Diffstat (limited to 'Lib/defconQt/glyphView.py')
| -rw-r--r-- | Lib/defconQt/glyphView.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/defconQt/glyphView.py b/Lib/defconQt/glyphView.py index 7b151fa..32e1fe5 100644 --- a/Lib/defconQt/glyphView.py +++ b/Lib/defconQt/glyphView.py @@ -809,17 +809,17 @@ class GlyphScene(QGraphicsScene): elif event.matches(QKeySequence.Undo): if len(self._dataForUndo) > 0: undo = self._dataForUndo.pop() - redo = self._glyphObject.serializeForUndo() - self._glyphObject.deserializeFromUndo(undo) + redo = self._glyphObject.serialize() + self._glyphObject.deserialize(undo) self._dataForRedo.append(redo) event.accept() return elif event.matches(QKeySequence.Redo): if len(self._dataForRedo) > 0: - undo = self._glyphObject.serializeForUndo() + undo = self._glyphObject.serialize() redo = self._dataForRedo.pop() self._dataForUndo.append(undo) - self._glyphObject.deserializeFromUndo(redo) + self._glyphObject.deserialize(redo) event.accept() return elif event.matches(QKeySequence.SelectAll): @@ -843,7 +843,7 @@ class GlyphScene(QGraphicsScene): # TODO: somehow try to do this in the pen # pass the glyph to a controller object that holds a self._pen copyGlyph.width = self._glyphObject.width - mimeData.setData("application/x-defconQt-glyph-data", pickle.dumps([copyGlyph.serializeForUndo(False)])) + mimeData.setData("application/x-defconQt-glyph-data", pickle.dumps([copyGlyph.serialize()])) clipboard.setMimeData(mimeData) event.accept() return @@ -855,7 +855,7 @@ class GlyphScene(QGraphicsScene): if len(data) == 1: pen = self._glyphObject.getPointPen() pasteGlyph = TGlyph() - pasteGlyph.deserializeFromUndo(data[0]) + pasteGlyph.deserialize(data[0]) pasteGlyph.drawPoints(pen) event.accept() return @@ -894,7 +894,7 @@ class GlyphScene(QGraphicsScene): self.rulerMousePress(event) return else: - data = self._glyphObject.serializeForUndo() + data = self._glyphObject.serialize() self._dataForUndo.append(data) self._dataForRedo = [] if view._currentTool == SceneTools.KnifeTool: |