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

Add warning for warp behaviors

Browse Source
This commit is contained in:
GriffinR
2023-11-07 12:35:31 -05:00
parent 60fb1a246e
commit 5d4d88d11e
11 changed files with 163 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/events.h
View File

@@ -345,6 +345,8 @@ public:
void setDestinationWarpID(QString newDestinationWarpID) { this->destinationWarpID = newDestinationWarpID; }
QString getDestinationWarpID() { return this->destinationWarpID; }
void setWarningEnabled(bool enabled);
private:
QString destinationMap;
QString destinationWarpID;

4
include/editor.h
View File

@@ -103,7 +103,8 @@ public:
QList<DraggablePixmapItem *> getObjects();
void updateCursorRectPos(int x, int y);
void setCursorRectVisible(bool visible);
void updateWarpEventWarning(Event *event);
void updateWarpEventWarnings();
bool eventLimitReached(Map *, Event::Type);
QGraphicsScene *scene = nullptr;
@@ -189,6 +190,7 @@ private:
static bool startDetachedProcess(const QString &command,
const QString &workingDirectory = QString(),
qint64 *pid = nullptr);
void constructBehaviorValueList(); // TODO: Remove
private slots:
void onMapStartPaint(QGraphicsSceneMouseEvent *event, MapPixmapItem *item);

1
include/mainwindow.h
View File

@@ -159,6 +159,7 @@ public:
public slots:
void on_mainTabBar_tabBarClicked(int index);
void on_mapViewTab_tabBarClicked(int index);
void openProjectSettingsEditor(int tab);
private slots:
void on_action_Open_Project_triggered();

22
include/ui/eventframes.h
View File

@@ -6,6 +6,7 @@
#include "noscrollspinbox.h"
#include "noscrollcombobox.h"
#include "mainwindow.h"
#include "events.h"
@@ -22,7 +23,7 @@ public:
virtual void setup();
void initCustomAttributesTable();
virtual void connectSignals();
virtual void connectSignals(MainWindow *);
virtual void initialize();
virtual void populate(Project *project);
@@ -69,7 +70,7 @@ public:
virtual void setup() override;
virtual void initialize() override;
virtual void connectSignals() override;
virtual void connectSignals(MainWindow *) override;
virtual void populate(Project *project) override;
public:
@@ -101,7 +102,7 @@ public:
virtual void setup() override;
virtual void initialize() override;
virtual void connectSignals() override;
virtual void connectSignals(MainWindow *) override;
virtual void populate(Project *project) override;
public:
@@ -124,12 +125,13 @@ public:
virtual void setup() override;
virtual void initialize() override;
virtual void connectSignals() override;
virtual void connectSignals(MainWindow *) override;
virtual void populate(Project *project) override;
public:
NoScrollComboBox *combo_dest_map;
NoScrollComboBox *combo_dest_warp;
QPushButton *warning;
private:
WarpEvent *warp;
@@ -146,7 +148,7 @@ public:
virtual void setup() override;
virtual void initialize() override;
virtual void connectSignals() override;
virtual void connectSignals(MainWindow *) override;
virtual void populate(Project *project) override;
public:
@@ -171,7 +173,7 @@ public:
virtual void setup() override;
virtual void initialize() override;
virtual void connectSignals() override;
virtual void connectSignals(MainWindow *) override;
virtual void populate(Project *project) override;
public:
@@ -192,7 +194,7 @@ public:
virtual void setup() override;
virtual void initialize() override;
virtual void connectSignals() override;
virtual void connectSignals(MainWindow *) override;
virtual void populate(Project *project) override;
public:
@@ -216,7 +218,7 @@ public:
virtual void setup() override;
virtual void initialize() override;
virtual void connectSignals() override;
virtual void connectSignals(MainWindow *) override;
virtual void populate(Project *project) override;
public:
@@ -242,7 +244,7 @@ public:
virtual void setup() override;
virtual void initialize() override;
virtual void connectSignals() override;
virtual void connectSignals(MainWindow *) override;
virtual void populate(Project *project) override;
public:
@@ -263,7 +265,7 @@ public:
virtual void setup() override;
virtual void initialize() override;
virtual void connectSignals() override;
virtual void connectSignals(MainWindow *) override;
virtual void populate(Project *project) override;
public:

3
include/ui/projectsettingseditor.h
View File

@@ -21,6 +21,9 @@ public:
explicit ProjectSettingsEditor(QWidget *parent = nullptr, Project *project = nullptr);
~ProjectSettingsEditor();
static const int warpBehaviorsTab;
void setTab(int index);
signals:
void reloadProject();