From 8fb12bdbcf90bc10e25b5030710bd0dd357b9b57 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Fri, 26 Jan 2018 18:26:20 +0200
Subject: [PATCH] improvements to new Latte config window

---
 app/CMakeLists.txt                            |  4 +-
 app/dockview.cpp                              |  3 +-
 app/globalshortcuts.cpp                       | 14 ++--
 app/globalshortcuts.h                         |  2 +-
 ...configdialog.cpp => latteconfigdialog.cpp} | 82 +++++++++----------
 ...youtconfigdialog.h => latteconfigdialog.h} | 16 ++--
 ...utconfigdialog.ui => latteconfigdialog.ui} | 37 ++++++---
 app/layoutmanager.cpp                         | 14 ++--
 app/layoutmanager.h                           | 10 +--
 .../activitycmbboxdelegate.cpp                |  2 +-
 app/layoutsDelegates/activitycmbboxdelegate.h |  4 +-
 plasmoid/package/contents/ui/ContextMenu.qml  |  2 +-
 .../configuration/AppearanceConfig.qml        |  2 +-
 13 files changed, 103 insertions(+), 89 deletions(-)
 rename app/{layoutconfigdialog.cpp => latteconfigdialog.cpp} (93%)
 rename app/{layoutconfigdialog.h => latteconfigdialog.h} (90%)
 rename app/{layoutconfigdialog.ui => latteconfigdialog.ui} (95%)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e3669d280..b0342eb7a 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -17,7 +17,7 @@ set(lattedock-app_SRCS
     universalsettings.cpp
     layoutmanager.cpp
     layout.cpp
-    layoutconfigdialog.cpp
+    latteconfigdialog.cpp
     importer.cpp
     layoutsDelegates/checkboxdelegate.cpp
     layoutsDelegates/colorcmbboxdelegate.cpp
@@ -30,7 +30,7 @@ set(lattedock-app_SRCS
 
 set(latte_dbusXML dbus/org.kde.LatteDock.xml)
 qt5_add_dbus_adaptor(lattedock-app_SRCS ${latte_dbusXML} dockcorona.h Latte::DockCorona lattedockadaptor)
-ki18n_wrap_ui(lattedock-app_SRCS layoutconfigdialog.ui)
+ki18n_wrap_ui(lattedock-app_SRCS latteconfigdialog.ui)
 
 add_executable(latte-dock ${lattedock-app_SRCS})
 
diff --git a/app/dockview.cpp b/app/dockview.cpp
index 812a6792e..ddefad2bd 100644
--- a/app/dockview.cpp
+++ b/app/dockview.cpp
@@ -107,6 +107,7 @@ DockView::DockView(Plasma::Corona *corona, QScreen *targetScreen, bool dockWindo
         removeAction->setVisible(false);
         QAction *configureAction = containment()->actions()->action("configure");
         configureAction->setShortcut(QKeySequence());
+        configureAction->setText(i18nc("dock/panel settings window", "Dock/Panel Settings"));
         //containment()->actions()->removeAction(removeAction);
         //FIX: hide and not delete in order to disable a nasty behavior from
         //ContainmentInterface. If only one action exists for containment the
@@ -2234,7 +2235,7 @@ void DockView::addContainmentActions(QMenu *desktopMenu, QEvent *event)
             QAction *editLayoutsAction = new QAction(i18n("Configure..."), layoutsMenu);
 
             connect(editLayoutsAction, &QAction::triggered, this, [this, dockCorona] {
-                dockCorona->layoutManager()->showLayoutConfigDialog();
+                dockCorona->layoutManager()->showLatteConfigDialog();
             });
 
             layoutsMenu->addAction(editLayoutsAction);
diff --git a/app/globalshortcuts.cpp b/app/globalshortcuts.cpp
index 1e4b56afd..33c5f74fe 100644
--- a/app/globalshortcuts.cpp
+++ b/app/globalshortcuts.cpp
@@ -179,20 +179,20 @@ void GlobalShortcuts::init()
     });
 
     //show-cycle between Latte settings windows
-    QAction *settingsAction = generalActions->addAction(QStringLiteral("show settings window"));
-    settingsAction->setText(i18n("Show Settings Window"));
+    QAction *settingsAction = generalActions->addAction(QStringLiteral("show dock settings"));
+    settingsAction->setText(i18n("Show Dock Settings"));
     KGlobalAccel::setGlobalShortcut(settingsAction, QKeySequence(Qt::META + Qt::Key_A));
     connect(settingsAction, &QAction::triggered, this, [this] {
         showSettings();
     });
 
     //show the layouts editor
-    QAction *layoutsAction = generalActions->addAction(QStringLiteral("show layouts editor"));
-    layoutsAction->setText(i18n("Show Layouts Editor"));
+    QAction *layoutsAction = generalActions->addAction(QStringLiteral("show latte settings"));
+    layoutsAction->setText(i18n("Show Latte Settings Window"));
     layoutsAction->setShortcut(QKeySequence(Qt::META + Qt::Key_E));
     KGlobalAccel::setGlobalShortcut(layoutsAction, QKeySequence(Qt::META + Qt::Key_E));
     connect(layoutsAction, &QAction::triggered, this, [this]() {
-        showLayoutsEditor();
+        showLatteConfigDialog();
     });
 
 
@@ -490,9 +490,9 @@ void GlobalShortcuts::showDock()
     }
 }
 
-void GlobalShortcuts::showLayoutsEditor()
+void GlobalShortcuts::showLatteConfigDialog()
 {
-    m_corona->layoutManager()->showLayoutConfigDialog();
+    m_corona->layoutManager()->showLatteConfigDialog();
 }
 
 bool GlobalShortcuts::dockAtLowerScreenPriority(DockView *test, DockView *base)
diff --git a/app/globalshortcuts.h b/app/globalshortcuts.h
index 2beb7420d..4a47be53d 100644
--- a/app/globalshortcuts.h
+++ b/app/globalshortcuts.h
@@ -52,7 +52,7 @@ private:
     void activateTaskManagerEntry(int index, Qt::Key modifier);
     void showDock();
     void hideDock();
-    void showLayoutsEditor();
+    void showLatteConfigDialog();
     void showSettings();
 
     bool dockAtLowerEdgePriority(DockView *test, DockView *base);
diff --git a/app/layoutconfigdialog.cpp b/app/latteconfigdialog.cpp
similarity index 93%
rename from app/layoutconfigdialog.cpp
rename to app/latteconfigdialog.cpp
index 0a2b0dec5..24d8ce2d2 100644
--- a/app/layoutconfigdialog.cpp
+++ b/app/latteconfigdialog.cpp
@@ -19,8 +19,8 @@
  *
  */
 
-#include "ui_layoutconfigdialog.h"
-#include "layoutconfigdialog.h"
+#include "ui_latteconfigdialog.h"
+#include "latteconfigdialog.h"
 #include "layout.h"
 #include "layoutsDelegates/checkboxdelegate.h"
 #include "layoutsDelegates/colorcmbboxdelegate.h"
@@ -54,23 +54,21 @@ const int MENUCOLUMN = 3;
 const int ACTIVITYCOLUMN = 4;
 const QChar CheckMark{0x2714};
 
-LayoutConfigDialog::LayoutConfigDialog(QWidget *parent, LayoutManager *manager)
+LatteConfigDialog::LatteConfigDialog(QWidget *parent, LayoutManager *manager)
     : QDialog(parent),
