Deselect (Ctrl+Shift+A) (#83)

* Feature: Edit > Deselect * Better deselect icon
ExplosBlue · Sep 12, 2023 · e97a9d9 · e97a9d9
1 parent 1fba89c
commit e97a9d9
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 0 deletions.
diff --git a/coinkiller_data/icons/deselect.png b/coinkiller_data/icons/deselect.png
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -48,6 +48,7 @@ class LevelView : public QWidget
     void paste();
     void cut();
     void selectAll();
+    void deselect();
     void deleteSel();
     void raise();
     void lower();