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

[nostalgia/core/studio] Remove unused BPP field from tile sheet import wizard

Browse Source
This commit is contained in:
Gary Talent 2019-03-30 17:06:56 -05:00
parent 6baa9a251c
commit 5b57f4279a
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nostalgia/core/studio/import_tilesheet_wizard.cpp
View File

@ -13,14 +13,9 @@
namespace nostalgia::core { 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) { ImportTilesheetWizardPage::ImportTilesheetWizardPage(const studio::Context *ctx) {
m_ctx = 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(); auto importPath = field(ImportPath).toString();
if (QFile(importPath).exists()) { if (QFile(importPath).exists()) {
return 0; return 0;
@ -31,9 +26,9 @@ ImportTilesheetWizardPage::ImportTilesheetWizardPage(const studio::Context *ctx)
} }
); );
auto fileTypes = "(*.png);;(*.bmp);;(*.jpg);;(*.jpeg)"; auto fileTypes = "(*.png);;(*.bmp);;(*.jpg);;(*.jpeg)";
addPathBrowse(tr("Tile Sheet &Path:"), ImportPath + "*", "", addPathBrowse(tr("Tile Sheet &Path:"), QString(ImportPath) + "*", "",
QFileDialog::ExistingFile, fileTypes); 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() { int ImportTilesheetWizardPage::accept() {

8
src/nostalgia/core/studio/import_tilesheet_wizard.hpp
View File

@ -14,10 +14,10 @@ namespace nostalgia::core {
class ImportTilesheetWizardPage: public studio::WizardFormPage { class ImportTilesheetWizardPage: public studio::WizardFormPage {
private: private:
static const QString TileSheetDir; static constexpr auto TileSheetDir = "/TileSheets/";
static const QString TileSheetName; static constexpr auto TileSheetName = "projectName";
static const QString ImportPath; static constexpr auto ImportPath = "projectPath";
static const QString BPP; //static constexpr auto BPP = "bpp";
const studio::Context *m_ctx = nullptr; const studio::Context *m_ctx = nullptr;
public: public: