From 8732d21ab9f64392461ccb981fe6132c787474ca Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Wed, 7 Feb 2018 00:30:15 +0200
Subject: [PATCH] introduce PlasmaComponents3.ComboBox in config

---
 .../package/contents/configuration/AppearanceConfig.qml  | 5 +++--
 shell/package/contents/configuration/BehaviorConfig.qml  | 3 ++-
 .../contents/configuration/LatteDockConfiguration.qml    | 3 ++-
 shell/package/contents/configuration/TasksConfig.qml     | 9 +++++----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/shell/package/contents/configuration/AppearanceConfig.qml b/shell/package/contents/configuration/AppearanceConfig.qml
index a15300937..46d73be82 100644
--- a/shell/package/contents/configuration/AppearanceConfig.qml
+++ b/shell/package/contents/configuration/AppearanceConfig.qml
@@ -26,6 +26,7 @@ import QtQuick.Dialogs 1.2
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.plasmoid 2.0
 
 import org.kde.latte 0.1 as Latte
@@ -68,7 +69,7 @@ PlasmaComponents.Page {
                 Layout.rightMargin: units.smallSpacing * 2
                 spacing: units.smallSpacing
 
-                PlasmaComponents.ComboBox {
+                PlasmaComponents3.ComboBox {
                     id: layoutCmb
                     Layout.fillWidth: true
 
@@ -862,7 +863,7 @@ PlasmaComponents.Page {
                         text:" "
                         enabled: showAppletShadow.checked
 
-                        PlasmaComponents.ComboBox {
+                        PlasmaComponents3.ComboBox {
                             id: restoreCmb
                             anchors.fill: parent
                             enabled: backColorBtn.enabled
diff --git a/shell/package/contents/configuration/BehaviorConfig.qml b/shell/package/contents/configuration/BehaviorConfig.qml
index 60ba9ea11..164bc254f 100644
--- a/shell/package/contents/configuration/BehaviorConfig.qml
+++ b/shell/package/contents/configuration/BehaviorConfig.qml
@@ -25,6 +25,7 @@ import QtGraphicalEffects 1.0
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.plasmoid 2.0
 
 import org.kde.latte 0.1 as Latte
@@ -130,7 +131,7 @@ PlasmaComponents.Page {
                     Layout.alignment: Qt.AlignRight
                 }
 
-                PlasmaComponents.ComboBox {
+                PlasmaComponents3.ComboBox {
                     id: screenCmb
                     Layout.fillWidth: true
                     Component.onCompleted: screenRow.updateScreens();
diff --git a/shell/package/contents/configuration/LatteDockConfiguration.qml b/shell/package/contents/configuration/LatteDockConfiguration.qml
index 8fd9c0d36..e8481e8b3 100644
--- a/shell/package/contents/configuration/LatteDockConfiguration.qml
+++ b/shell/package/contents/configuration/LatteDockConfiguration.qml
@@ -26,6 +26,7 @@ import QtQuick.Window 2.2
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import QtQuick.Controls.Styles.Plasma 2.0 as Styles
 
@@ -382,7 +383,7 @@ FocusScope {
                 Layout.fillWidth: true
                 text:" "
 
-                PlasmaComponents.ComboBox {
+                PlasmaComponents3.ComboBox {
                     id: actionsCmb
                     anchors.fill: parent
                     enabled: addDock.enabled
diff --git a/shell/package/contents/configuration/TasksConfig.qml b/shell/package/contents/configuration/TasksConfig.qml
index 9f2b8fe90..987b282c4 100644
--- a/shell/package/contents/configuration/TasksConfig.qml
+++ b/shell/package/contents/configuration/TasksConfig.qml
@@ -24,6 +24,7 @@ import QtGraphicalEffects 1.0
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.plasmoid 2.0
 
 import org.kde.latte 0.1 as Latte
@@ -169,7 +170,7 @@ PlasmaComponents.Page {
                     Layout.alignment: Qt.AlignRight
                 }
 
-                PlasmaComponents.ComboBox {
+                PlasmaComponents3.ComboBox {
                     id: middleClickAction
                     Layout.fillWidth: true
                     model: [i18nc("The click action", "None"), i18n("Close Window or Group"),
@@ -185,7 +186,7 @@ PlasmaComponents.Page {
                 spacing: units.smallSpacing
                 visible: plasmoid.configuration.advanced
 
-                PlasmaComponents.ComboBox {
+                PlasmaComponents3.ComboBox {
                     id: modifier
                     Layout.maximumWidth: theme.mSize(theme.defaultFont).width * 5
                     model: ["Shift", "Ctrl", "Alt", "Meta"]
@@ -198,7 +199,7 @@ PlasmaComponents.Page {
                     text: "+"
                 }
 
-                PlasmaComponents.ComboBox {
+                PlasmaComponents3.ComboBox {
                     id: modifierClick
                     Layout.maximumWidth: theme.mSize(theme.defaultFont).width * 10
                     model: [i18n("Left Click"), i18n("Middle Click"), i18n("Right Click")]
@@ -211,7 +212,7 @@ PlasmaComponents.Page {
                     text: "="
                 }
 
-                PlasmaComponents.ComboBox {
+                PlasmaComponents3.ComboBox {
                     id: modifierClickAction
                     Layout.fillWidth: true
                     model: [i18nc("The click action", "None"), i18n("Close Window or Group"),