From 05fd28b2dc2a1bfa78ed0228ae5f58db5b9288dd Mon Sep 17 00:00:00 2001
From: Martijn Vogelaar <martijn.j.vogelaar@outlook.com>
Date: Wed, 29 Jul 2020 09:06:00 +0000
Subject: [PATCH] fix #10,Delete button deletes layout.

---
 app/settings/dialogs/settingsdialog.cpp     |  7 -------
 app/settings/dialogs/settingsdialog.h       |  1 -
 app/settings/handlers/tablayoutshandler.cpp | 10 +---------
 app/settings/handlers/tablayoutshandler.h   |  1 -
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/app/settings/dialogs/settingsdialog.cpp b/app/settings/dialogs/settingsdialog.cpp
index bd1a4a4c0..eb553ecfd 100644
--- a/app/settings/dialogs/settingsdialog.cpp
+++ b/app/settings/dialogs/settingsdialog.cpp
@@ -611,14 +611,7 @@ void SettingsDialog::dropEvent(QDropEvent *event)
     }
 }
 
-void SettingsDialog::keyReleaseEvent(QKeyEvent *event)
-{
-    if (event && currentPage() == LayoutPage){
-        m_tabLayoutsHandler->on_keyReleaseEvent(event);
-    }
 
-    QDialog::keyReleaseEvent(event);
-}
 
 void SettingsDialog::updateWindowActivities()
 {
diff --git a/app/settings/dialogs/settingsdialog.h b/app/settings/dialogs/settingsdialog.h
index 8c4c87a29..5bacacbae 100644
--- a/app/settings/dialogs/settingsdialog.h
+++ b/app/settings/dialogs/settingsdialog.h
@@ -92,7 +92,6 @@ protected:
     void dragLeaveEvent(QDragLeaveEvent *event) override;
     void dragMoveEvent(QDragMoveEvent *event) override;
     void dropEvent(QDropEvent *event) override;
-    void keyReleaseEvent(QKeyEvent *event) override;
 
 private slots:
     void on_import_fullconfiguration();
diff --git a/app/settings/handlers/tablayoutshandler.cpp b/app/settings/handlers/tablayoutshandler.cpp
index 9c42e8de6..cf391c7d4 100644
--- a/app/settings/handlers/tablayoutshandler.cpp
+++ b/app/settings/handlers/tablayoutshandler.cpp
@@ -150,7 +150,7 @@ void TabLayouts::initLayoutMenu()
     m_removeLayoutAction = m_layoutMenu->addAction(i18nc("remove layout", "Remove"));
     m_removeLayoutAction->setToolTip(i18n("Remove selected layout"));
     m_removeLayoutAction->setIcon(QIcon::fromTheme("delete"));
-    m_removeLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D));
+    m_removeLayoutAction->setShortcut(QKeySequence(Qt::Key_Delete));
     connectActionWithButton(m_ui->removeButton, m_removeLayoutAction);
     connect(m_removeLayoutAction, &QAction::triggered, this, &TabLayouts::on_remove_layout);
 
@@ -772,14 +772,6 @@ void TabLayouts::on_dropEvent(QDropEvent *event)
     }
 }
 
-void TabLayouts::on_keyReleaseEvent(QKeyEvent *event)
-{
-    if (event && event->key() == Qt::Key_Delete && m_parentDialog->currentPage() == Dialog::LayoutPage){
-        //! Disabled because it deletes a layout when the user is editing its layout name and presses Delete
-        //! there must be a way to block that deletion
-        //on_remove_layout();
-    }
-}
 
 void TabLayouts::loadConfig()
 {
diff --git a/app/settings/handlers/tablayoutshandler.h b/app/settings/handlers/tablayoutshandler.h
index a18ac6b12..491cb4155 100644
--- a/app/settings/handlers/tablayoutshandler.h
+++ b/app/settings/handlers/tablayoutshandler.h
@@ -82,7 +82,6 @@ public slots:
     void on_dragLeaveEvent(QDragLeaveEvent *event);
     void on_dragMoveEvent(QDragMoveEvent *event);
     void on_dropEvent(QDropEvent *event);
-    void on_keyReleaseEvent(QKeyEvent *event);
 
 private slots:
     void initUi();