OpenToonz - An open-source full-featured 2D animation creation software
C
Paste cells command behavior option by Contrail Co.,Ltd. an option for increasing consistency with QuickChecker
shun-iwasawa5592660dcdbe
diff --git a/toonz/sources/include/toonz/preferences.h b/toonz/sources/include/toonz/preferences.hindex dfa3aec95..736a19f4f 100644--- a/toonz/sources/include/toonz/preferences.h+++ b/toonz/sources/include/toonz/preferences.h@@ -368,7 +368,7 @@ public:int getDeleteCommandBehaviour() const {return getIntValue(deleteCommandBehavior);}-+ int getPasteCellsBehavior() const { return getIntValue(pasteCellsBehavior); }bool isIgnoreAlphaonColumn1Enabled() const {return getBoolValue(ignoreAlphaonColumn1Enabled);}diff --git a/toonz/sources/include/toonz/preferencesitemids.h b/toonz/sources/include/toonz/preferencesitemids.hindex 8a2cfdfd6..4174fc3cb 100644--- a/toonz/sources/include/toonz/preferencesitemids.h+++ b/toonz/sources/include/toonz/preferencesitemids.h@@ -122,6 +122,7 @@ enum PreferencesItemId {xsheetAutopanEnabled,DragCellsBehaviour,deleteCommandBehavior,+ pasteCellsBehavior,ignoreAlphaonColumn1Enabled,showKeyframesOnXsheetCellArea,showXsheetCameraColumn,diff --git a/toonz/sources/include/toonzqt/selectioncommandids.h b/toonz/sources/include/toonzqt/selectioncommandids.hindex b2fbfbe0f..85fce4bb7 100644--- a/toonz/sources/include/toonzqt/selectioncommandids.h+++ b/toonz/sources/include/toonzqt/selectioncommandids.h@@ -40,5 +40,6 @@#define MI_ExplodeChild "MI_ExplodeChild"#define MI_ToggleEditInPlace "MI_ToggleEditInPlace"#define MI_PasteNumbers "MI_PasteNumbers"+#define MI_PasteWholeCellData "MI_PasteWholeCellData"#endifdiff --git a/toonz/sources/toonz/cellselection.cpp b/toonz/sources/toonz/cellselection.cppindex 3b55ed1fe..157bc78b8 100644--- a/toonz/sources/toonz/cellselection.cpp+++ b/toonz/sources/toonz/cellselection.cpp@@ -1482,7 +1482,9 @@ void TCellSelection::enableCommands() {enableCommand(this, MI_ShiftKeyframesUp, &TCellSelection::shiftKeyframesUp);enableCommand(this, MI_Copy, &TCellSelection::copyCells);- enableCommand(this, MI_Paste, &TCellSelection::pasteCells);+ enableCommand(this, MI_Paste,+ &TCellSelection::doPaste); // choose pasting behavior by+ // preference optionif (dynamic_cast<const TKeyframeData *>(QApplication::clipboard()->mimeData()))@@ -1507,6 +1509,7 @@ void TCellSelection::enableCommands() {&TCellSelection::reframeWithEmptyInbetweens);enableCommand(this, MI_PasteNumbers, &TCellSelection::overwritePasteNumbers);+ enableCommand(this, MI_PasteWholeCellData, &TCellSelection::pasteCells);enableCommand(this, MI_CreateBlankDrawing,&TCellSelection::createBlankDrawings);enableCommand(this, MI_Duplicate, &TCellSelection::duplicateFrames);@@ -1552,6 +1555,7 @@ bool TCellSelection::isEnabledCommand(MI_Undo,MI_Redo,MI_PasteNumbers,+ MI_PasteWholeCellData,MI_ConvertToToonzRaster,MI_ConvertVectorToVector,MI_CreateBlankDrawing,@@ -1726,6 +1730,16 @@ static void pasteRasterImageInCell(int row, int col,}}+//-----------------------------------------------------------------------------+// choose pasting behavior by preference option+void TCellSelection::doPaste() {+ if (Preferences::instance()->getPasteCellsBehavior() ==+ 0) // insert paste whole contents of copied cells+ pasteCells();+ else // overwrite paste numbers, consistent with QuickChecker+ overwritePasteNumbers();+}+//-----------------------------------------------------------------------------void TCellSelection::pasteCells() {diff --git a/toonz/sources/toonz/cellselection.h b/toonz/sources/toonz/cellselection.hindex 13d8bc394..e508f0276 100644--- a/toonz/sources/toonz/cellselection.h+++ b/toonz/sources/toonz/cellselection.h@@ -45,6 +45,7 @@ public:void copyCells();void pasteCells();+ void doPaste(); // choose pasting behavior by preference optionvoid pasteDuplicateCells();void deleteCells();void deleteCells(bool withShift);diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cppindex 938b6921f..c15916781 100644--- a/toonz/sources/toonz/mainwindow.cpp+++ b/toonz/sources/toonz/mainwindow.cpp@@ -2299,6 +2299,8 @@ void MainWindow::defineActions() {"", "shift_keys_up");createRightClickMenuAction(MI_PasteNumbers, QT_TR_NOOP("&Paste Numbers"), "","paste_numbers");+ createRightClickMenuAction(MI_PasteWholeCellData,+ QT_TR_NOOP("&Paste Whole Cell Data"), "", "paste");createRightClickMenuAction(MI_Histogram, QT_TR_NOOP("&Histogram"), "");// MI_ViewerHistogram command is used as a proxy. It will be called whendiff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cppindex 0c32fa39f..78feef647 100644--- a/toonz/sources/toonz/preferencespopup.cpp+++ b/toonz/sources/toonz/preferencespopup.cpp@@ -1260,6 +1260,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {{xsheetAutopanEnabled, tr("Xsheet Autopan during Playback")},{DragCellsBehaviour, tr("Cell-dragging Behaviour:")},{deleteCommandBehavior, tr("Delete Command Behaviour:")},+ {pasteCellsBehavior, tr("Paste Cells Behaviour:")},{ignoreAlphaonColumn1Enabled,tr("Ignore Alpha Channel on Levels in Column 1")},{showKeyframesOnXsheetCellArea, tr("Show Keyframes on Cell Area")},@@ -1431,6 +1432,9 @@ QList<ComboBoxItem> PreferencesPopup::getComboItemList({deleteCommandBehavior,{{tr("Clear Cell / Frame"), 0},{tr("Remove and Shift Cells / Frames Up"), 1}}},+ {pasteCellsBehavior,+ {{tr("Insert Paste Whole Data"), 0},+ {tr("Overwrite Paste Cell Numbers"), 1}}},{keyframeType, // note that the value starts from 1, not 0{{tr("Constant"), 1},{tr("Linear"), 2},@@ -1992,6 +1996,7 @@ QWidget* PreferencesPopup::createXsheetPage() {insertUI(xsheetAutopanEnabled, lay);insertUI(DragCellsBehaviour, lay, getComboItemList(DragCellsBehaviour));insertUI(deleteCommandBehavior, lay, getComboItemList(deleteCommandBehavior));+ insertUI(pasteCellsBehavior, lay, getComboItemList(pasteCellsBehavior));insertUI(ignoreAlphaonColumn1Enabled, lay);QGridLayout* showKeyLay =insertGroupBoxUI(showKeyframesOnXsheetCellArea, lay);diff --git a/toonz/sources/toonz/xshcellviewer.cpp b/toonz/sources/toonz/xshcellviewer.cppindex cc006f9f8..ee38ec7c8 100644--- a/toonz/sources/toonz/xshcellviewer.cpp+++ b/toonz/sources/toonz/xshcellviewer.cpp@@ -3861,7 +3861,13 @@ void CellArea::createCellMenu(QMenu &menu, bool isCellSelected, TXshCell cell,QMenu *pasteSpecialMenu = new QMenu(tr("Paste Special"), this);{pasteSpecialMenu->addAction(cmdManager->getAction(MI_PasteInto));- pasteSpecialMenu->addAction(cmdManager->getAction(MI_PasteNumbers));+ // the "standard" paste behavior for MI_Paste is specified in the+ // preferences. here we display the alternative behavior.+ if (Preferences::instance()->getPasteCellsBehavior() == 0)+ pasteSpecialMenu->addAction(cmdManager->getAction(MI_PasteNumbers));+ else+ pasteSpecialMenu->addAction(+ cmdManager->getAction(MI_PasteWholeCellData));if (!soundTextCellsSelected) {pasteSpecialMenu->addAction(cmdManager->getAction(MI_PasteDuplicate));}diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cppindex 841536faf..1f9aeafb5 100644--- a/toonz/sources/toonzlib/preferences.cpp+++ b/toonz/sources/toonzlib/preferences.cpp@@ -569,6 +569,8 @@ void Preferences::definePreferenceItems() {1); // Cells and Column Datadefine(deleteCommandBehavior, "deleteCommandBehavior", QMetaType::Int,0); // Clear Cell / Frame+ define(pasteCellsBehavior, "pasteCellsBehavior", QMetaType::Int,+ 0); // Insert paste whole cell datadefine(ignoreAlphaonColumn1Enabled, "ignoreAlphaonColumn1Enabled",QMetaType::Bool, false);define(showKeyframesOnXsheetCellArea, "showKeyframesOnXsheetCellArea",