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

Merge pull request #22 from opentoonz/fix_save_palette_dialog

Browse source 
パレット上書きの確認ダイアログに関する修正
This commit is contained in:
roentgen 2016-03-25 00:13:19 +09:00
commit ce9322ff3c
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1584,7 +1584,8 @@ bool IoCmd::saveLevel(const TFilePath &fp, TXshSimpleLevel *sl, bool overwrite)
return false;
#else
assert(sl);
if (!overwrite && TSystem::doesExistFileOrLevel(fp)) {
bool fileDoesExist = TSystem::doesExistFileOrLevel(fp);
if (!overwrite && fileDoesExist) {
QString question;
question = QObject::tr("The level %1 already exists.\nDo you want to overwrite it?").arg(toQString(fp));
int ret = MsgBox(question, QObject::tr("Overwrite"), QObject::tr("Cancel"), 0);
@ -1599,12 +1600,18 @@ bool IoCmd::saveLevel(const TFilePath &fp, TXshSimpleLevel *sl, bool overwrite)
if (sl->getPalette() &&
sl->getPalette()->getAskOverwriteFlag() &&
sl->getPath().getType() != "pli") {
QString question;
question = "Palette " + QString::fromStdWString(sl->getPalette()->getPaletteName()) + ".tpl has been modified. Do you want to overwrite palette as well ?";
int ret = MsgBox(question,
QObject::tr("Overwrite Palette") /*ret = 1*/, QObject::tr("Don't Overwrite Palette") /*ret = 2*/, 0);
if (ret == 1)
/*-- ファイルが存在しない場合はパレットも必ず保存する --*/
if (!fileDoesExist)
overwritePalette = true;
else
{
QString question;
question = "Palette " + QString::fromStdWString(sl->getPalette()->getPaletteName()) + ".tpl has been modified. Do you want to overwrite palette as well ?";
int ret = MsgBox(question,
QObject::tr("Overwrite Palette") /*ret = 1*/, QObject::tr("Don't Overwrite Palette") /*ret = 2*/, 0);
if (ret == 1)
overwritePalette = true;
}
}
QApplication::setOverrideCursor(Qt::WaitCursor);