fix new level undo
This commit is contained in:
parent
00280c1da5
commit
3ce5e26b2d
1 changed files with 19 additions and 19 deletions
|
@ -275,8 +275,8 @@ LevelCreatePopup::LevelCreatePopup()
|
||||||
bool ret = true;
|
bool ret = true;
|
||||||
ret = ret && connect(m_levelTypeOm, SIGNAL(currentIndexChanged(int)),
|
ret = ret && connect(m_levelTypeOm, SIGNAL(currentIndexChanged(int)),
|
||||||
SLOT(onLevelTypeChanged(int)));
|
SLOT(onLevelTypeChanged(int)));
|
||||||
ret = ret && connect(okBtn, SIGNAL(clicked()), this, SLOT(onOkBtn()));
|
ret = ret && connect(okBtn, SIGNAL(clicked()), this, SLOT(onOkBtn()));
|
||||||
ret = ret && connect(cancelBtn, SIGNAL(clicked()), this, SLOT(reject()));
|
ret = ret && connect(cancelBtn, SIGNAL(clicked()), this, SLOT(reject()));
|
||||||
ret =
|
ret =
|
||||||
ret && connect(applyBtn, SIGNAL(clicked()), this, SLOT(onApplyButton()));
|
ret && connect(applyBtn, SIGNAL(clicked()), this, SLOT(onApplyButton()));
|
||||||
|
|
||||||
|
@ -525,23 +525,6 @@ bool LevelCreatePopup::apply() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TXshLevel *level =
|
|
||||||
scene->createNewLevel(lType, levelName, TDimension(), 0, fp);
|
|
||||||
TXshSimpleLevel *sl = dynamic_cast<TXshSimpleLevel *>(level);
|
|
||||||
assert(sl);
|
|
||||||
// sl->setPath(fp, true);
|
|
||||||
if (lType == TZP_XSHLEVEL || lType == OVL_XSHLEVEL) {
|
|
||||||
sl->getProperties()->setDpiPolicy(LevelProperties::DP_ImageDpi);
|
|
||||||
sl->getProperties()->setDpi(dpi);
|
|
||||||
sl->getProperties()->setImageDpi(TPointD(dpi, dpi));
|
|
||||||
sl->getProperties()->setImageRes(TDimension(xres, yres));
|
|
||||||
}
|
|
||||||
if (lType == TZP_XSHLEVEL || lType == PLI_XSHLEVEL) {
|
|
||||||
TPalette *defaultPalette =
|
|
||||||
TApp::instance()->getPaletteController()->getDefaultPalette(lType);
|
|
||||||
if (defaultPalette) sl->setPalette(defaultPalette->clone());
|
|
||||||
}
|
|
||||||
|
|
||||||
/*-- これからLevelを配置しようとしているセルが空いているかどうかのチェック
|
/*-- これからLevelを配置しようとしているセルが空いているかどうかのチェック
|
||||||
* --*/
|
* --*/
|
||||||
bool areColumnsShifted = false;
|
bool areColumnsShifted = false;
|
||||||
|
@ -574,6 +557,23 @@ bool LevelCreatePopup::apply() {
|
||||||
new CreateLevelUndo(row, col, numFrames, step, areColumnsShifted);
|
new CreateLevelUndo(row, col, numFrames, step, areColumnsShifted);
|
||||||
TUndoManager::manager()->add(undo);
|
TUndoManager::manager()->add(undo);
|
||||||
|
|
||||||
|
TXshLevel *level =
|
||||||
|
scene->createNewLevel(lType, levelName, TDimension(), 0, fp);
|
||||||
|
TXshSimpleLevel *sl = dynamic_cast<TXshSimpleLevel *>(level);
|
||||||
|
assert(sl);
|
||||||
|
// sl->setPath(fp, true);
|
||||||
|
if (lType == TZP_XSHLEVEL || lType == OVL_XSHLEVEL) {
|
||||||
|
sl->getProperties()->setDpiPolicy(LevelProperties::DP_ImageDpi);
|
||||||
|
sl->getProperties()->setDpi(dpi);
|
||||||
|
sl->getProperties()->setImageDpi(TPointD(dpi, dpi));
|
||||||
|
sl->getProperties()->setImageRes(TDimension(xres, yres));
|
||||||
|
}
|
||||||
|
if (lType == TZP_XSHLEVEL || lType == PLI_XSHLEVEL) {
|
||||||
|
TPalette *defaultPalette =
|
||||||
|
TApp::instance()->getPaletteController()->getDefaultPalette(lType);
|
||||||
|
if (defaultPalette) sl->setPalette(defaultPalette->clone());
|
||||||
|
}
|
||||||
|
|
||||||
for (i = from; i <= to; i += inc) {
|
for (i = from; i <= to; i += inc) {
|
||||||
TFrameId fid(i);
|
TFrameId fid(i);
|
||||||
TXshCell cell(sl, fid);
|
TXshCell cell(sl, fid);
|
||||||
|
|
Loading…
Reference in a new issue