-      ui(new Ui::LayoutConfigDialog),
+      ui(new Ui::LatteConfigDialog),
       m_manager(manager)
 {
     ui->setupUi(this);
 
-    setWindowTitle(i18n("Layouts Editor"));
-
     setAttribute(Qt::WA_DeleteOnClose, true);
     setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
     resize(m_manager->corona()->universalSettings()->layoutsWindowSize());
 
     connect(ui->buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked
-            , this, &LayoutConfigDialog::apply);
+            , this, &LatteConfigDialog::apply);
     connect(ui->buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked
-            , this, &LayoutConfigDialog::restoreDefaults);
+            , this, &LatteConfigDialog::restoreDefaults);
 
     m_model = new QStandardItemModel(manager->layouts().count(), 5, this);
 
@@ -82,8 +80,8 @@ LayoutConfigDialog::LayoutConfigDialog(QWidget *parent, LayoutManager *manager)
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
 
-    connect(m_manager, &LayoutManager::currentLayoutNameChanged, this, &LayoutConfigDialog::layoutsChanged);
-    connect(m_manager, &LayoutManager::activeLayoutsChanged, this, &LayoutConfigDialog::layoutsChanged);
+    connect(m_manager, &LayoutManager::currentLayoutNameChanged, this, &LatteConfigDialog::layoutsChanged);
+    connect(m_manager, &LayoutManager::activeLayoutsChanged, this, &LatteConfigDialog::layoutsChanged);
 
     loadLayouts();
 
@@ -111,8 +109,8 @@ LayoutConfigDialog::LayoutConfigDialog(QWidget *parent, LayoutManager *manager)
     m_inMemoryButtons->addButton(ui->multipleToolBtn, Latte::Dock::MultipleLayouts);
     m_inMemoryButtons->setExclusive(true);
 
-    connect(m_model, &QStandardItemModel::itemChanged, this, &LayoutConfigDialog::itemChanged);
-    connect(ui->layoutsView->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &LayoutConfigDialog::currentRowChanged);
+    connect(m_model, &QStandardItemModel::itemChanged, this, &LatteConfigDialog::itemChanged);
+    connect(ui->layoutsView->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &LatteConfigDialog::currentRowChanged);
 
     connect(m_inMemoryButtons, QOverload<QAbstractButton *>::of(&QButtonGroup::buttonPressed),
     [ = ](QAbstractButton * button) {
@@ -122,7 +120,7 @@ LayoutConfigDialog::LayoutConfigDialog(QWidget *parent, LayoutManager *manager)
 
 }
 
-LayoutConfigDialog::~LayoutConfigDialog()
+LatteConfigDialog::~LatteConfigDialog()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -147,17 +145,17 @@ LayoutConfigDialog::~LayoutConfigDialog()
     }
 }
 
-QStringList LayoutConfigDialog::activities()
+QStringList LatteConfigDialog::activities()
 {
     return m_manager->activities();
 }
 
-QStringList LayoutConfigDialog::availableActivities()
+QStringList LatteConfigDialog::availableActivities()
 {
     return m_availableActivities;
 }
 
-void LayoutConfigDialog::on_newButton_clicked()
+void LatteConfigDialog::on_newButton_clicked()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -176,7 +174,7 @@ void LayoutConfigDialog::on_newButton_clicked()
     }
 }
 
-void LayoutConfigDialog::on_copyButton_clicked()
+void LatteConfigDialog::on_copyButton_clicked()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -217,7 +215,7 @@ void LayoutConfigDialog::on_copyButton_clicked()
     ui->layoutsView->selectRow(row + 1);
 }
 
-void LayoutConfigDialog::on_downloadButton_clicked()
+void LatteConfigDialog::on_downloadButton_clicked()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -245,7 +243,7 @@ void LayoutConfigDialog::on_downloadButton_clicked()
     }
 }
 
-void LayoutConfigDialog::on_removeButton_clicked()
+void LatteConfigDialog::on_removeButton_clicked()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -272,7 +270,7 @@ void LayoutConfigDialog::on_removeButton_clicked()
     ui->layoutsView->selectRow(row);
 }
 
-void LayoutConfigDialog::on_importButton_clicked()
+void LatteConfigDialog::on_importButton_clicked()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -360,7 +358,7 @@ void LayoutConfigDialog::on_importButton_clicked()
     fileDialog->open();
 }
 
-bool LayoutConfigDialog::importLayoutsFromV1ConfigFile(QString file)
+bool LatteConfigDialog::importLayoutsFromV1ConfigFile(QString file)
 {
     KTar archive(file, QStringLiteral("application/x-tar"));
     archive.open(QIODevice::ReadOnly);
@@ -399,7 +397,7 @@ bool LayoutConfigDialog::importLayoutsFromV1ConfigFile(QString file)
 }
 
 
-void LayoutConfigDialog::on_exportButton_clicked()
+void LatteConfigDialog::on_exportButton_clicked()
 {
     int row = ui->layoutsView->currentIndex().row();
 
@@ -496,7 +494,7 @@ void LayoutConfigDialog::on_exportButton_clicked()
     fileDialog->open();
 }
 
-void LayoutConfigDialog::accept()
+void LatteConfigDialog::accept()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -506,21 +504,21 @@ void LayoutConfigDialog::accept()
     }
 }
 
-void LayoutConfigDialog::reject()
+void LatteConfigDialog::reject()
 {
     qDebug() << Q_FUNC_INFO;
 
     deleteLater();
 }
 
-void LayoutConfigDialog::apply()
+void LatteConfigDialog::apply()
 {
     qDebug() << Q_FUNC_INFO;
     saveAllChanges();
     updateButtonsState();
 }
 
-void LayoutConfigDialog::restoreDefaults()
+void LatteConfigDialog::restoreDefaults()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -536,7 +534,7 @@ void LayoutConfigDialog::restoreDefaults()
     }
 }
 
-void LayoutConfigDialog::addLayoutForFile(QString file, QString layoutName, bool newTempDirectory, bool showNotification)
+void LatteConfigDialog::addLayoutForFile(QString file, QString layoutName, bool newTempDirectory, bool showNotification)
 {
     if (layoutName.isEmpty()) {
         layoutName = Layout::layoutName(file);
@@ -574,7 +572,7 @@ void LayoutConfigDialog::addLayoutForFile(QString file, QString layoutName, bool
     }
 }
 
-void LayoutConfigDialog::loadLayouts()
+void LatteConfigDialog::loadLayouts()
 {
     m_initLayoutPaths.clear();
     m_model->clear();
@@ -642,7 +640,7 @@ void LayoutConfigDialog::loadLayouts()
     }
 }
 
-void LayoutConfigDialog::insertLayoutInfoAtRow(int row, QString path, QString color, QString name, bool menu, QStringList activities)
+void LatteConfigDialog::insertLayoutInfoAtRow(int row, QString path, QString color, QString name, bool menu, QStringList activities)
 {
     QStandardItem *pathItem = new QStandardItem(path);
 
@@ -704,7 +702,7 @@ void LayoutConfigDialog::insertLayoutInfoAtRow(int row, QString path, QString co
 }
 
 
-void LayoutConfigDialog::on_switchButton_clicked()
+void LatteConfigDialog::on_switchButton_clicked()
 {
     Latte::Dock::LayoutsMemoryUsage inMemoryOption = static_cast<Latte::Dock::LayoutsMemoryUsage>(m_inMemoryButtons->checkedId());
 
@@ -721,7 +719,7 @@ void LayoutConfigDialog::on_switchButton_clicked()
     }
 }
 
-void LayoutConfigDialog::layoutsChanged()
+void LatteConfigDialog::layoutsChanged()
 {
     for (int i = 0; i < m_model->rowCount(); ++i) {
         QModelIndex nameIndex = m_model->index(i, NAMECOLUMN);
@@ -749,7 +747,7 @@ void LayoutConfigDialog::layoutsChanged()
     }
 }
 
