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

Fix Save As Default palette to use default level type

Browse source
This commit is contained in:
manongjohn 2022-01-28 23:02:24 -05:00
parent 9a59ad9f58
commit 8768237bd2
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
toonz/sources/toonz/iocommand.cpp
View file

@ -3158,23 +3158,20 @@ public:
return; return;
} }
int levelType = UNKNOWN_XSHLEVEL; int levelType = palette->getDefaultPaletteType();
QString levelTypeStr, displayStr; QString levelTypeStr, displayStr;
if (palette->isDefaultPalette()) { if (levelType == UNKNOWN_XSHLEVEL) {
levelType = palette->getDefaultPaletteType();
} else {
TXshLevel *level = TApp::instance()->getCurrentLevel()->getLevel(); TXshLevel *level = TApp::instance()->getCurrentLevel()->getLevel();
if (!level) { if (level) {
DVGui::warning("No current level."); TXshSimpleLevel *sl = level->getSimpleLevel();
return; if (!sl) {
} DVGui::warning("Current level is not a drawing level.");
TXshSimpleLevel *sl = level->getSimpleLevel(); return;
if (!sl) { }
DVGui::warning("Current level is not a drawing level."); levelType = sl->getType();
return; } else
} levelType = Preferences::instance()->getDefLevelType();
levelType = sl->getType();
} }
switch (levelType) { switch (levelType) {

6
toonz/sources/toonzqt/paletteviewer.cpp
View file

@ -649,6 +649,8 @@ void PaletteViewer::updateSavePaletteToolBar() {
: getPalette() : getPalette()
? getPalette()->getDefaultPaletteType() ? getPalette()->getDefaultPaletteType()
: UNKNOWN_XSHLEVEL; : UNKNOWN_XSHLEVEL;
if (levelType == UNKNOWN_XSHLEVEL)
levelType = Preferences::instance()->getDefLevelType();
setSaveDefaultText(act, levelType); setSaveDefaultText(act, levelType);
} }
act->setEnabled(enable); act->setEnabled(enable);
@ -685,6 +687,8 @@ void PaletteViewer::updatePaletteMenu() {
: getPalette() : getPalette()
? getPalette()->getDefaultPaletteType() ? getPalette()->getDefaultPaletteType()
: UNKNOWN_XSHLEVEL; : UNKNOWN_XSHLEVEL;
if (levelType == UNKNOWN_XSHLEVEL)
levelType = Preferences::instance()->getDefLevelType();
setSaveDefaultText(act, levelType); setSaveDefaultText(act, levelType);
} }
act->setEnabled(enable); act->setEnabled(enable);
@ -779,6 +783,8 @@ void PaletteViewer::contextMenuEvent(QContextMenuEvent *event) {
? m_levelHandle->getLevel()->getType() ? m_levelHandle->getLevel()->getType()
: getPalette() ? getPalette()->getDefaultPaletteType() : getPalette() ? getPalette()->getDefaultPaletteType()
: UNKNOWN_XSHLEVEL; : UNKNOWN_XSHLEVEL;
if (levelType == UNKNOWN_XSHLEVEL)
levelType = Preferences::instance()->getDefLevelType();
setSaveDefaultText(action, levelType); setSaveDefaultText(action, levelType);
} }
} }