Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-14 21:07:44 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify projectConfig file path / identifier tables
Some checks are pending
Build Porymap / build-linux (, 5.14.2) (push) Waiting to run
Details
Build Porymap / build-linux (, 6.8.*) (push) Waiting to run
Details
Build Porymap / build-linux (minimal, 5.14.2) (push) Waiting to run
Details
Build Porymap / build-macos (macos-15-intel) (push) Waiting to run
Details
Build Porymap / build-macos (macos-latest) (push) Waiting to run
Details
Build Porymap / build-static-windows (push) Waiting to run
Details

Browse Source
This commit is contained in:
GriffinR
2026-03-01 22:02:31 -05:00
parent 80a726ed9f
commit f0c8e21781
5 changed files with 178 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/config/projectconfig.h
View File

@@ -6,6 +6,8 @@
#include "block.h"
#include "events.h"
#include <optional>
enum ProjectIdentifier {
symbol_facing_directions,
symbol_obj_event_gfx_pointers,
@@ -137,18 +139,18 @@ public:
void setFilePath(ProjectFilePath pathId, const QString& path);
void setFilePath(const QString& pathId, const QString& path);
QString getCustomFilePath(ProjectFilePath pathId);
QString getCustomFilePath(const QString& pathId);
QString getFilePath(ProjectFilePath pathId);
QString getCustomFilePath(ProjectFilePath pathId) const;
QString getCustomFilePath(const QString& pathId) const;
QString getFilePath(ProjectFilePath pathId) const;
void setIdentifier(ProjectIdentifier id, const QString& text);
void setIdentifier(const QString& id, const QString& text);
QString getCustomIdentifier(ProjectIdentifier id);
QString getCustomIdentifier(const QString& id);
QString getIdentifier(ProjectIdentifier id);
QString getCustomIdentifier(ProjectIdentifier id) const;
QString getCustomIdentifier(const QString& id) const;
QString getIdentifier(ProjectIdentifier id) const;
static const QMap<ProjectIdentifier, QPair<QString, QString>> defaultIdentifiers;
static const QMap<ProjectFilePath, QPair<QString, QString>> defaultPaths;
static const QMap<ProjectIdentifier, QString> defaultIdentifiers;
static const QMap<ProjectFilePath, QString> defaultPaths;
BaseGame::Version baseGameVersion = BaseGame::Version::none;
bool usePoryScript = false;
@@ -263,8 +265,8 @@ protected:
virtual void initializeFromEmpty() override;
private:
ProjectFilePath reverseDefaultPaths(const QString& str);
ProjectIdentifier reverseDefaultIdentifier(const QString& str);
static std::optional<ProjectFilePath> stringToProjectFilePath(const QString& str);
static std::optional<ProjectIdentifier> stringToProjectIdentifier(const QString& str);
std::shared_ptr<FieldManager> m_fm = nullptr;
QMap<ProjectIdentifier, QString> identifiers;

2
include/ui/projectsettingseditor.h
View File

@@ -53,7 +53,7 @@ private:
void setBorderMetatileIds(bool customSize, QList<uint16_t> metatileIds);
QList<uint16_t> getBorderMetatileIds(bool customSize);
void createConfigTextTable(const QList<QPair<QString, QString>> configPairs, bool filesTab);
void addToConfigTextTable(const QString& idName, const QString& defaultText, bool filesTab);
void createProjectPathsTable();
void createProjectIdentifiersTable();
QString chooseProjectFile(const QString &defaultFilepath);