-void LayoutConfigDialog::itemChanged(QStandardItem *item)
+void LatteConfigDialog::itemChanged(QStandardItem *item)
 {
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
     ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(true);
@@ -760,12 +758,12 @@ void LayoutConfigDialog::itemChanged(QStandardItem *item)
     }
 }
 
-void LayoutConfigDialog::currentRowChanged(const QModelIndex &current, const QModelIndex &previous)
+void LatteConfigDialog::currentRowChanged(const QModelIndex &current, const QModelIndex &previous)
 {
     updateButtonsState();
 }
 
-void LayoutConfigDialog::updateButtonsState()
+void LatteConfigDialog::updateButtonsState()
 {
     QString id = m_model->data(m_model->index(ui->layoutsView->currentIndex().row(), IDCOLUMN), Qt::DisplayRole).toString();
     QString name = m_layouts[id]->name();
@@ -783,7 +781,7 @@ void LayoutConfigDialog::updateButtonsState()
     }
 }
 
-void LayoutConfigDialog::recalculateAvailableActivities()
+void LatteConfigDialog::recalculateAvailableActivities()
 {
     QStringList tempActivities = m_manager->activities();
 
@@ -800,7 +798,7 @@ void LayoutConfigDialog::recalculateAvailableActivities()
     m_availableActivities = tempActivities;
 }
 
