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

Note Level enhancement and crash fixe (#2568)

Browse source 
* Add Note Level context menu

* Fix Replace Note Level crash
This commit is contained in:
manongjohn 2019-08-02 04:44:29 -04:00 committed by shun-iwasawa
parent 1223e0dc7b
commit 5bceaad2c4
2 changed files with 71 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3111,9 +3111,8 @@ const bool CellArea::isControlPressed() { return isCtrlPressed; }
void CellArea::createCellMenu(QMenu &menu, bool isCellSelected, TXshCell cell) { void CellArea::createCellMenu(QMenu &menu, bool isCellSelected, TXshCell cell) {
CommandManager *cmdManager = CommandManager::instance(); CommandManager *cmdManager = CommandManager::instance();
bool soundCellsSelected = m_viewer->areSoundCellsSelected(); bool soundCellsSelected = m_viewer->areSoundCellsSelected();
bool soundTextCellsSelected = m_viewer->areSoundTextCellsSelected();
if (m_viewer->areSoundTextCellsSelected()) return; // Magpies stop here
menu.addSeparator(); menu.addSeparator();
@ -3124,13 +3123,17 @@ void CellArea::createCellMenu(QMenu &menu, bool isCellSelected, TXshCell cell) {
} }
if (isCellSelected) { if (isCellSelected) {
bool addSeparator = false;
// open fx settings instead of level settings when clicked on zerary fx // open fx settings instead of level settings when clicked on zerary fx
// level // level
if (cell.m_level && cell.m_level->getZeraryFxLevel()) if (cell.m_level && cell.m_level->getZeraryFxLevel()) {
menu.addAction(cmdManager->getAction(MI_FxParamEditor)); menu.addAction(cmdManager->getAction(MI_FxParamEditor));
else addSeparator = true;
} else if (!soundTextCellsSelected) {
menu.addAction(cmdManager->getAction(MI_LevelSettings)); menu.addAction(cmdManager->getAction(MI_LevelSettings));
menu.addSeparator(); addSeparator = true;
}
if (addSeparator) menu.addSeparator();
if (!soundCellsSelected) { if (!soundCellsSelected) {
QMenu *reframeSubMenu = new QMenu(tr("Reframe"), this); QMenu *reframeSubMenu = new QMenu(tr("Reframe"), this);
@ -3162,74 +3165,81 @@ void CellArea::createCellMenu(QMenu &menu, bool isCellSelected, TXshCell cell) {
} }
menu.addMenu(eachSubMenu); menu.addMenu(eachSubMenu);
QMenu *editCellNumbersMenu = new QMenu(tr("Edit Cell Numbers"), this); if (!soundTextCellsSelected) {
{ QMenu *editCellNumbersMenu = new QMenu(tr("Edit Cell Numbers"), this);
editCellNumbersMenu->addAction(cmdManager->getAction(MI_Reverse)); {
editCellNumbersMenu->addAction(cmdManager->getAction(MI_Swing)); editCellNumbersMenu->addAction(cmdManager->getAction(MI_Reverse));
editCellNumbersMenu->addAction(cmdManager->getAction(MI_Random)); editCellNumbersMenu->addAction(cmdManager->getAction(MI_Swing));
editCellNumbersMenu->addAction(cmdManager->getAction(MI_Dup)); editCellNumbersMenu->addAction(cmdManager->getAction(MI_Random));
editCellNumbersMenu->addAction(cmdManager->getAction(MI_Rollup)); editCellNumbersMenu->addAction(cmdManager->getAction(MI_Dup));
editCellNumbersMenu->addAction(cmdManager->getAction(MI_Rolldown)); editCellNumbersMenu->addAction(cmdManager->getAction(MI_Rollup));
editCellNumbersMenu->addAction(cmdManager->getAction(MI_TimeStretch)); editCellNumbersMenu->addAction(cmdManager->getAction(MI_Rolldown));
editCellNumbersMenu->addAction( editCellNumbersMenu->addAction(cmdManager->getAction(MI_TimeStretch));
cmdManager->getAction(MI_AutoInputCellNumber)); editCellNumbersMenu->addAction(
cmdManager->getAction(MI_AutoInputCellNumber));
}
menu.addMenu(editCellNumbersMenu);
} }
menu.addMenu(editCellNumbersMenu);
menu.addAction(cmdManager->getAction(MI_FillEmptyCell)); menu.addAction(cmdManager->getAction(MI_FillEmptyCell));
menu.addSeparator(); menu.addSeparator();
menu.addAction(cmdManager->getAction(MI_Autorenumber));
if (!soundTextCellsSelected)
menu.addAction(cmdManager->getAction(MI_Autorenumber));
} }
QMenu *replaceLevelMenu = new QMenu(tr("Replace Level"), this); if (!soundTextCellsSelected) {
menu.addMenu(replaceLevelMenu); QMenu *replaceLevelMenu = new QMenu(tr("Replace Level"), this);
menu.addMenu(replaceLevelMenu);
replaceLevelMenu->addAction(cmdManager->getAction(MI_ReplaceLevel)); replaceLevelMenu->addAction(cmdManager->getAction(MI_ReplaceLevel));
replaceLevelMenu->addAction( replaceLevelMenu->addAction(
cmdManager->getAction(MI_ReplaceParentDirectory)); cmdManager->getAction(MI_ReplaceParentDirectory));
{ {
// replace with another level in scene cast // replace with another level in scene cast
std::vector<TXshLevel *> levels; std::vector<TXshLevel *> levels;
TApp::instance() TApp::instance()
->getCurrentScene() ->getCurrentScene()
->getScene() ->getScene()
->getLevelSet() ->getLevelSet()
->listLevels(levels); ->listLevels(levels);
if (!levels.empty()) { if (!levels.empty()) {
QMenu *replaceMenu = replaceLevelMenu->addMenu(tr("Replace with")); QMenu *replaceMenu = replaceLevelMenu->addMenu(tr("Replace with"));
connect(replaceMenu, SIGNAL(triggered(QAction *)), this, connect(replaceMenu, SIGNAL(triggered(QAction *)), this,
SLOT(onReplaceByCastedLevel(QAction *))); SLOT(onReplaceByCastedLevel(QAction *)));
for (int i = 0; i < (int)levels.size(); i++) { for (int i = 0; i < (int)levels.size(); i++) {
if (!levels[i]->getSimpleLevel() && !levels[i]->getChildLevel()) if (!levels[i]->getSimpleLevel() && !levels[i]->getChildLevel())
continue; continue;
if (levels[i]->getChildLevel() && if (levels[i]->getChildLevel() &&
!TApp::instance()->getCurrentXsheet()->getXsheet()->isLevelUsed( !TApp::instance()->getCurrentXsheet()->getXsheet()->isLevelUsed(
levels[i])) levels[i]))
continue; continue;
QString tmpLevelName = QString::fromStdWString(levels[i]->getName()); QString tmpLevelName =
QAction *tmpAction = new QAction(tmpLevelName, replaceMenu); QString::fromStdWString(levels[i]->getName());
tmpAction->setData(tmpLevelName); QAction *tmpAction = new QAction(tmpLevelName, replaceMenu);
replaceMenu->addAction(tmpAction); tmpAction->setData(tmpLevelName);
replaceMenu->addAction(tmpAction);
}
} }
} }
}
if (!soundCellsSelected) { if (!soundCellsSelected && !soundTextCellsSelected) {
if (selectionContainTlvImage(m_viewer->getCellSelection(), if (selectionContainTlvImage(m_viewer->getCellSelection(),
m_viewer->getXsheet()))
replaceLevelMenu->addAction(
cmdManager->getAction(MI_RevertToCleanedUp));
if (selectionContainLevelImage(m_viewer->getCellSelection(),
m_viewer->getXsheet())) m_viewer->getXsheet()))
replaceLevelMenu->addAction( replaceLevelMenu->addAction(
cmdManager->getAction(MI_RevertToLastSaved)); cmdManager->getAction(MI_RevertToCleanedUp));
menu.addAction(cmdManager->getAction(MI_SetKeyframes)); if (selectionContainLevelImage(m_viewer->getCellSelection(),
m_viewer->getXsheet()))
replaceLevelMenu->addAction(
cmdManager->getAction(MI_RevertToLastSaved));
menu.addAction(cmdManager->getAction(MI_SetKeyframes));
}
menu.addSeparator();
} }
menu.addSeparator();
menu.addAction(cmdManager->getAction(MI_Cut)); menu.addAction(cmdManager->getAction(MI_Cut));
menu.addAction(cmdManager->getAction(MI_Copy)); menu.addAction(cmdManager->getAction(MI_Copy));
@ -3244,7 +3254,8 @@ void CellArea::createCellMenu(QMenu &menu, bool isCellSelected, TXshCell cell) {
menu.addAction(cmdManager->getAction(MI_Clear)); menu.addAction(cmdManager->getAction(MI_Clear));
menu.addAction(cmdManager->getAction(MI_Insert)); menu.addAction(cmdManager->getAction(MI_Insert));
menu.addAction(cmdManager->getAction(MI_Duplicate)); if (!soundTextCellsSelected)
menu.addAction(cmdManager->getAction(MI_Duplicate));
menu.addSeparator(); menu.addSeparator();
TXshSimpleLevel *sl = TApp::instance()->getCurrentLevel()->getSimpleLevel(); TXshSimpleLevel *sl = TApp::instance()->getCurrentLevel()->getSimpleLevel();

2
toonz/sources/toonzlib/txshsoundtextcolumn.cpp
View file

@ -46,7 +46,7 @@ void TXshSoundTextColumn::createSoundTextLevel(int row,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool TXshSoundTextColumn::canSetCell(const TXshCell &cell) const { bool TXshSoundTextColumn::canSetCell(const TXshCell &cell) const {
return true; return cell.isEmpty() || cell.m_level->getSoundTextLevel() != 0;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------