Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-13 04:15:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

New map popup/prompt to dialog

Browse Source
This commit is contained in:
GriffinR
2024-11-12 13:23:15 -05:00
parent acaed90d65
commit 9d87ece663
6 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/mainwindow.h
View File

@@ -22,7 +22,7 @@
#include "mapimageexporter.h"
#include "filterchildrenproxymodel.h"
#include "maplistmodels.h"
#include "newmappopup.h"
#include "newmapdialog.h"
#include "newtilesetdialog.h"
#include "shortcutseditor.h"
#include "preferenceeditor.h"
@@ -186,7 +186,7 @@ private slots:
void onLayoutChanged(Layout *layout);
void onOpenConnectedMap(MapConnection*);
void onTilesetsSaved(QString, QString);
void openNewMapPopupWindow();
void openNewMapDialog();
void onNewMapCreated();
void onMapLoaded(Map *map);
void importMapFromAdvanceMap1_92();
@@ -313,7 +313,7 @@ private:
QPointer<RegionMapEditor> regionMapEditor = nullptr;
QPointer<ShortcutsEditor> shortcutsEditor = nullptr;
QPointer<MapImageExporter> mapImageExporter = nullptr;
QPointer<NewMapPopup> newMapPrompt = nullptr;
QPointer<NewMapDialog> newMapDialog = nullptr;
QPointer<PreferenceEditor> preferenceEditor = nullptr;
QPointer<ProjectSettingsEditor> projectSettingsEditor = nullptr;
QPointer<GridSettingsDialog> gridSettingsDialog = nullptr;

18
include/ui/newmappopup.h → include/ui/newmapdialog.h
View File

@@ -1,22 +1,22 @@
#ifndef NEWMAPPOPUP_H
#define NEWMAPPOPUP_H
#ifndef NEWMAPDIALOG_H
#define NEWMAPDIALOG_H
#include <QMainWindow>
#include <QDialog>
#include <QString>
#include "editor.h"
#include "project.h"
#include "map.h"
namespace Ui {
class NewMapPopup;
class NewMapDialog;
}
class NewMapPopup : public QMainWindow
class NewMapDialog : public QDialog
{
Q_OBJECT
public:
explicit NewMapPopup(QWidget *parent = nullptr, Project *project = nullptr);
~NewMapPopup();
explicit NewMapDialog(QWidget *parent = nullptr, Project *project = nullptr);
~NewMapDialog();
Map *map;
int group;
bool existingLayout;
@@ -32,7 +32,7 @@ signals:
void applied();
private:
Ui::NewMapPopup *ui;
Ui::NewMapDialog *ui;
Project *project;
bool checkNewMapDimensions();
bool checkNewMapGroup();
@@ -67,4 +67,4 @@ private slots:
void on_lineEdit_NewMap_Name_textChanged(const QString &);
};
#endif // NEWMAPPOPUP_H
#endif // NEWMAPDIALOG_H