-bool LayoutConfigDialog::dataAreAccepted()
+bool LatteConfigDialog::dataAreAccepted()
 {
     for (int i = 0; i < m_model->rowCount(); ++i) {
         QString layout1 = m_model->data(m_model->index(i, NAMECOLUMN), Qt::DisplayRole).toString();
@@ -836,7 +834,7 @@ bool LayoutConfigDialog::dataAreAccepted()
     return true;
 }
 
-bool LayoutConfigDialog::saveAllChanges()
+bool LatteConfigDialog::saveAllChanges()
 {
     if (!dataAreAccepted()) {
         return false;
@@ -977,7 +975,7 @@ bool LayoutConfigDialog::saveAllChanges()
     return true;
 }
 
-bool LayoutConfigDialog::idExistsInModel(QString id)
+bool LatteConfigDialog::idExistsInModel(QString id)
 {
     for (int i = 0; i < m_model->rowCount(); ++i) {
         QString rowId = m_model->data(m_model->index(i, IDCOLUMN), Qt::DisplayRole).toString();
@@ -990,7 +988,7 @@ bool LayoutConfigDialog::idExistsInModel(QString id)
     return false;
 }
 
-bool LayoutConfigDialog::nameExistsInModel(QString name)
+bool LatteConfigDialog::nameExistsInModel(QString name)
 {
     for (int i = 0; i < m_model->rowCount(); ++i) {
         QString rowName = m_model->data(m_model->index(i, NAMECOLUMN), Qt::DisplayRole).toString();
@@ -1003,7 +1001,7 @@ bool LayoutConfigDialog::nameExistsInModel(QString name)
     return false;
 }
 
-int LayoutConfigDialog::ascendingRowFor(QString name)
+int LatteConfigDialog::ascendingRowFor(QString name)
 {
     for (int i = 0; i < m_model->rowCount(); ++i) {
         QString rowName = m_model->data(m_model->index(i, NAMECOLUMN), Qt::DisplayRole).toString();
@@ -1016,7 +1014,7 @@ int LayoutConfigDialog::ascendingRowFor(QString name)
     return m_model->rowCount();
 }
 
-QString LayoutConfigDialog::uniqueTempDirectory()
+QString LatteConfigDialog::uniqueTempDirectory()
 {
     QTemporaryDir tempDir;
     tempDir.setAutoRemove(false);
@@ -1025,7 +1023,7 @@ QString LayoutConfigDialog::uniqueTempDirectory()
     return tempDir.path();
 }
 
-QString LayoutConfigDialog::uniqueLayoutName(QString name)
+QString LatteConfigDialog::uniqueLayoutName(QString name)
 {
     int pos_ = name.lastIndexOf(QRegExp(QString("[-][0-9]+")));
 
diff --git a/app/layoutconfigdialog.h b/app/latteconfigdialog.h
similarity index 90%
rename from app/layoutconfigdialog.h
rename to app/latteconfigdialog.h
index 5ad5af51f..a246a5e1b 100644
--- a/app/layoutconfigdialog.h
+++ b/app/latteconfigdialog.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef LAYOUTCONFIGDIALOG_H
-#define LAYOUTCONFIGDIALOG_H
+#ifndef LATTECONFIGDIALOG_H
+#define LATTECONFIGDIALOG_H
 
 #include "layoutmanager.h"
 #include "layout.h"
@@ -32,7 +32,7 @@
 #include <QStandardItemModel>
 
 namespace Ui {
-class LayoutConfigDialog;
+class LatteConfigDialog;
 }
 
 namespace KActivities {
@@ -46,11 +46,11 @@ class Layout;
 
 namespace Latte {
 
-class LayoutConfigDialog : public QDialog {
+class LatteConfigDialog : public QDialog {
     Q_OBJECT
 public:
-    LayoutConfigDialog(QWidget *parent, LayoutManager *corona);
-    ~LayoutConfigDialog();
+    LatteConfigDialog(QWidget *parent, LayoutManager *corona);
+    ~LatteConfigDialog();
 
     QStringList activities();
     QStringList availableActivities();
@@ -101,11 +101,11 @@ private:
     LayoutManager *m_manager{nullptr};
 
     QStandardItemModel *m_model{nullptr};
-    Ui::LayoutConfigDialog *ui;
+    Ui::LatteConfigDialog *ui;
 
     QHash<const QString, Layout *> m_layouts;
 };
 
 }
 
-#endif // LAYOUTCONFIGDIALOG_H
+#endif // LATTECONFIGDIALOG_H
diff --git a/app/layoutconfigdialog.ui b/app/latteconfigdialog.ui
similarity index 95%
rename from app/layoutconfigdialog.ui
rename to app/latteconfigdialog.ui
index bc4a5ef5e..115de7586 100644
--- a/app/layoutconfigdialog.ui
+++ b/app/latteconfigdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>LayoutConfigDialog</class>
- <widget class="QDialog" name="LayoutConfigDialog">
+ <class>LatteConfigDialog</class>
+ <widget class="QDialog" name="LatteConfigDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -11,13 +11,13 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string/>
+   <string comment="latte settings window">Settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="layoutsTab">
       <attribute name="title">
@@ -102,7 +102,7 @@
               <bool>false</bool>
              </property>
              <attribute name="horizontalHeaderVisible">
-              <bool>false</bool>
+              <bool>true</bool>
              </attribute>
              <attribute name="horizontalHeaderCascadingSectionResizes">
               <bool>true</bool>
@@ -176,6 +176,9 @@
               </item>
               <item>
                <widget class="QPushButton" name="newButton">
+                <property name="toolTip">
+                 <string>New layout</string>
+                </property>
                 <property name="text">
                  <string comment="new layout">New</string>
                 </property>
@@ -187,6 +190,9 @@
               </item>
               <item>
                <widget class="QPushButton" name="copyButton">
+                <property name="toolTip">
+                 <string>Copy layout</string>
+                </property>
                 <property name="text">
                  <string comment="copy layout">Copy</string>
                 </property>
@@ -201,6 +207,9 @@
               </item>
               <item>
                <widget class="QPushButton" name="removeButton">
+                <property name="toolTip">
+                 <string>Remove layout</string>
+                </property>
                 <property name="text">
                  <string comment="remove layout">Remove</string>
                 </property>
@@ -290,7 +299,7 @@
               <item>
                <widget class="QPushButton" name="exportButton">
                 <property name="toolTip">
-                 <string>Export layout of full configuration</string>
+                 <string>Export layout or full configuration</string>
                 </property>
                 <property name="text">
                  <string comment="export layout">Export</string>
@@ -337,7 +346,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="settingsTab">
+     <widget class="QWidget" name="preferencesTab">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
         <horstretch>0</horstretch>
@@ -345,7 +354,7 @@
        </sizepolicy>
       </property>
       <attribute name="title">
-       <string>Settings</string>
+       <string>Preferences</string>
       </attribute>
       <layout class="QHBoxLayout" name="horizontalLayout_4">
        <property name="rightMargin">
@@ -576,6 +585,9 @@
                      <verstretch>0</verstretch>
                     </sizepolicy>
                    </property>
+                   <property name="toolTip">
+                    <string>Low sensitivity for parabolic effect (low cpu usage)</string>
+                   </property>
                    <property name="text">
                     <string comment="low sensitivity">Low</string>
                    </property>
@@ -589,6 +601,9 @@
                      <verstretch>0</verstretch>
                     </sizepolicy>
                    </property>
+                   <property name="toolTip">
+                    <string>Medium sensitivity for parabolic effect (normal cpu usage)</string>
+                   </property>
                    <property name="text">
                     <string comment="medium sensitivity">Medium</string>
                    </property>
@@ -603,7 +618,7 @@
                     </sizepolicy>
                    </property>
                    <property name="toolTip">
-                    <string/>
+                    <string>High sensitivity for parabolic effect (high cpu usage)</string>
                    </property>
                    <property name="text">
                     <string comment="high sensitivity">High</string>
@@ -654,7 +669,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>LayoutConfigDialog</receiver>
+   <receiver>LatteConfigDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -670,7 +685,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>LayoutConfigDialog</receiver>
+   <receiver>LatteConfigDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/app/layoutmanager.cpp b/app/layoutmanager.cpp
index cdf805e70..81fe3438c 100644
--- a/app/layoutmanager.cpp
+++ b/app/layoutmanager.cpp
@@ -1019,18 +1019,18 @@ bool LayoutManager::layoutIsAssigned(QString layoutName)
     return false;
 }
 
-void LayoutManager::showLayoutConfigDialog()
+void LayoutManager::showLatteConfigDialog()
 {
-    if (!m_layoutConfigDialog)
-        m_layoutConfigDialog = new LayoutConfigDialog(nullptr, this);
+    if (!m_latteConfigDialog)
+        m_latteConfigDialog = new LatteConfigDialog(nullptr, this);
 
-    m_layoutConfigDialog->show();
+    m_latteConfigDialog->show();
 
-    if (m_layoutConfigDialog->isMinimized()) {
-        m_layoutConfigDialog->showNormal();
+    if (m_latteConfigDialog->isMinimized()) {
+        m_latteConfigDialog->showNormal();
     }
 
-    m_layoutConfigDialog->activateWindow();
+    m_latteConfigDialog->activateWindow();
 }
 
 void LayoutManager::showInfoWindow(QString info, int duration, QStringList activities)
diff --git a/app/layoutmanager.h b/app/layoutmanager.h
index 80c02d37a..7b2259bdc 100644
--- a/app/layoutmanager.h
+++ b/app/layoutmanager.h
@@ -23,7 +23,7 @@
 
 #include "importer.h"
 #include "layout.h"
-#include "layoutconfigdialog.h"
+#include "latteconfigdialog.h"
 #include "launcherssignals.h"
 
 #include <QAction>
@@ -34,7 +34,7 @@
 class DockCorona;
 class Importer;
 class Layout;
-class LayoutConfigDialog;
+class LatteConfigDialog;
 class LaunchersSignals;
 
 namespace KActivities {
@@ -105,7 +105,7 @@ public:
     void importPresets(bool includeDefault = false);
 
 public slots:
-    Q_INVOKABLE void showLayoutConfigDialog();
+    Q_INVOKABLE void showLatteConfigDialog();
 
     //! switch to specified layout, default previousMemoryUsage means that it didnt change
     Q_INVOKABLE bool switchToLayout(QString layoutName, int previousMemoryUsage = -1);
@@ -168,7 +168,7 @@ private:
 
     QAction *m_addWidgetsAction{nullptr};
 
-    QPointer<LayoutConfigDialog> m_layoutConfigDialog;
+    QPointer<LatteConfigDialog> m_latteConfigDialog;
 
     QHash<const QString, QString> m_assignedLayouts;
 
@@ -181,7 +181,7 @@ private:
 
     KActivities::Controller *m_activitiesController;
 
-    friend class LayoutConfigDialog;
+    friend class LatteConfigDialog;
 };
 
 }
diff --git a/app/layoutsDelegates/activitycmbboxdelegate.cpp b/app/layoutsDelegates/activitycmbboxdelegate.cpp
index bd1cdf545..2671b4436 100644
--- a/app/layoutsDelegates/activitycmbboxdelegate.cpp
+++ b/app/layoutsDelegates/activitycmbboxdelegate.cpp
@@ -13,7 +13,7 @@
 ActivityCmbBoxDelegate::ActivityCmbBoxDelegate(QObject *parent)
     : QItemDelegate(parent)
 {
-    auto *configDialog = qobject_cast<Latte::LayoutConfigDialog *>(parent);
+    auto *configDialog = qobject_cast<Latte::LatteConfigDialog *>(parent);
 
     if (configDialog) {
         m_configDialog = configDialog;
diff --git a/app/layoutsDelegates/activitycmbboxdelegate.h b/app/layoutsDelegates/activitycmbboxdelegate.h
index bdafca412..b015b55be 100644
--- a/app/layoutsDelegates/activitycmbboxdelegate.h
+++ b/app/layoutsDelegates/activitycmbboxdelegate.h
@@ -1,7 +1,7 @@
 #ifndef ACTIVITYCMBBOXDELEGATE_H
 #define ACTIVITYCMBBOXDELEGATE_H
 
-#include "../layoutconfigdialog.h"
+#include "../latteconfigdialog.h"
 
 #include <QItemDelegate>
 
@@ -27,7 +27,7 @@ public:
 private:
     QString assignedActivitiesText(const QModelIndex &index) const;
 
-    Latte::LayoutConfigDialog *m_configDialog{nullptr};
+    Latte::LatteConfigDialog *m_configDialog{nullptr};
 };
 
 #endif
diff --git a/plasmoid/package/contents/ui/ContextMenu.qml b/plasmoid/package/contents/ui/ContextMenu.qml
index b7ac1858d..4978ce89a 100644
--- a/plasmoid/package/contents/ui/ContextMenu.qml
+++ b/plasmoid/package/contents/ui/ContextMenu.qml
@@ -876,7 +876,7 @@ PlasmaComponents.ContextMenu {
                 var configureItem = menu.newMenuItem(layoutsMenu);
                 configureItem.text = i18n("Configure...");
                 configureItem.clicked.connect(function() {
-                    latteDock.universalLayoutManager.showLayoutConfigDialog();
+                    latteDock.universalLayoutManager.showLatteConfigDialog();
                 });
 
             }
diff --git a/shell/package/contents/configuration/AppearanceConfig.qml b/shell/package/contents/configuration/AppearanceConfig.qml
index 38b69352e..474a954d0 100644
--- a/shell/package/contents/configuration/AppearanceConfig.qml
+++ b/shell/package/contents/configuration/AppearanceConfig.qml
@@ -119,7 +119,7 @@ PlasmaComponents.Page {
                     iconSource: "document-edit"
                     Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
 
-                    onClicked: layoutManager.showLayoutConfigDialog()
+                    onClicked: layoutManager.showLatteConfigDialog()
                 }
             }
         }