From f89b110a36cb3baac609aedc2c9070218b1a8fdf Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sun, 12 May 2019 17:36:15 +0300
Subject: [PATCH] drop Meta+E that is used from Dolphin

---
 app/layouts/manager.cpp           | 10 +++++++---
 app/settings/settingsdialog.cpp   |  8 ++++----
 app/settings/settingsdialog.h     |  2 +-
 app/shortcuts/globalshortcuts.cpp | 16 +++-------------
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/app/layouts/manager.cpp b/app/layouts/manager.cpp
index 5cd52aac7..20d1b9696 100644
--- a/app/layouts/manager.cpp
+++ b/app/layouts/manager.cpp
@@ -418,18 +418,22 @@ void Manager::importPreset(int presetNo, bool newInstanceIfPresent)
 
 void Manager::showLatteSettingsDialog(int page)
 {
+    bool created{false};
+
     if (!m_latteSettingsDialog) {
         m_latteSettingsDialog = new SettingsDialog(nullptr, m_corona);
+        created = true;
     }
-
     m_latteSettingsDialog->show();
 
     if (m_latteSettingsDialog->isMinimized()) {
         m_latteSettingsDialog->showNormal();
     }
 
-    Types::LatteConfigPage configPage = static_cast<Types::LatteConfigPage>(page);
-    m_latteSettingsDialog->setCurrentPage(configPage);
+    if (!created) {
+        Types::LatteConfigPage configPage = static_cast<Types::LatteConfigPage>(page);
+        m_latteSettingsDialog->toggleCurrentPage();
+    }
 
     m_latteSettingsDialog->activateWindow();
 }
diff --git a/app/settings/settingsdialog.cpp b/app/settings/settingsdialog.cpp
index d07dbe5da..a2bb5b7cb 100644
--- a/app/settings/settingsdialog.cpp
+++ b/app/settings/settingsdialog.cpp
@@ -329,12 +329,12 @@ QStringList SettingsDialog::availableSharesFor(int row)
     return availables;
 }
 
-void SettingsDialog::setCurrentPage(Types::LatteConfigPage page)
+void SettingsDialog::toggleCurrentPage()
 {
-    if (page == Types::LayoutPage) {
-        ui->tabWidget->setCurrentIndex(0);
-    } else if (page == Types::PreferencesPage) {
+    if (ui->tabWidget->currentIndex() == 0) {
         ui->tabWidget->setCurrentIndex(1);
+    } else {
+        ui->tabWidget->setCurrentIndex(0);
     }
 }
 
diff --git a/app/settings/settingsdialog.h b/app/settings/settingsdialog.h
index dea065c50..cf1341bec 100644
--- a/app/settings/settingsdialog.h
+++ b/app/settings/settingsdialog.h
@@ -55,7 +55,7 @@ public:
     SettingsDialog(QWidget *parent, Latte::Corona *corona);
     ~SettingsDialog();
 
-    void setCurrentPage(Types::LatteConfigPage page);
+    void toggleCurrentPage();
 
     void addActivityInCurrent(const QString &activityId);
     void removeActivityFromCurrent(const QString &activityId);
diff --git a/app/shortcuts/globalshortcuts.cpp b/app/shortcuts/globalshortcuts.cpp
index df40701c5..84bb788fb 100644
--- a/app/shortcuts/globalshortcuts.cpp
+++ b/app/shortcuts/globalshortcuts.cpp
@@ -105,7 +105,7 @@ void GlobalShortcuts::init()
 
     //show-cycle between Latte settings windows
     QAction *settingsAction = generalActions->addAction(QStringLiteral("show view settings"));
-    settingsAction->setText(i18n("Show Latte View Settings"));
+    settingsAction->setText(i18n("Show Latte Dock/Panel Settings"));
     KGlobalAccel::setGlobalShortcut(settingsAction, QKeySequence(Qt::META + Qt::Key_A));
     connect(settingsAction, &QAction::triggered, this, [this] {
         m_modifierTracker->cancelMetaPressed();
@@ -113,8 +113,8 @@ void GlobalShortcuts::init()
     });
 
     //show the layouts editor
-    QAction *layoutsAction = generalActions->addAction(QStringLiteral("show layout settings"));
-    layoutsAction->setText(i18n("Show Layout Settings"));
+    QAction *layoutsAction = generalActions->addAction(QStringLiteral("show latte global settings"));
+    layoutsAction->setText(i18n("Show Latte Global Settings"));
     layoutsAction->setShortcut(QKeySequence(Qt::META + Qt::Key_W));
     KGlobalAccel::setGlobalShortcut(layoutsAction, QKeySequence(Qt::META + Qt::Key_W));
     connect(layoutsAction, &QAction::triggered, this, [this]() {
@@ -122,16 +122,6 @@ void GlobalShortcuts::init()
         m_corona->layoutsManager()->showLatteSettingsDialog(Types::LayoutPage);
     });
 
-    //show the latter universal settings
-    QAction *universalSettingsAction = generalActions->addAction(QStringLiteral("show latte universal settings"));
-    universalSettingsAction->setText(i18n("Show Latte Settings"));
-    universalSettingsAction->setShortcut(QKeySequence(Qt::META + Qt::Key_E));
-    KGlobalAccel::setGlobalShortcut(universalSettingsAction, QKeySequence(Qt::META + Qt::Key_E));
-    connect(universalSettingsAction, &QAction::triggered, this, [this]() {
-        m_modifierTracker->cancelMetaPressed();
-        m_corona->layoutsManager()->showLatteSettingsDialog(Types::PreferencesPage);
-    });
-
     KActionCollection *taskbarActions = new KActionCollection(m_corona);
 
     //activate actions [1-9]