From 5b57f4279a1bf84f873bd850ad885791c09a2aca Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 30 Mar 2019 17:06:56 -0500 Subject: [PATCH] [nostalgia/core/studio] Remove unused BPP field from tile sheet import wizard --- src/nostalgia/core/studio/import_tilesheet_wizard.cpp | 11 +++-------- src/nostalgia/core/studio/import_tilesheet_wizard.hpp | 8 ++++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/nostalgia/core/studio/import_tilesheet_wizard.cpp b/src/nostalgia/core/studio/import_tilesheet_wizard.cpp index 002f73f4..5df5b4fe 100644 --- a/src/nostalgia/core/studio/import_tilesheet_wizard.cpp +++ b/src/nostalgia/core/studio/import_tilesheet_wizard.cpp @@ -13,14 +13,9 @@ namespace nostalgia::core { -const QString ImportTilesheetWizardPage::TileSheetDir = "/TileSheets/"; -const QString ImportTilesheetWizardPage::TileSheetName = "projectName"; -const QString ImportTilesheetWizardPage::ImportPath = "projectPath"; -const QString ImportTilesheetWizardPage::BPP = "bpp"; - ImportTilesheetWizardPage::ImportTilesheetWizardPage(const studio::Context *ctx) { m_ctx = ctx; - addLineEdit(tr("&Tile Sheet Name:"), TileSheetName + "*", "", [this](QString) { + addLineEdit(tr("&Tile Sheet Name:"), QString(TileSheetName) + "*", "", [this](QString) { auto importPath = field(ImportPath).toString(); if (QFile(importPath).exists()) { return 0; @@ -31,9 +26,9 @@ ImportTilesheetWizardPage::ImportTilesheetWizardPage(const studio::Context *ctx) } ); auto fileTypes = "(*.png);;(*.bmp);;(*.jpg);;(*.jpeg)"; - addPathBrowse(tr("Tile Sheet &Path:"), ImportPath + "*", "", + addPathBrowse(tr("Tile Sheet &Path:"), QString(ImportPath) + "*", "", QFileDialog::ExistingFile, fileTypes); - addComboBox(tr("Bits Per Pixe&l:"), BPP, {"4", "8"}); + //addComboBox(tr("Bits Per Pixe&l:"), BPP, {tr("Auto"), "4", "8"}); } int ImportTilesheetWizardPage::accept() { diff --git a/src/nostalgia/core/studio/import_tilesheet_wizard.hpp b/src/nostalgia/core/studio/import_tilesheet_wizard.hpp index 9b2a47fd..b8ca7803 100644 --- a/src/nostalgia/core/studio/import_tilesheet_wizard.hpp +++ b/src/nostalgia/core/studio/import_tilesheet_wizard.hpp @@ -14,10 +14,10 @@ namespace nostalgia::core { class ImportTilesheetWizardPage: public studio::WizardFormPage { private: - static const QString TileSheetDir; - static const QString TileSheetName; - static const QString ImportPath; - static const QString BPP; + static constexpr auto TileSheetDir = "/TileSheets/"; + static constexpr auto TileSheetName = "projectName"; + static constexpr auto ImportPath = "projectPath"; + //static constexpr auto BPP = "bpp"; const studio::Context *m_ctx = nullptr; public: