atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Start work on tileset editor

Browse source
This commit is contained in:
Diegoisawesome 2018-09-30 13:51:50 -05:00
parent 02fd5bbea6
commit f767d257f0
5 changed files with 294 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/mainwindow.ui
View file

@ -378,8 +378,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>469</width>
<height>608</height>
<width>481</width>
<height>606</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_8">
@ -687,8 +687,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>324</width>
<height>77</height>
<width>300</width>
<height>70</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7">
@ -799,8 +799,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>307</width>
<height>387</height>
<width>304</width>
<height>372</height>
</rect>
</property>
<property name="sizePolicy">
@ -1116,8 +1116,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>381</width>
<height>657</height>
<width>385</width>
<height>655</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_7">
@ -1294,8 +1294,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>432</width>
<height>596</height>
<width>428</width>
<height>586</height>
</rect>
</property>
<property name="sizePolicy">
@ -1914,8 +1914,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>826</width>
<height>557</height>
<width>829</width>
<height>552</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_14">
@ -2087,7 +2087,7 @@
<x>0</x>
<y>0</y>
<width>1117</width>
<height>21</height>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@ -2127,6 +2127,8 @@
<addaction name="actionEyedropper"/>
<addaction name="actionMove"/>
<addaction name="actionMap_Shift"/>
<addaction name="separator"/>
<addaction name="actionTileset_Editor"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuEdit"/>
@ -2268,6 +2270,11 @@
<string>P</string>
</property>
</action>
<action name="actionTileset_Editor">
<property name="text">
<string>Tileset Editor</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>

9
src/porymap.pro
View file

@ -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

232
src/tileseteditor.ui Normal file
View file

@ -0,0 +1,232 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>TilesetEditor</class>
<widget class="QDialog" name="TilesetEditor">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1022</width>
<height>386</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>329</width>
<height>339</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>26</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QGraphicsView" name="graphicsView"/>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>26</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>120</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
<item row="0" column="1">
<widget class="QFrame" name="frame_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QScrollArea" name="scrollArea_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>316</width>
<height>319</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>21</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QGraphicsView" name="graphicsView_2"/>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>21</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>100</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>TilesetEditor</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>TilesetEditor</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

14
src/ui/tileseteditor.cpp Normal file
View file

@ -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;
}

22
src/ui/tileseteditor.h Normal file
View file

@ -0,0 +1,22 @@
#ifndef TILESETEDITOR_H
#define TILESETEDITOR_H
#include <QDialog>
namespace Ui {
class TilesetEditor;
}
class TilesetEditor : public QDialog
{
Q_OBJECT
public:
explicit TilesetEditor(QWidget *parent = nullptr);
~TilesetEditor();
private:
Ui::TilesetEditor *ui;
};
#endif // TILESETEDITOR_H