Merge lp:~phablet-team/ubuntu-system-settings/settings-listitems into lp:ubuntu-system-settings

[Jonas G. Drange]

new module SystemSettings.ListItems

[lp:~phablet-team/ubuntu-system-settings/settings-listitems]

1559. By Jonas G. Drange on 2015-11-23

set the color of the dividers

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1558
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2514/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/288
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/697
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5352
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5352/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25415

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2514/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1559
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2515/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5341/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/699
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4235/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5361
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5361/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25425

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2515/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/ubuntu-system-settings/settings-listitems]

1560. By Ken VanDine on 2015-12-08

merged trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1560
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2546/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/730
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5652
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5652/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25872

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2546/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1560
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/589/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/589/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/ubuntu-system-settings/settings-listitems]

1561. By Ken VanDine on 2016-06-28

merged trunk

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1561
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/25/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/784/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/784
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/728
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/728
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/728
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/720/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/720/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/720/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/720/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/720/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/720/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/720/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/720/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/720/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/25/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[Alberto Mardegan (mardy)]

Please let me know what I should do with https://code.launchpad.net/~mardy/ubuntu-system-settings/smoothed-1596529/+merge/298419

I think there will be some conflict with this branch.

=== modified file 'src/SystemSettings/CMakeLists.txt'
--- src/SystemSettings/CMakeLists.txt	2014-10-31 08:45:10 +0000
+++ src/SystemSettings/CMakeLists.txt	2016-06-29 14:34:55 +0000
@@ -6,3 +6,5 @@
 set(PLUG_DIR ${PLUGIN_QML_DIR}/SystemSettings)
 install(FILES qmldir DESTINATION ${PLUG_DIR})
 install(FILES ${QML_SOURCES} DESTINATION ${PLUG_DIR})
+
+add_subdirectory(ListItems)

=== added directory 'src/SystemSettings/ListItems'
=== added file 'src/SystemSettings/ListItems/CMakeLists.txt'
--- src/SystemSettings/ListItems/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/SystemSettings/ListItems/CMakeLists.txt	2016-06-29 14:34:55 +0000
@@ -0,0 +1,13 @@
+set(QML_SOURCES
+    Icon.qml
+    IconProgression.qml
+    SingleControl.qml
+    SingleValue.qml
+    SingleValueProgression.qml
+    Standard.qml
+    StandardProgression.qml
+)
+
+set(PLUG_DIR ${PLUGIN_QML_DIR}/SystemSettings/ListItems)
+install(FILES qmldir DESTINATION ${PLUG_DIR})
+install(FILES ${QML_SOURCES} DESTINATION ${PLUG_DIR})

=== added file 'src/SystemSettings/ListItems/Icon.qml'
--- src/SystemSettings/ListItems/Icon.qml	1970-01-01 00:00:00 +0000
+++ src/SystemSettings/ListItems/Icon.qml	2016-06-29 14:34:55 +0000
@@ -0,0 +1,33 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * 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.4
+import Ubuntu.Components 1.3
+
+Standard {
+    id: base
+    property alias iconName: icon.name
+    property alias iconSource: icon.source
+
+    Icon {
+        id: icon
+        width: height
+        height: units.gu(2.5)
+        SlotsLayout.position: SlotsLayout.First
+    }
+}

=== added file 'src/SystemSettings/ListItems/IconProgression.qml'
--- src/SystemSettings/ListItems/IconProgression.qml	1970-01-01 00:00:00 +0000
+++ src/SystemSettings/ListItems/IconProgression.qml	2016-06-29 14:34:55 +0000
@@ -0,0 +1,30 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * 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.4
+import "." as SettingsListItems
+import Ubuntu.Components 1.3
+
+SettingsListItems.Icon {
+    id: base
+    property alias progressionVisible: progression.visible
+
+    ProgressionSlot {
+        id: progression
+    }
+}

=== added file 'src/SystemSettings/ListItems/SingleControl.qml'
--- src/SystemSettings/ListItems/SingleControl.qml	1970-01-01 00:00:00 +0000
+++ src/SystemSettings/ListItems/SingleControl.qml	2016-06-29 14:34:55 +0000
@@ -0,0 +1,34 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * 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.4
+import Ubuntu.Components 1.3
+
+ListItem {
+    id: root
+    default property alias slots: layoutItem.children
+    property alias         layout: layoutItem
+    property bool          showDivider: true
+
+    height: layoutItem.height + (divider.visible ? divider.height : 0)
+    divider.visible: showDivider
+
+    SlotsLayout {
+        id: layoutItem
+    }
+}

