From 6c687dd30b552d646c87c2361394a1183ef5281a Mon Sep 17 00:00:00 2001 From: Xavier ASUS Date: Sat, 24 Nov 2018 13:03:52 +0100 Subject: New LEVEL3. Improvements. --- Source/MapEditor/mainwindow.cpp | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'Source/MapEditor/mainwindow.cpp') diff --git a/Source/MapEditor/mainwindow.cpp b/Source/MapEditor/mainwindow.cpp index 2509c49..3758925 100644 --- a/Source/MapEditor/mainwindow.cpp +++ b/Source/MapEditor/mainwindow.cpp @@ -4,13 +4,16 @@ #include #include #include +#include #define DEFAULT_AIRPORT_NAME QByteArray("Default Airport\0") MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), level_size(0), - selected_item(-1) + selected_item(-1), + tileSet(tr("Space"), this), + tileMoveUp(tr("Up"), this) { ui.setupUi(this); this->setWindowTitle(APP_FULL_NAME); @@ -21,9 +24,13 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui.showNumbers_Checkbox, SIGNAL(stateChanged(int)), this, SLOT(onShowNumbers(int))); connect(ui.airportName_Label, SIGNAL(textChanged(QString)), this, SLOT(onAirportNameModified(QString))); - connect(&gscene, SIGNAL(positionClicked(QPointF)), this, SLOT(onMapItemClicked(QPointF))); - connect(&gscene, SIGNAL(noItemSelected(void)), this, SLOT(onNoItemSelected(void))); - connect(&gscene, SIGNAL(updateSelectedItem(void)), this, SLOT(onListItemSelected(void))); + connect(&gscene, SIGNAL(positionClicked(QPointF)), this, SLOT(onMapItemClicked(QPointF))); + connect(&gscene, SIGNAL(noItemSelected(void)), this, SLOT(onNoItemSelected(void))); + connect(&gscene, SIGNAL(updateSelectedItem(void)), this, SLOT(onListItemSelected(void))); + + // Configure keyboard shortcuts. + connect(&tileSet, SIGNAL(activated()), this, SLOT(onListItemSelected(void))); + connect(&tileMoveUp, SIGNAL(activated(void)), this, SLOT(moveUp(void))); appSettings(); loadTilesetData(); @@ -34,7 +41,10 @@ MainWindow::~MainWindow() { foreach (QGraphicsTextItem* it, textItems) { - delete it; + if (it != nullptr) + { + delete it; + } } } @@ -477,6 +487,11 @@ void MainWindow::onAirportNameModified(QString name) } } +void MainWindow::moveUp(void) +{ + +} + void MainWindow::showError(const QString& error) { QMessageBox::critical(this, APP_FULL_NAME, error); -- cgit v1.2.3