Merge lp:~mardy/ubuntu-system-settings-online-accounts/listitems into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Don't use deprecated ListItems submodule

Don't use deprecated ListItems submodule

[lp:~mardy/ubuntu-system-settings-online-accounts/listitems]

423. By Alberto Mardegan on 2017-03-16

Disable tests on powerpc

[Alexandre Abreu (abreu-alexandre)]

LGTM

review: Approve

Unmerged revisions

423. By Alberto Mardegan on 2017-03-16

Disable tests on powerpc

422. By Alberto Mardegan on 2017-03-15

Don't use deprecated ListItems submodule

=== modified file 'debian/changelog'
--- debian/changelog	2017-03-08 11:37:22 +0000
+++ debian/changelog	2017-03-16 11:01:46 +0000
@@ -1,3 +1,11 @@
+ubuntu-system-settings-online-accounts (0.7+17.04.20170308.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - Disable tests on powerpc
+  * Don't use deprecated ListItems module
+
+ -- Alberto Mardegan <[e-mail]>  Thu, 16 Mar 2017 14:00:42 +0300
+
 ubuntu-system-settings-online-accounts (0.7+17.04.20170308.2-0ubuntu1) zesty; urgency=medium
 
   * debian/control:

=== modified file 'debian/rules'
--- debian/rules	2016-11-01 07:04:34 +0000
+++ debian/rules	2017-03-16 11:01:46 +0000
@@ -7,7 +7,8 @@
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # Skip tests on the archs they are known to be flaky with current configuration
-testskip_architectures :=
+# powerpc: https://bugs.launchpad.net/bugs/1673423
+testskip_architectures := powerpc
 
 override_dh_auto_configure:
 	dh_auto_configure -- \

=== modified file 'online-accounts-ui/qml/AuthorizationPage.qml'
--- online-accounts-ui/qml/AuthorizationPage.qml	2016-05-23 07:27:03 +0000
+++ online-accounts-ui/qml/AuthorizationPage.qml	2017-03-16 11:01:46 +0000
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Flickable {
     id: root

=== modified file 'online-accounts-ui/qml/SignOnUiDialog.qml'
--- online-accounts-ui/qml/SignOnUiDialog.qml	2015-11-06 08:08:29 +0000
+++ online-accounts-ui/qml/SignOnUiDialog.qml	2017-03-16 11:01:46 +0000
@@ -1,7 +1,24 @@
+/*
+ * Copyright (C) 2015-2017 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 import QtQuick 2.0
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Item {
     id: root
@@ -67,8 +84,9 @@
             anchors.right: parent.right
             visible: signonRequest.registerUrl.toString() !== ""
 
-            ListItem.ThinDivider {
+            ListItem {
                 anchors.bottom: registerUrlLabel.top
+                height: divider.height
             }
 
             Label {

=== modified file 'online-accounts-ui/qml/SignOnUiPage.qml'
--- online-accounts-ui/qml/SignOnUiPage.qml	2016-04-07 12:57:06 +0000
+++ online-accounts-ui/qml/SignOnUiPage.qml	2017-03-16 11:01:46 +0000
@@ -1,6 +1,23 @@
+/*
+ * Copyright (C) 2016-2017 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.OnlineAccounts.Plugin 1.0
 
 MainView {
@@ -24,11 +41,12 @@
             }
         }
 
-        ListItem.SingleControl {
+        ListItem {
             id: cancelButton
             anchors.bottom: parent.bottom
-            showDivider: false
-            control: Button {
+            divider.visible: false
+            Button {
+                anchors.centerIn: parent
                 text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
                 width: parent.width - units.gu(4)
                 onClicked: signonRequest.cancel()

=== modified file 'plugins/module/ErrorItem.qml'
--- plugins/module/ErrorItem.qml	2015-10-09 12:26:40 +0000
+++ plugins/module/ErrorItem.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd.
+ * Copyright (C) 2015-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Item {
     id: root

=== modified file 'plugins/module/OAuth.qml'
--- plugins/module/OAuth.qml	2016-08-29 01:49:31 +0000
+++ plugins/module/OAuth.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 Canonical Ltd.
+ * Copyright (C) 2013-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.OnlineAccounts 0.1
 import Ubuntu.OnlineAccounts.Plugin 1.0
@@ -97,10 +96,10 @@
         account: __account.objectHandle
     }
 
-    ListItem.Base {
+    ListItem {
         visible: loading && !errorItem.visible
         height: units.gu(7)
-        showDivider: false
+        divider.visible: false
         anchors.top: parent.top
 
         Item {
@@ -153,11 +152,12 @@
         id: osk
     }
 
-    ListItem.SingleControl {
+    ListItem {
         id: cancelButton
         anchors.bottom: parent.bottom
-        showDivider: false
-        control: Button {
+        divider.visible: false
+        Button {
+            anchors.centerIn: parent
             text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
             width: parent.width - units.gu(4)
             onClicked: root.cancel()

=== modified file 'plugins/module/Options.qml'
--- plugins/module/Options.qml	2015-10-22 08:33:20 +0000
+++ plugins/module/Options.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.OnlineAccounts 0.1
 
@@ -32,9 +31,17 @@
     anchors.left: parent.left
     anchors.right: parent.right
 
-    ListItem.SingleValue {
-        text: i18n.dtr("ubuntu-system-settings-online-accounts", "ID")
-        value: account.displayName
+    ListItem {
+        height: layout.height
+        ListItemLayout {
+            id: layout
+            title.text: i18n.dtr("ubuntu-system-settings-online-accounts", "ID")
+
+            Label {
+                SlotsLayout.position: SlotsLayout.Trailing
+                text: account.displayName
+            }
+        }
     }
 
     ServiceSwitches {
@@ -43,13 +50,14 @@
         opacity: enabled ? 1 : 0.5
     }
 
-    ListItem.SingleControl {
-        control: Button {
+    ListItem {
+        divider.visible: false
+        Button {
+            anchors.centerIn: parent
             text: i18n.dtr("ubuntu-system-settings-online-accounts", "Remove account…")
             width: parent.width - units.gu(4)
             onClicked: PopupUtils.open(removalConfirmationComponent)
         }
-        showDivider: false
     }
 
     Component {

=== modified file 'plugins/module/RemovalConfirmation.qml'
--- plugins/module/RemovalConfirmation.qml	2015-10-22 08:33:20 +0000
+++ plugins/module/RemovalConfirmation.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Components.Popups 1.3
 
 Dialog {

=== modified file 'plugins/module/ServiceItemBase.qml'
--- plugins/module/ServiceItemBase.qml	2016-02-12 13:30:25 +0000
+++ plugins/module/ServiceItemBase.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Canonical Ltd.
+ * Copyright (C) 2016-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -18,35 +18,37 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
-
-ListItem.Base {
+
+ListItem {
+    id: root
+
+    property alias iconSource: icon.source
     property alias checked: control.checked
-    property alias text: label.text
-    property alias subText: subLabel.text
-
-    Item {
-        anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter }
-        height: childrenRect.height + label.anchors.topMargin + subLabel.anchors.bottomMargin
-
-        Label {
-            id: label
-            anchors { left: parent.left; right: control.left; top: parent.top }
-            elide: Text.ElideRight
-            color: theme.palette.selected.backgroundText
-        }
-
-        Label {
-            id: subLabel
-            anchors { left: parent.left; right: control.left; top: label.bottom }
-            color: theme.palette.normal.backgroundText
-            elide: Text.ElideRight
-            textSize: Label.Small
-        }
+    property string text
+    property string subText
+
+    height: layout.height
+
+    ListItemLayout {
+        id: layout
+
+        UbuntuShape {
+            SlotsLayout.position: SlotsLayout.Leading
+            width: units.gu(5)
+            height: width
+            source: Image {
+                id: icon
+                anchors.fill: parent
+                sourceSize { width: width; height: height }
+            }
+        }
+
+        title.text: root.text
+        subtitle.text: root.subText
 
         Switch {
-            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
             id: control
+            SlotsLayout.position: SlotsLayout.Trailing
         }
     }
 }

=== modified file 'plugins/module/ServiceSwitches.qml'
--- plugins/module/ServiceSwitches.qml	2015-10-22 08:33:20 +0000
+++ plugins/module/ServiceSwitches.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.OnlineAccounts 0.1
 
 Column {
@@ -29,8 +28,12 @@
     anchors.left: parent.left
     anchors.right: parent.right
 
-    ListItem.Standard {
-        text: i18n.dtr("ubuntu-system-settings-online-accounts", "Access to this account:")
+    ListItem {
+        height: layout.height
+        ListItemLayout {
+            id: layout
+            title.text: i18n.dtr("ubuntu-system-settings-online-accounts", "Access to this account:")
+        }
     }
 
     AccountServiceModel {

=== modified file 'system-settings-plugin/AccountItem.qml'
--- system-settings-plugin/AccountItem.qml	2016-12-20 13:21:48 +0000
+++ system-settings-plugin/AccountItem.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -18,18 +18,19 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.OnlineAccounts 0.1
 
-ListItem.Subtitled {
+ListItem {
+    id: root
+
+    property string text: ""
+    property string subText: ""
     property variant accountHandle
     property variant globalServiceHandle
     property variant __editPage: null
     property bool running: false
 
-    iconSource: globalService.provider.iconName.indexOf("/") === 0 ?
-        globalService.provider.iconName : "image://theme/" + globalService.provider.iconName
-    progression: true
+    height: layout.height
     opacity: globalService.enabled ? 1 : 0.5
 
     resources: [
@@ -51,6 +52,18 @@
         running = true;
     }
 
+    ListItemLayout {
+        id: layout
+        title.text: root.text
+        subtitle.text: root.subText
+        UbuntuIcon {
+            SlotsLayout.position: SlotsLayout.Leading
+            iconSource: globalService.provider.iconName.indexOf("/") === 0 ?
+                globalService.provider.iconName : "image://theme/" + globalService.provider.iconName
+        }
+        ProgressionSlot {}
+    }
+
     function __onEditFinished() {
         __editPage.destroy(1000)
         pageStack.removePages(__editPage)

=== modified file 'system-settings-plugin/AccountsPage.qml'
--- system-settings-plugin/AccountsPage.qml	2016-12-20 13:21:48 +0000
+++ system-settings-plugin/AccountsPage.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Flickable {
     id: root
@@ -46,16 +45,19 @@
             }
         }
 
-        ListItem.SingleControl {
-            control: Button {
+        ListItem {
+            Button {
+                anchors.centerIn: parent
                 text: i18n.dtr(domain, "Add account…")
                 width: parent.width - units.gu(4)
                 onClicked: pageStack.addPageToNextColumn(mainAccountsPage, newAccountPage)
             }
-            showDivider: false
+            divider.visible: false
         }
 
-        AddAccountLabel {}
+        AddAccountLabel {
+            divider.visible: false
+        }
     }
 
     Component {

=== modified file 'system-settings-plugin/AddAccountLabel.qml'
--- system-settings-plugin/AddAccountLabel.qml	2015-10-22 08:33:20 +0000
+++ system-settings-plugin/AddAccountLabel.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -18,11 +18,19 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 
-ListItem.Caption {
+ListItem {
     anchors.left: parent.left
     anchors.right: parent.right
-    anchors.margins: units.gu(2)
-    text: i18n.dtr(domain, "Storing account details here lets apps use the accounts without you having to sign in for each app.")
+    height: label.height + units.gu(4)
+    Label {
+        id: label
+        anchors {
+            left: parent.left; right: parent.right; margins: units.gu(4)
+            verticalCenter: parent.verticalCenter
+        }
+        textSize: Label.Small
+        wrapMode: Text.WordWrap
+        text: i18n.dtr(domain, "Storing account details here lets apps use the accounts without you having to sign in for each app.")
+    }
 }

=== modified file 'system-settings-plugin/MainPage.qml'
--- system-settings-plugin/MainPage.qml	2016-12-20 13:21:48 +0000
+++ system-settings-plugin/MainPage.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -19,7 +19,6 @@
 import QtQuick 2.0
 import SystemSettings 1.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.OnlineAccounts 0.1
 
 ItemPage {

=== modified file 'system-settings-plugin/NoAccountsPage.qml'
--- system-settings-plugin/NoAccountsPage.qml	2015-11-12 08:12:13 +0000
+++ system-settings-plugin/NoAccountsPage.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Flickable {
     id: root
@@ -31,20 +30,24 @@
         anchors.left: parent.left
         anchors.right: parent.right
 
-        ListItem.Base {
+        ListItem {
             Label {
                 text: i18n.dtr(domain, "No accounts")
                 color: theme.palette.normal.backgroundText
                 fontSize: "large"
                 anchors.centerIn: parent
             }
-            showDivider: false
+            divider.visible: false
         }
 
         AddAccountLabel {}
 
-        ListItem.Standard {
-            text: i18n.dtr(domain, "Add account:")
+        ListItem {
+            height: layout.height
+            ListItemLayout {
+                id: layout
+                title.text: i18n.dtr(domain, "Add account:")
+            }
         }
 
         ProviderPluginList {}

=== modified file 'system-settings-plugin/ProvidersList.qml'
--- system-settings-plugin/ProvidersList.qml	2015-11-26 16:02:17 +0000
+++ system-settings-plugin/ProvidersList.qml	2017-03-16 11:01:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2017 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.OnlineAccounts 0.1
 import Ubuntu.OnlineAccounts.Plugin 1.0
 
@@ -58,20 +57,27 @@
         id: repeater
         model: filteredProviderModel
 
-        delegate: ListItem.Standard {
+        delegate: ListItem {
             id: provider
-            text: displayName
+            height: layout.height
             enabled: accountModel === null || accountModel.count === 0
-            iconSource: model.iconName.indexOf("/") === 0 ?
-                model.iconName : "image://theme/" + model.iconName
-            progression: false
-            onTriggered: {
+            onClicked: {
                 activated = true;
                 root.providerClicked(providerId);
             }
+
             property var accountModel: isSingleAccount ? createAccountModel(providerId) : null
             property bool activated: false
 
+            ListItemLayout {
+                id: layout
+                title.text: displayName
+                UbuntuIcon {
+                    iconSource: model.iconName.indexOf("/") === 0 ?
+                        model.iconName : "image://theme/" + model.iconName
+                }
+            }
+
             ActivityIndicator {
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.right: parent.right

=== added file 'system-settings-plugin/UbuntuIcon.qml'
--- system-settings-plugin/UbuntuIcon.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/UbuntuIcon.qml	2017-03-16 11:01:46 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+UbuntuShape {
+    property alias iconSource: image.source
+
+    SlotsLayout.position: SlotsLayout.Leading
+    width: units.gu(5)
+    height: width
+    source: Image {
+        id: image
+        anchors.fill: parent
+        sourceSize { width: width; height: height }
+    }
+}

=== modified file 'system-settings-plugin/system-settings-plugin.pro'
--- system-settings-plugin/system-settings-plugin.pro	2016-06-27 15:50:32 +0000
+++ system-settings-plugin/system-settings-plugin.pro	2017-03-16 11:01:46 +0000
@@ -33,7 +33,8 @@
     NoAccountsPage.qml \
     NormalStartupPage.qml \
     ProviderPluginList.qml \
-    ProvidersList.qml
+    ProvidersList.qml \
+    UbuntuIcon.qml
 
 settings.files = online-accounts.settings
 settings.path = $${PLUGIN_MANIFEST_DIR}