New LEVEL3.

Improvements.

3 files changed, 25 insertions, 6 deletions

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

 #include <QInputDialog>

 #include <QMessageBox>

+#include <QShortcut>

 

 #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);

diff --git a/Source/MapEditor/mainwindow.h b/Source/MapEditor/mainwindow.h
index 5d4cfe5..40963c9 100644
--- a/Source/MapEditor/mainwindow.h
+++ b/Source/MapEditor/mainwindow.h
@@ -6,6 +6,7 @@
 #include <QSettings>

 #include <QDebug>

 #include <QPixmap>

+#include <QShortcut>

 

 #include "mygraphicsscene.h"

 #include "ui_mainwindow.h"

@@ -46,6 +47,8 @@ private:
     int selected_item;

     QHash<int, QString> tilesetData;

     QList<QGraphicsTextItem*> textItems;

+    QShortcut tileSet;

+    QShortcut tileMoveUp;

 

 private slots:

     void loadMap(void);

@@ -58,6 +61,7 @@ private slots:
     void onShowNumbers(int);

     void onAirportNameModified(QString);

     void showError(const QString& error);

+    void moveUp(void);

 };

 

 #endif // MAINWINDOW_H

diff --git a/Source/MapEditor/mainwindow.ui b/Source/MapEditor/mainwindow.ui
index bb88a34..eb25f97 100644
--- a/Source/MapEditor/mainwindow.ui
+++ b/Source/MapEditor/mainwindow.ui
@@ -77,7 +77,7 @@
            <string>Show numbers on map</string>

           </property>

           <property name="checked">

-           <bool>true</bool>

+           <bool>false</bool>

           </property>

          </widget>

         </item>