Skip to content

Commit 4c889ae

Browse files
Renamde clearAllFrames properties
Signed-off-by: Éloïse Brosseau <[email protected]>
1 parent 9262841 commit 4c889ae

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

src/plugins/rv-packages/annotate/annotate_mode.mu

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -407,12 +407,12 @@ class: AnnotateMinorMode : MinorMode
407407
"%s.frame:%d.redo_%s_%d" % (node, frame, encodedName(_user), _processId);
408408
}
409409

410-
method: undoClearAllFramesActionName (string;)
410+
method: undoClearAllFramesName (string;)
411411
{
412412
"%s.paint.undoClearAllFrames_%s_%d" % (viewNode(), encodedName(_user), _processId);
413413
}
414414

415-
method: redoClearAllFramesActionName (string;)
415+
method: redoClearAllFramesName (string;)
416416
{
417417
"%s.paint.redoClearAllFrames_%s_%d" % (viewNode(), encodedName(_user), _processId);
418418
}
@@ -1469,8 +1469,8 @@ class: AnnotateMinorMode : MinorMode
14691469
let undoProperty = frameUserUndoStackName(_currentNode, frame);
14701470
let redoProperty = frameUserRedoStackName(_currentNode, frame);
14711471
let orderProperty = frameOrderName(_currentNode, frame);
1472-
let clearAllUndoProperty = undoClearAllFramesActionName();
1473-
let clearAllRedoProperty = redoClearAllFramesActionName();
1472+
let clearAllUndoProperty = undoClearAllFramesName();
1473+
let clearAllRedoProperty = redoClearAllFramesName();
14741474
let playing = isPlaying();
14751475

14761476
let hasUndoClearAll = propertyExists(clearAllUndoProperty) &&
@@ -1514,8 +1514,8 @@ class: AnnotateMinorMode : MinorMode
15141514

15151515
method: undoPaint (void;)
15161516
{
1517-
let clearAllUndoProperty = undoClearAllFramesActionName();
1518-
let clearAllRedoProperty = redoClearAllFramesActionName();
1517+
let clearAllUndoProperty = undoClearAllFramesName();
1518+
let clearAllRedoProperty = redoClearAllFramesName();
15191519

15201520
if (propertyExists(clearAllUndoProperty) && propertyInfo(clearAllUndoProperty).size > 0)
15211521
{
@@ -1550,7 +1550,7 @@ class: AnnotateMinorMode : MinorMode
15501550
}
15511551
setStringProperty(clearAllRedoProperty, clearAllUndo, true);
15521552

1553-
deleteProperty(clearAllUndoProperty);
1553+
setStringProperty(clearAllUndoProperty, string[] {}, true);
15541554

15551555
endCompoundStateChange();
15561556
return;
@@ -1640,12 +1640,12 @@ class: AnnotateMinorMode : MinorMode
16401640

16411641
method: redoPaint (void;)
16421642
{
1643-
let clearAllUndoName = undoClearAllFramesActionName();
1644-
let clearAllRedoName = redoClearAllFramesActionName();
1643+
let clearAllUndoProperty = undoClearAllFramesName();
1644+
let clearAllRedoProperty = redoClearAllFramesName();
16451645

1646-
if (propertyExists(clearAllRedoName) && propertyInfo(clearAllRedoName).size > 0)
1646+
if (propertyExists(clearAllRedoProperty) && propertyInfo(clearAllRedoProperty).size > 0)
16471647
{
1648-
let clearAllRedo = getStringProperty(clearAllRedoName);
1648+
let clearAllRedo = getStringProperty(clearAllRedoProperty);
16491649

16501650
// clearAllRedo format: ["clearAllFrames", "node1", "stroke1", "node2", "stroke2"]
16511651
if (clearAllRedo.size() > 1 && clearAllRedo[0] == "clearAllFrames")
@@ -1676,13 +1676,13 @@ class: AnnotateMinorMode : MinorMode
16761676
}
16771677
}
16781678

1679-
if (!propertyExists(clearAllUndoName))
1679+
if (!propertyExists(clearAllUndoProperty))
16801680
{
1681-
newProperty(clearAllUndoName, StringType, 1);
1681+
newProperty(clearAllUndoProperty, StringType, 1);
16821682
}
1683-
setStringProperty(clearAllUndoName, clearAllRedo, true);
1683+
setStringProperty(clearAllUndoProperty, clearAllRedo, true);
16841684

1685-
deleteProperty(clearAllRedoName);
1685+
setStringProperty(clearAllRedoProperty, string[] {}, true);
16861686

16871687
endCompoundStateChange();
16881688
return;
@@ -1886,19 +1886,19 @@ class: AnnotateMinorMode : MinorMode
18861886

18871887
if (clearAllActions.size() > 1)
18881888
{
1889-
let clearAllUndoName = undoClearAllFramesActionName();
1890-
let clearAllRedoName = redoClearAllFramesActionName();
1889+
let clearAllUndoProperty = undoClearAllFramesName();
1890+
let clearAllRedoProperty = redoClearAllFramesName();
18911891

1892-
if (!propertyExists(clearAllUndoName))
1892+
if (!propertyExists(clearAllUndoProperty))
18931893
{
1894-
newProperty(clearAllUndoName, StringType, 1);
1894+
newProperty(clearAllUndoProperty, StringType, 1);
18951895
}
18961896

1897-
setStringProperty(clearAllUndoName, clearAllActions, true);
1897+
setStringProperty(clearAllUndoProperty, clearAllActions, true);
18981898

1899-
if (propertyExists(clearAllRedoName))
1899+
if (propertyExists(clearAllRedoProperty))
19001900
{
1901-
deleteProperty(clearAllRedoName);
1901+
setStringProperty(clearAllRedoProperty, string[] {}, true);
19021902
}
19031903
}
19041904

@@ -2116,7 +2116,7 @@ class: AnnotateMinorMode : MinorMode
21162116
return DisabledMenuState;
21172117
}
21182118

2119-
let clearAllUndoProperty = undoClearAllFramesActionName();
2119+
let clearAllUndoProperty = undoClearAllFramesName();
21202120
if (propertyExists(clearAllUndoProperty) && propertyInfo(clearAllUndoProperty).size > 0)
21212121
{
21222122
return UncheckedMenuState;
@@ -2132,8 +2132,8 @@ class: AnnotateMinorMode : MinorMode
21322132
return DisabledMenuState;
21332133
}
21342134

2135-
let clearAllRedoProprety = redoClearAllFramesActionName();
2136-
if (propertyExists(clearAllRedoProprety) && propertyInfo(clearAllRedoProprety).size > 0)
2135+
let clearAllRedoProperty = redoClearAllFramesName();
2136+
if (propertyExists(clearAllRedoProperty) && propertyInfo(clearAllRedoProperty).size > 0)
21372137
{
21382138
return UncheckedMenuState;
21392139
}

0 commit comments

Comments
 (0)