From e97a9d924d64e78c9dd6a495df41fba3496ab3ee Mon Sep 17 00:00:00 2001
From: Treeway <56928485+Treeway7@users.noreply.github.com>
Date: Tue, 12 Sep 2023 14:40:10 -0500
Subject: [PATCH] Deselect (Ctrl+Shift+A) (#83)

* Feature: Edit > Deselect

* Better deselect icon
---
 coinkiller_data/icons/deselect.png | Bin 0 -> 2982 bytes
 leveleditor/editmanager.cpp        |   5 +++++
 leveleditor/editmanager.h          |   1 +
 leveleditor/leveleditorwindow.cpp  |  10 ++++++++++
 leveleditor/leveleditorwindow.h    |   2 ++
 leveleditor/leveleditorwindow.ui   |  12 ++++++++++++
 leveleditor/levelview.cpp          |   6 ++++++
 leveleditor/levelview.h            |   1 +
 8 files changed, 37 insertions(+)
 create mode 100644 coinkiller_data/icons/deselect.png

diff --git a/coinkiller_data/icons/deselect.png b/coinkiller_data/icons/deselect.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4d4f73611d7722216c711941a0ecc5937417790
GIT binary patch
literal 2982
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
HhPwX%r=9VV

literal 0
HcmV?d00001

diff --git a/leveleditor/editmanager.cpp b/leveleditor/editmanager.cpp
index b76a3a3..a2235c2 100644
--- a/leveleditor/editmanager.cpp
+++ b/leveleditor/editmanager.cpp
@@ -886,6 +886,11 @@ void EditManager::selectAll()
     foreach (ProgressPath* path, level->progressPaths) foreach (ProgressPathNode* node, path->getNodes()) selectedObjects.append(node);
 }
 
+void EditManager::deselect()
+{
+    selectedObjects.clear();
+}
+
 void EditManager::selectZoneContents(Zone* zone)
 {
     selectAll();
diff --git a/leveleditor/editmanager.h b/leveleditor/editmanager.h
index 0c0d6a4..fdca9fc 100644
--- a/leveleditor/editmanager.h
+++ b/leveleditor/editmanager.h
@@ -50,6 +50,7 @@ class EditManager : public QObject
 
     void select(Object* obj);
     void selectAll();
+    void deselect();
 
     void selectZoneContents(Zone* zone);
 
diff --git a/leveleditor/leveleditorwindow.cpp b/leveleditor/leveleditorwindow.cpp
index a3a756c..da02109 100644
--- a/leveleditor/leveleditorwindow.cpp
+++ b/leveleditor/leveleditorwindow.cpp
@@ -66,6 +66,7 @@ LevelEditorWindow::LevelEditorWindow(LevelManager* lvlMgr, int initialArea) :
     ui->actionCopy->setIcon((QIcon(basePath + "copy.png")));
     ui->actionDelete->setIcon(QIcon(basePath + "delete.png"));
     ui->actionSelectAll->setIcon(QIcon(basePath + "select_all.png"));
+    ui->actionDeselect->setIcon(QIcon(basePath + "deselect.png"));
     ui->actionRaise->setIcon(QIcon(basePath + "raise.png"));
     ui->actionLower->setIcon(QIcon(basePath + "lower.png"));
     ui->actionRaiseLayer->setIcon(QIcon(basePath + "layer_up.png"));
@@ -423,6 +424,13 @@ void LevelEditorWindow::on_actionSelectAll_triggered()
     levelView->selectAll();
 }
 
+
+void LevelEditorWindow::on_actionDeselect_triggered()
+{
+    this->deselect();
+    levelView->deselect();
+}
+
 void LevelEditorWindow::on_actionRaise_triggered()
 {
     levelView->raise();
@@ -967,3 +975,5 @@ void LevelEditorWindow::paintEvent(QPaintEvent* evt)
     //ui->levelViewArea->horizontalScrollBar()->height()
 }
 #endif
+
+
diff --git a/leveleditor/leveleditorwindow.h b/leveleditor/leveleditorwindow.h
index ffa83ec..07dc3e9 100644
--- a/leveleditor/leveleditorwindow.h
+++ b/leveleditor/leveleditorwindow.h
@@ -128,6 +128,8 @@ private slots:
 
     void on_actionSelectAll_triggered();
 
+    void on_actionDeselect_triggered();
+
     void on_actionShowMinimap_toggled(bool checked);
 
     void on_actionShowToolbox_toggled(bool checked);
diff --git a/leveleditor/leveleditorwindow.ui b/leveleditor/leveleditorwindow.ui
index 4541233..df02002 100644
--- a/leveleditor/leveleditorwindow.ui
+++ b/leveleditor/leveleditorwindow.ui
@@ -106,6 +106,7 @@
     <addaction name="actionCopy"/>
     <addaction name="actionDelete"/>
     <addaction name="actionSelectAll"/>
+    <addaction name="actionDeselect"/>
     <addaction name="separator"/>
     <addaction name="actionRaise"/>
     <addaction name="actionLower"/>
@@ -550,6 +551,17 @@
     <string>Preferences</string>
    </property>
   </action>
+  <action name="actionDeselect">
+   <property name="text">
+    <string>Deselect</string>
+   </property>
+   <property name="toolTip">
+    <string>Deselect</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+A</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>
diff --git a/leveleditor/levelview.cpp b/leveleditor/levelview.cpp
index bcab501..23f1bc0 100644
--- a/leveleditor/levelview.cpp
+++ b/leveleditor/levelview.cpp
@@ -776,6 +776,12 @@ void LevelView::selectAll()
     update();
 }
 
+void LevelView::deselect()
+{
+    editManager->deselect();
+    update();
+}
+
 void LevelView::deleteSel()
 {
     editManager->deleteSelection();
diff --git a/leveleditor/levelview.h b/leveleditor/levelview.h
index 82e09a6..983e822 100644
--- a/leveleditor/levelview.h
+++ b/leveleditor/levelview.h
@@ -48,6 +48,7 @@ class LevelView : public QWidget
     void paste();
     void cut();
     void selectAll();
+    void deselect();
     void deleteSel();
     void raise();
     void lower();