Use qt components instead of plasma components in the config dialog

dfaust · Apr 17, 2016 · 83e47e9 · 83e47e9
1 parent 0332974
commit 83e47e9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/package/contents/ui/config/AppMenuDialog.qml b/package/contents/ui/config/AppMenuDialog.qml
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http: //www.gnu.org/licenses/>.
  */
 import QtQuick 2.2
+import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 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.extras 2.0 as PlasmaExtras
 
 Dialog {
     id: appMenuDialog
@@ -41,7 +41,7 @@ Dialog {
         id: appsModel
     }
 
-    PlasmaExtras.ScrollArea {
+    ScrollView {
         width: parent.width
         height: 400
 
@@ -94,7 +94,7 @@ Dialog {
                             }
                         }
 
-                        PlasmaComponents.Label {
+                        Label {
                             text: appsSource.data[desktop].name
                             height: parent.height
                             verticalAlignment: Text.AlignVCenter
@@ -112,7 +112,7 @@ Dialog {
                     anchors.fill: parent
                     color: theme.complementaryBackgroundColor
 
-                    PlasmaComponents.Label {
+                    Label {
                         x: units.smallSpacing
                         y: 0
                         width: parent.width - 2*units.smallSpacing

diff --git a/package/contents/ui/config/ConfigGeneral.qml b/package/contents/ui/config/ConfigGeneral.qml
@@ -19,7 +19,6 @@ import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.0
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 
 Item {
@@ -37,15 +36,15 @@ Item {
     GridLayout {
         columns: 2
 
-        PlasmaComponents.Label {
+        Label {
             text: i18n('Title:')
         }
 
         TextField {
             id: title
         }
 
-        PlasmaComponents.Label {
+        Label {
             text: i18n('Icon:')
         }
 
@@ -54,8 +53,8 @@ Item {
                 id: icon
             }
 
-            PlasmaComponents.Button {
-                iconSource: 'folder'
+            Button {
+                iconName: 'folder'
                 onClicked: {
                     iconDialog.open()
                 }
@@ -70,9 +69,14 @@ Item {
             Rectangle {
                 width: 200
                 height: 200
-                color: theme.viewBackgroundColor
+                border {
+                    width: 1
+                    color: "lightgrey"
+                }
+                radius: 2
+                color: "#20FFFFFF"
 
-                PlasmaExtras.ScrollArea {
+                ScrollView {
                     anchors.fill: parent
 
                     ListView {
@@ -118,7 +122,7 @@ Item {
                                         }
                                     }
 
-                                    PlasmaComponents.Label {
+                                    Label {
                                         text: appsSource.data[modelData].name
                                         height: parent.height
                                         verticalAlignment: Text.AlignVCenter
@@ -250,18 +254,18 @@ Item {
                 }
             }
 
-            PlasmaComponents.Button {
+            Button {
                 id: addAppButton
                 anchors.right: parent.right
                 text: i18n('Add application')
-                iconSource: 'list-add'
+                iconName: 'list-add'
                 onClicked: {
                     appMenuDialog.open()
                 }
             }        
         }
 
-        PlasmaComponents.Label {
+        Label {
             text: i18n('Widget width:')
         }