razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

paste whole cell data -> paste cell content

Browse source
This commit is contained in:
shun-iwasawa 2023-03-13 17:28:18 +09:00 committed by manongjohn
parent 3760592895
commit b5c0061774
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/include/toonzqt/selectioncommandids.h
View file

@ -41,6 +41,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

4
toonz/sources/toonz/cellselection.cpp
View file

@ -1570,7 +1570,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);
@ -1617,7 +1617,7 @@ bool TCellSelection::isEnabledCommand(
MI_Undo,
MI_Redo,
MI_PasteNumbers,
MI_PasteWholeCellData,
MI_PasteCellContent,
MI_ConvertToToonzRaster,
MI_ConvertVectorToVector,
MI_CreateBlankDrawing,

4
toonz/sources/toonz/mainwindow.cpp
View file

@ -2478,8 +2478,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
// the MI_Histogram is used while the current flip console is in viewer.

3
toonz/sources/toonz/xshcellviewer.cpp
View file

@ -4158,8 +4158,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));
}