From 111d004e470fc0b6ed0c860246dbb5ee0479b86e Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Mon, 24 Jul 2017 17:56:07 +0300
Subject: [PATCH] add launchers in universal group also

---
 app/layoutsettings.cpp    |  6 +++---
 app/layoutsettings.h      |  2 +-
 app/universalsettings.cpp | 19 +++++++++++++++++++
 app/universalsettings.h   |  6 ++++++
 liblattedock/dock.h       |  7 +++++++
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/app/layoutsettings.cpp b/app/layoutsettings.cpp
index 037523956..e3f9f6682 100644
--- a/app/layoutsettings.cpp
+++ b/app/layoutsettings.cpp
@@ -149,12 +149,12 @@ QStringList LayoutSettings::launchers() const
     return m_launchers;
 }
 
-void LayoutSettings::setLaunchers(QStringList launchers)
+void LayoutSettings::setLaunchers(QStringList launcherList)
 {
-    if (m_launchers == launchers)
+    if (m_launchers == launcherList)
         return;
 
-    m_launchers = launchers;
+    m_launchers = launcherList;
 
     emit launchersChanged();
 }
diff --git a/app/layoutsettings.h b/app/layoutsettings.h
index bf46eefa7..709452651 100644
--- a/app/layoutsettings.h
+++ b/app/layoutsettings.h
@@ -63,7 +63,7 @@ public:
     void setActivities(QStringList activities);
 
     QStringList launchers() const;
-    void setLaunchers(QStringList launchers);
+    void setLaunchers(QStringList launcherList);
 
     static QString layoutName(const QString &fileName);
 
diff --git a/app/universalsettings.cpp b/app/universalsettings.cpp
index 46814757e..6f52dc214 100644
--- a/app/universalsettings.cpp
+++ b/app/universalsettings.cpp
@@ -31,6 +31,7 @@ UniversalSettings::UniversalSettings(KSharedConfig::Ptr config, QObject *parent)
 {
     connect(this, &UniversalSettings::currentLayoutNameChanged, this, &UniversalSettings::saveConfig);
     connect(this, &UniversalSettings::lastNonAssignedLayoutNameChanged, this, &UniversalSettings::saveConfig);
+    connect(this, &UniversalSettings::launchersChanged, this, &UniversalSettings::saveConfig);
     connect(this, &UniversalSettings::versionChanged, this, &UniversalSettings::saveConfig);
 }
 
@@ -114,6 +115,22 @@ void UniversalSettings::setLayoutsWindowSize(QSize size)
     emit layoutsWindowSizeChanged();
 }
 
+QStringList UniversalSettings::launchers() const
+{
+    return m_launchers;
+}
+
+void UniversalSettings::setLaunchers(QStringList launcherList)
+{
+    if (m_launchers == launcherList) {
+        return;
+    }
+
+    m_launchers = launcherList;
+    emit launchersChanged();
+}
+
+
 bool UniversalSettings::autostart() const
 {
     QFile autostartFile(QDir::homePath() + "/.config/autostart/org.kde.latte-dock.desktop");
@@ -158,6 +175,7 @@ void UniversalSettings::loadConfig()
     m_currentLayoutName = m_universalGroup.readEntry("currentLayout", QString());
     m_lastNonAssignedLayoutName = m_universalGroup.readEntry("lastNonAssignedLayout", QString());
     m_layoutsWindowSize = m_universalGroup.readEntry("layoutsWindowSize", QSize(700, 450));
+    m_launchers = m_universalGroup.readEntry("launchers", QStringList());
 }
 
 void UniversalSettings::saveConfig()
@@ -166,6 +184,7 @@ void UniversalSettings::saveConfig()
     m_universalGroup.writeEntry("currentLayout", m_currentLayoutName);
     m_universalGroup.writeEntry("lastNonAssignedLayout", m_lastNonAssignedLayoutName);
     m_universalGroup.writeEntry("layoutsWindowSize", m_layoutsWindowSize);
+    m_universalGroup.writeEntry("launchers", m_launchers);
 
     m_universalGroup.sync();
 }
diff --git a/app/universalsettings.h b/app/universalsettings.h
index 8ea487274..900957c46 100644
--- a/app/universalsettings.h
+++ b/app/universalsettings.h
@@ -38,6 +38,7 @@ class UniversalSettings : public QObject {
 
     Q_PROPERTY(QString currentLayoutName READ currentLayoutName WRITE setCurrentLayoutName NOTIFY currentLayoutNameChanged)
 
+    Q_PROPERTY(QStringList launchers READ launchers WRITE setLaunchers NOTIFY launchersChanged)
 public:
     UniversalSettings(KSharedConfig::Ptr config, QObject *parent = nullptr);
     ~UniversalSettings() override;
@@ -59,11 +60,15 @@ public:
     QSize layoutsWindowSize() const;
     void setLayoutsWindowSize(QSize);
 
+    QStringList launchers() const;
+    void setLaunchers(QStringList launcherList);
+
 signals:
     void autostartChanged();
     void currentLayoutNameChanged();
     void lastNonAssignedLayoutNameChanged();
     void layoutsWindowSizeChanged();
+    void launchersChanged();
     void versionChanged();
 
 private slots:
@@ -80,6 +85,7 @@ private:
     QString m_currentLayoutName;
     QString m_lastNonAssignedLayoutName;
     QSize m_layoutsWindowSize{700, 450};
+    QStringList m_launchers;
 
     KConfigGroup m_universalGroup;
     KSharedConfig::Ptr m_config;
diff --git a/liblattedock/dock.h b/liblattedock/dock.h
index 1aeb6146b..ab5c78a16 100644
--- a/liblattedock/dock.h
+++ b/liblattedock/dock.h
@@ -92,6 +92,13 @@ public:
         AllIndicator = 2
     };
     Q_ENUM(ActiveAppletIndicator)
+
+    enum LaunchersGroup {
+        UnigueLaunchers = 0,
+        LayoutLaunchers = 1,
+        GlobalLaunchers = 2
+    };
+    Q_ENUM(LaunchersGroup)
 };
 
 }//end of namespace