[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [discover/kirigami] discover/qml: Adopt more Kirigami semantics
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2016-07-21 15:34:23
Message-ID: E1bQFzT-00066d-BA () code ! kde ! org
[Download RAW message or body]

Git commit 19c1d957a12d034ea36a8fee6a7556db7e3e94e0 by Aleix Pol.
Committed on 21/07/2016 at 15:20.
Pushed by apol into branch 'kirigami'.

Adopt more Kirigami semantics

Adopt Kirigami.Page in most pages
Use BaseListItem for the GridItem

M  +4    -2    discover/qml/ApplicationsListPage.qml
M  +2    -1    discover/qml/GridItem.qml
M  +2    -1    discover/qml/SourcesPage.qml

http://commits.kde.org/discover/19c1d957a12d034ea36a8fee6a7556db7e3e94e0

diff --git a/discover/qml/ApplicationsListPage.qml \
b/discover/qml/ApplicationsListPage.qml index d12b5ac..41852f1 100644
--- a/discover/qml/ApplicationsListPage.qml
+++ b/discover/qml/ApplicationsListPage.qml
@@ -24,8 +24,9 @@ import QtQuick.Window 2.2
 import "navigation.js" as Navigation
 import org.kde.discover.app 1.0
 import org.kde.discover 1.0
+import org.kde.kirigami 1.0 as Kirigami
 
-Item {
+Kirigami.Page {
     id: page
     readonly property var model: appsModel
     property alias category: appsModel.filteredCategory
@@ -44,7 +45,8 @@ Item {
     property Component header: category==null ? null : categoryHeaderComponent
     property Component extendedToolBar: null
     property var icon: category ? category.icon : search !== "" ? "edit-find" : \
                "go-home"
-    property string title: category ? category.name : ""
+    title: category ? category.name : ""
+
     onSearchChanged: appsModel.sortOrder = Qt.AscendingOrder
 
     
diff --git a/discover/qml/GridItem.qml b/discover/qml/GridItem.qml
index a05b0c3..bfc6422 100644
--- a/discover/qml/GridItem.qml
+++ b/discover/qml/GridItem.qml
@@ -21,6 +21,7 @@
 
 import QtQuick 2.1
 import org.kde.discover.app 1.0
+import org.kde.kirigami 1.0
 
 MouseArea {
     id: listItem
@@ -34,7 +35,7 @@ MouseArea {
 
     hoverEnabled: !Helpers.isCompact
 
-    Rectangle {
+    BasicListItem {
         anchors.fill: parent
         color: listItem.containsMouse || listItem.pressed ? listItem.highlightColor \
: DiscoverSystemPalette.button  border.color: DiscoverSystemPalette.mid
diff --git a/discover/qml/SourcesPage.qml b/discover/qml/SourcesPage.qml
index 9044083..b28c4ba 100644
--- a/discover/qml/SourcesPage.qml
+++ b/discover/qml/SourcesPage.qml
@@ -4,9 +4,10 @@ import QtQuick.Layouts 1.1
 import org.kde.discover 1.0
 import org.kde.discover.app 1.0
 import org.kde.kquickcontrolsaddons 2.0
+import org.kde.kirigami 1.0 as Kirigami
 import "navigation.js" as Navigation
 
-Item {
+Kirigami.Page {
     id: page
     clip: true
     readonly property real proposedMargin: (width-Helpers.actualWidth)/2


[prev in list] [next in list] [prev in thread] [next in thread]