Merge pull request #22 from opentoonz/fix_save_palette_dialog
パレット上書きの確認ダイアログに関する修正
This commit is contained in:
commit
ce9322ff3c
1 changed files with 13 additions and 6 deletions
|
@ -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,6 +1600,11 @@ bool IoCmd::saveLevel(const TFilePath &fp, TXshSimpleLevel *sl, bool overwrite)
|
|||
if (sl->getPalette() &&
|
||||
sl->getPalette()->getAskOverwriteFlag() &&
|
||||
sl->getPath().getType() != "pli") {
|
||||
/*-- ファイルが存在しない場合はパレットも必ず保存する --*/
|
||||
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,
|
||||
|
@ -1606,6 +1612,7 @@ bool IoCmd::saveLevel(const TFilePath &fp, TXshSimpleLevel *sl, bool overwrite)
|
|||
if (ret == 1)
|
||||
overwritePalette = true;
|
||||
}
|
||||
}
|
||||
|
||||
QApplication::setOverrideCursor(Qt::WaitCursor);
|
||||
try {
|
||||
|
|
Loading…
Reference in a new issue