drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[nostalgia/core/studio] Fix build error in NewTileSheetWizard

Browse Source
This commit is contained in:
Gary Talent 2020-04-02 00:58:40 -05:00
parent 5189fefaa1
commit a74cd1c926
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nostalgia/core/studio/new_tilesheet_wizard.cpp
View File

@ -19,7 +19,7 @@ namespace nostalgia::core {
NewTilesheetWizardPage::NewTilesheetWizardPage(const studio::Context *ctx) { NewTilesheetWizardPage::NewTilesheetWizardPage(const studio::Context *ctx) {
m_ctx = ctx; m_ctx = ctx;
addLineEdit(tr("&Tile Sheet Name:"), QString(TileSheetName) + "*", "", [this](QString name) { addLineEdit(tr("&Tile Sheet Name:"), QString(TileSheetName) + "*", "", [this](QString) {
return 0; return 0;
}); });
m_palettePicker = addComboBox(tr("&Palette:"), QString(Palette) + "*", {""}); m_palettePicker = addComboBox(tr("&Palette:"), QString(Palette) + "*", {""});
@ -33,8 +33,7 @@ NewTilesheetWizardPage::NewTilesheetWizardPage(const studio::Context *ctx) {
int NewTilesheetWizardPage::accept() { int NewTilesheetWizardPage::accept() {
const auto tilesheetName = field(TileSheetName).toString(); const auto tilesheetName = field(TileSheetName).toString();
const auto palette = m_palettePicker->itemData(field(Palette).toInt()).toString(); const auto palette = m_palettePicker->itemData(field(Palette).toInt()).toString();
const auto outPath = TileSheetDir + tilesheetName + FileExt_ng; const auto outPath = QString(TileSheetDir) + tilesheetName + FileExt_ng;
auto outPath = QString(TileSheetDir) + name + FileExt_ng;
auto err = m_ctx->project->exists(outPath); auto err = m_ctx->project->exists(outPath);
if (err) { if (err) {
showValidationError(tr("A tile sheet with this name already exists.")); showValidationError(tr("A tile sheet with this name already exists."));