paste whole cell data -> paste cell content

opentoonz · Mar 14, 2023 · 34af467 · 34af467
1 parent 5592660
commit 34af467
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/toonz/sources/include/toonzqt/selectioncommandids.h b/toonz/sources/include/toonzqt/selectioncommandids.h
@@ -40,6 +40,6 @@
 #define MI_ExplodeChild "MI_ExplodeChild"
 #define MI_ToggleEditInPlace "MI_ToggleEditInPlace"
 #define MI_PasteNumbers "MI_PasteNumbers"
-#define MI_PasteWholeCellData "MI_PasteWholeCellData"
+#define MI_PasteCellContent "MI_PasteCellContent"
 
 #endif
diff --git a/toonz/sources/toonz/cellselection.cpp b/toonz/sources/toonz/cellselection.cpp
@@ -1509,7 +1509,7 @@ void TCellSelection::enableCommands() {
                 &TCellSelection::reframeWithEmptyInbetweens);
 
   enableCommand(this, MI_PasteNumbers, &TCellSelection::overwritePasteNumbers);
-  enableCommand(this, MI_PasteWholeCellData, &TCellSelection::pasteCells);
+  enableCommand(this, MI_PasteCellContent, &TCellSelection::pasteCells);
   enableCommand(this, MI_CreateBlankDrawing,
                 &TCellSelection::createBlankDrawings);
   enableCommand(this, MI_Duplicate, &TCellSelection::duplicateFrames);
@@ -1555,7 +1555,7 @@ bool TCellSelection::isEnabledCommand(
                                         MI_Undo,
                                         MI_Redo,
                                         MI_PasteNumbers,
-                                        MI_PasteWholeCellData,
+                                        MI_PasteCellContent,
                                         MI_ConvertToToonzRaster,
                                         MI_ConvertVectorToVector,
                                         MI_CreateBlankDrawing,

diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
@@ -2299,8 +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_PasteCellContent,
+                             QT_TR_NOOP("&Paste Cell Content"), "", "paste");
 
   createRightClickMenuAction(MI_Histogram, QT_TR_NOOP("&Histogram"), "");
   // MI_ViewerHistogram command is used as a proxy. It will be called when

diff --git a/toonz/sources/toonz/xshcellviewer.cpp b/toonz/sources/toonz/xshcellviewer.cpp
@@ -3866,8 +3866,7 @@ void CellArea::createCellMenu(QMenu &menu, bool isCellSelected, TXshCell cell,
       if (Preferences::instance()->getPasteCellsBehavior() == 0)
         pasteSpecialMenu->addAction(cmdManager->getAction(MI_PasteNumbers));
       else
-        pasteSpecialMenu->addAction(
-            cmdManager->getAction(MI_PasteWholeCellData));
+        pasteSpecialMenu->addAction(cmdManager->getAction(MI_PasteCellContent));
       if (!soundTextCellsSelected) {
         pasteSpecialMenu->addAction(cmdManager->getAction(MI_PasteDuplicate));
       }