=== added file 'src/SystemSettings/ListItems/SingleValue.qml'
--- src/SystemSettings/ListItems/SingleValue.qml	1970-01-01 00:00:00 +0000
+++ src/SystemSettings/ListItems/SingleValue.qml	2016-06-29 14:34:55 +0000
@@ -0,0 +1,30 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * 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.4
+import Ubuntu.Components 1.3
+
+Standard {
+    id: base
+    property alias value: value.text
+
+    Label {
+        id: value
+        horizontalAlignment: Text.AlignRight
+    }
+}

=== added file 'src/SystemSettings/ListItems/SingleValueProgression.qml'
--- src/SystemSettings/ListItems/SingleValueProgression.qml	1970-01-01 00:00:00 +0000
+++ src/SystemSettings/ListItems/SingleValueProgression.qml	2016-06-29 14:34:55 +0000
@@ -0,0 +1,35 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * 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.4
+import Ubuntu.Components 1.3
+
+Standard {
+    id: base
+    property alias value: value.text
+    property alias progressionVisible: progression.visible
+
+    Label {
+        id: value
+        horizontalAlignment: Text.AlignRight
+    }
+
+    ProgressionSlot {
+        id: progression
+    }
+}

=== added file 'src/SystemSettings/ListItems/Standard.qml'
--- src/SystemSettings/ListItems/Standard.qml	1970-01-01 00:00:00 +0000
+++ src/SystemSettings/ListItems/Standard.qml	2016-06-29 14:34:55 +0000
@@ -0,0 +1,41 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * 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 Ubuntu.Components 1.3
+
+ListItem {
+    id: root
+    default property alias slots: layoutItem.children
+    property alias         layout: layoutItem
+    property string        text
+    property bool          showDivider: true
+    property bool          highlightWhenPressed: true
+
+    height: layoutItem.height + (divider.visible ? divider.height : 0)
+    divider.visible: showDivider
+    divider.colorFrom: "#EEEEEE"
+    divider.colorTo: "#EEEEEE"
+    divider.height: units.dp(1)
+    highlightColor: highlightWhenPressed ? undefined : "transparent"
+
+    ListItemLayout {
+        id: layoutItem
+        title.text: root.text
+        title.opacity: enabled ? 1 : 0.5
+    }
+}

=== added file 'src/SystemSettings/ListItems/StandardProgression.qml'
--- src/SystemSettings/ListItems/StandardProgression.qml	1970-01-01 00:00:00 +0000
+++ src/SystemSettings/ListItems/StandardProgression.qml	2016-06-29 14:34:55 +0000
@@ -0,0 +1,29 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * 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.4
+import Ubuntu.Components 1.3
+
+Standard {
+    id: base
+    property alias progressionVisible: progression.visible
+
+    ProgressionSlot {
+        id: progression
+    }
+}

=== added file 'src/SystemSettings/ListItems/qmldir'
--- src/SystemSettings/ListItems/qmldir	1970-01-01 00:00:00 +0000
+++ src/SystemSettings/ListItems/qmldir	2016-06-29 14:34:55 +0000
@@ -0,0 +1,9 @@
+module SystemSettings.ListItems
+
+Icon 1.0 Icon.qml
+IconProgression 1.0 IconProgression.qml
+SingleControl 1.0 SingleControl.qml
+SingleValue 1.0 SingleValue.qml
+SingleValueProgression 1.0 SingleValueProgression.qml
+Standard 1.0 Standard.qml
+StandardProgression 1.0 StandardProgression.qml

=== modified file 'src/SystemSettings/SettingsItemTitle.qml'
--- src/SystemSettings/SettingsItemTitle.qml	2015-08-10 13:31:45 +0000
+++ src/SystemSettings/SettingsItemTitle.qml	2016-06-29 14:34:55 +0000
@@ -18,21 +18,27 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
-
-ListItem.Standard {
-    id: itemEmpty
-    property string text
+
+Item {
+    property alias text: label.text
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+    height: units.gu(6)
+
     Label {
+        id: label
         anchors {
+            top: parent.top
+            topMargin: units.gu(3)
+            right: parent.right
+            rightMargin: units.gu(2)
+            bottom: parent.bottom
             left: parent.left
             leftMargin: units.gu(2)
-            right: parent.right
-            rightMargin: units.gu(2)
-            top: parent.top
-            topMargin: units.gu(3)
         }
-        text: itemEmpty.text
+        fontSize: "small"
+        opacity: 0.75
     }
-    highlightWhenPressed: false
 }