Rename objectpropertiesframe to eventpropertiesframe and move to ui/
This commit is contained in:
parent
45f5024d11
commit
473cca4eee
6 changed files with 43 additions and 43 deletions
|
@ -2,7 +2,7 @@
|
|||
#include "ui_mainwindow.h"
|
||||
#include "project.h"
|
||||
#include "editor.h"
|
||||
#include "objectpropertiesframe.h"
|
||||
#include "eventpropertiesframe.h"
|
||||
#include "ui_objectpropertiesframe.h"
|
||||
|
||||
#include <QDebug>
|
||||
|
@ -695,10 +695,10 @@ void MainWindow::updateSelectedObjects() {
|
|||
|
||||
QMap<QString, int> event_obj_gfx_constants = editor->project->getEventObjGfxConstants();
|
||||
|
||||
QList<ObjectPropertiesFrame *> frames;
|
||||
QList<EventPropertiesFrame *> frames;
|
||||
|
||||
for (DraggablePixmapItem *item : *events) {
|
||||
ObjectPropertiesFrame *frame = new ObjectPropertiesFrame;
|
||||
EventPropertiesFrame *frame = new EventPropertiesFrame;
|
||||
// frame->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
|
||||
QSpinBox *x = frame->ui->spinBox_x;
|
||||
|
@ -925,7 +925,7 @@ void MainWindow::updateSelectedObjects() {
|
|||
ui->scrollArea_4->setWidgetResizable(true);
|
||||
ui->scrollArea_4->setWidget(target);
|
||||
|
||||
for (ObjectPropertiesFrame *frame : frames) {
|
||||
for (EventPropertiesFrame *frame : frames) {
|
||||
layout->addWidget(frame);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
#include "objectpropertiesframe.h"
|
||||
#include "ui_objectpropertiesframe.h"
|
||||
|
||||
ObjectPropertiesFrame::ObjectPropertiesFrame(QWidget *parent) :
|
||||
QFrame(parent),
|
||||
ui(new Ui::ObjectPropertiesFrame)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
}
|
||||
|
||||
ObjectPropertiesFrame::~ObjectPropertiesFrame()
|
||||
{
|
||||
delete ui;
|
||||
}
|
|
@ -22,6 +22,7 @@ SOURCES += core/block.cpp \
|
|||
core/metatile.cpp \
|
||||
core/tile.cpp \
|
||||
core/tileset.cpp \
|
||||
ui/eventpropertiesframe.cpp \
|
||||
ui/metatileselector.cpp \
|
||||
ui/movementpermissionsselector.cpp \
|
||||
ui/neweventtoolbutton.cpp \
|
||||
|
@ -34,7 +35,6 @@ SOURCES += core/block.cpp \
|
|||
main.cpp \
|
||||
mainwindow.cpp \
|
||||
map.cpp \
|
||||
objectpropertiesframe.cpp \
|
||||
parseutil.cpp \
|
||||
project.cpp
|
||||
|
||||
|
@ -48,6 +48,7 @@ HEADERS += core/block.h \
|
|||
core/metatile.h \
|
||||
core/tile.h \
|
||||
core/tileset.h \
|
||||
ui/eventpropertiesframe.h \
|
||||
ui/metatileselector.h \
|
||||
ui/movementpermissionsselector.h \
|
||||
ui/neweventtoolbutton.h \
|
||||
|
@ -59,12 +60,11 @@ HEADERS += core/block.h \
|
|||
graphicsview.h \
|
||||
mainwindow.h \
|
||||
map.h \
|
||||
objectpropertiesframe.h \
|
||||
parseutil.h \
|
||||
project.h
|
||||
|
||||
FORMS += mainwindow.ui \
|
||||
objectpropertiesframe.ui
|
||||
eventpropertiesframe.ui
|
||||
|
||||
RESOURCES += \
|
||||
resources/images.qrc
|
||||
|
|
14
ui/eventpropertiesframe.cpp
Normal file
14
ui/eventpropertiesframe.cpp
Normal file
|
@ -0,0 +1,14 @@
|
|||
#include "eventpropertiesframe.h"
|
||||
#include "ui_objectpropertiesframe.h"
|
||||
|
||||
EventPropertiesFrame::EventPropertiesFrame(QWidget *parent) :
|
||||
QFrame(parent),
|
||||
ui(new Ui::ObjectPropertiesFrame)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
}
|
||||
|
||||
EventPropertiesFrame::~EventPropertiesFrame()
|
||||
{
|
||||
delete ui;
|
||||
}
|
6
objectpropertiesframe.h → ui/eventpropertiesframe.h
Executable file → Normal file
6
objectpropertiesframe.h → ui/eventpropertiesframe.h
Executable file → Normal file
|
@ -7,13 +7,13 @@ namespace Ui {
|
|||
class ObjectPropertiesFrame;
|
||||
}
|
||||
|
||||
class ObjectPropertiesFrame : public QFrame
|
||||
class EventPropertiesFrame : public QFrame
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit ObjectPropertiesFrame(QWidget *parent = nullptr);
|
||||
~ObjectPropertiesFrame();
|
||||
explicit EventPropertiesFrame(QWidget *parent = nullptr);
|
||||
~EventPropertiesFrame();
|
||||
|
||||
public:
|
||||
Ui::ObjectPropertiesFrame *ui;
|
Loading…
Reference in a new issue