Share Model merge; Merge initializers; undo/redo descs (#65)
- use "shared" pointer between Model and undo/redo instances - adds missing initializers to Merge and Text classes - adds checkpoints for mouse resize, barcode, and image reset. - renames the position dialog checkpoint from Move -> Position to differentiate it from a mouse move. - adds the Undo/Redo action descriptions to the menu items. - adds unit tests for the Merge and Model change, and for ColorNode, RawText and TextNode.
This commit is contained in:
@@ -631,7 +631,7 @@ namespace glabels
|
||||
{
|
||||
mBlocked = true;
|
||||
|
||||
mUndoRedoModel->checkpoint( tr("Move") );
|
||||
mUndoRedoModel->checkpoint( tr("Position") );
|
||||
|
||||
model::Distance x = model::Distance(posXSpin->value(), mUnits);
|
||||
model::Distance y = model::Distance(posYSpin->value(), mUnits);
|
||||
@@ -744,6 +744,8 @@ namespace glabels
|
||||
{
|
||||
mBlocked = true;
|
||||
|
||||
mUndoRedoModel->checkpoint( tr("Barcode") );
|
||||
|
||||
barcode::Style bcStyle = barcodeStyleButton->bcStyle();
|
||||
|
||||
barcodeShowTextCheck->setEnabled( bcStyle.textOptional() );
|
||||
@@ -778,6 +780,8 @@ namespace glabels
|
||||
|
||||
void ObjectEditor::onResetImageSize()
|
||||
{
|
||||
mUndoRedoModel->checkpoint( tr("Reset") );
|
||||
|
||||
mObject->setSize( mObject->naturalSize() );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user