diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index b42acbaf..6448478f 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -378,8 +378,8 @@
0
0
- 469
- 608
+ 481
+ 606
@@ -687,8 +687,8 @@
0
0
- 324
- 77
+ 300
+ 70
@@ -799,8 +799,8 @@
0
0
- 307
- 387
+ 304
+ 372
@@ -1116,8 +1116,8 @@
0
0
- 381
- 657
+ 385
+ 655
@@ -1294,8 +1294,8 @@
0
0
- 432
- 596
+ 428
+ 586
@@ -1914,8 +1914,8 @@
0
0
- 826
- 557
+ 829
+ 552
@@ -2087,7 +2087,7 @@
0
0
1117
- 21
+ 20
@@ -2268,6 +2270,11 @@
P
+
+
+ Tileset Editor
+
+
diff --git a/src/porymap.pro b/src/porymap.pro
index 2bfd2dcc..e9b476e5 100644
--- a/src/porymap.pro
+++ b/src/porymap.pro
@@ -44,7 +44,8 @@ SOURCES += core/block.cpp \
mainwindow.cpp \
project.cpp \
settings.cpp \
- ui/mapsceneeventfilter.cpp
+ ui/mapsceneeventfilter.cpp \
+ ui/tileseteditor.cpp
HEADERS += core/block.h \
core/blockdata.h \
@@ -77,10 +78,12 @@ HEADERS += core/block.h \
mainwindow.h \
project.h \
settings.h \
- ui/mapsceneeventfilter.h
+ ui/mapsceneeventfilter.h \
+ ui/tileseteditor.h
FORMS += mainwindow.ui \
- eventpropertiesframe.ui
+ eventpropertiesframe.ui \
+ tileseteditor.ui
RESOURCES += \
resources/images.qrc
diff --git a/src/tileseteditor.ui b/src/tileseteditor.ui
new file mode 100644
index 00000000..81727bc1
--- /dev/null
+++ b/src/tileseteditor.ui
@@ -0,0 +1,232 @@
+
+
+ TilesetEditor
+
+
+
+ 0
+ 0
+ 1022
+ 386
+
+
+
+ Dialog
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+ true
+
+
+
+
+ 0
+ 0
+ 329
+ 339
+
+
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 26
+ 20
+
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 26
+ 20
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 120
+
+
+
+
+
+
+
+
+ -
+
+
+
+ 2
+ 0
+
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
-
+
+
+
+ 1
+ 0
+
+
+
+ true
+
+
+
+
+ 0
+ 0
+ 316
+ 319
+
+
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 21
+ 20
+
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 21
+ 20
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 100
+
+
+
+
+
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ TilesetEditor
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ TilesetEditor
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp
new file mode 100644
index 00000000..b4be9766
--- /dev/null
+++ b/src/ui/tileseteditor.cpp
@@ -0,0 +1,14 @@
+#include "tileseteditor.h"
+#include "ui_tileseteditor.h"
+
+TilesetEditor::TilesetEditor(QWidget *parent) :
+ QDialog(parent),
+ ui(new Ui::TilesetEditor)
+{
+ ui->setupUi(this);
+}
+
+TilesetEditor::~TilesetEditor()
+{
+ delete ui;
+}
diff --git a/src/ui/tileseteditor.h b/src/ui/tileseteditor.h
new file mode 100644
index 00000000..7befc465
--- /dev/null
+++ b/src/ui/tileseteditor.h
@@ -0,0 +1,22 @@
+#ifndef TILESETEDITOR_H
+#define TILESETEDITOR_H
+
+#include
+
+namespace Ui {
+class TilesetEditor;
+}
+
+class TilesetEditor : public QDialog
+{
+ Q_OBJECT
+
+public:
+ explicit TilesetEditor(QWidget *parent = nullptr);
+ ~TilesetEditor();
+
+private:
+ Ui::TilesetEditor *ui;
+};
+
+#endif // TILESETEDITOR_H