diff -r 92682e6369e9 -r a9e67f6e610e gui_editactions.cpp --- a/gui_editactions.cpp Wed Apr 10 13:24:35 2013 +0300 +++ b/gui_editactions.cpp Wed Apr 10 14:10:58 2013 +0300 @@ -54,10 +54,14 @@ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ============================================================================= ACTION (cut, "Cut", "cut", "Cut the current selection to clipboard.", CTRL (X)) { + vector ulaIndices; + vector copies; + if (!copyToClipboard ()) return; - g_ForgeWindow->deleteSelection (); + g_ForgeWindow->deleteSelection (&ulaIndices, &copies); + History::addEntry (new DeleteHistory (ulaIndices, copies)); } // ============================================================================= @@ -71,9 +75,17 @@ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ============================================================================= ACTION (paste, "Paste", "paste", "Paste clipboard contents.", CTRL (V)) { - for (LDObject* obj : g_Clipboard) - g_CurrentFile->addObject (obj->clone ()); + vector ulaIndices; + vector paCopies; + for (LDObject* obj : g_Clipboard) { + ulong idx = g_CurrentFile->addObject (obj->clone ()); + + ulaIndices.push_back (idx); + paCopies.push_back (obj->clone ()); + } + + History::addEntry (new AdditionHistory (ulaIndices, paCopies)); g_ForgeWindow->refresh (); } @@ -81,24 +93,13 @@ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ============================================================================= ACTION (del, "Delete", "delete", "Delete the selection", KEY (Delete)) { - vector sel = g_ForgeWindow->getSelectedObjects (); - - if (sel.size() == 0) - return; - vector ulaIndices; vector copies; - for (LDObject* obj : sel) { - copies.insert (copies.begin(), obj->clone ()); - ulaIndices.insert (ulaIndices.begin(), obj->getIndex (g_CurrentFile)); - - g_CurrentFile->forgetObject (obj); - delete obj; - } + g_ForgeWindow->deleteSelection (&ulaIndices, &copies); - History::addEntry (new DeleteHistory (ulaIndices, copies)); - g_ForgeWindow->refresh (); + if (copies.size ()) + History::addEntry (new DeleteHistory (ulaIndices, copies)); } // =============================================================================