Merge lp:~jonas-drange/ubuntu-system-settings/seemingly-unable-to-remove-backgrounds-fix-1365545 into lp:ubuntu-system-settings

[Jonas G. Drange]

[background] make it clear that "Remove images…" action requires image selection

Hi,

this panel slightly fades the custom images when "Remove Images…" is clicked. This makes it slightly clearer that the user needs to choose what images to remove.

Thanks

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1001
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1392/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4517/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3351/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/584
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4294/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5769
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5769/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12750
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2757/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3653
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3653/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1001
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1407/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4550/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/599
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4331/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5802
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5802/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3682
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3682/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1001
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1414/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/606
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5835
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5835/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3700
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3700/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, you included changes to the about panel there that you don't want, you should either add a pre-required vcs or clean those out. Could you also try to summarize the behaviour/ui changes and maybe refer to the design recommendations for those?

review: Needs Fixing

[Jonas G. Drange (jonas-drange)]

Thanks, not sure what happened here. Will wait until either of them land, or can you add two prereqs?

[Sebastien Bacher (seb128)]

some of those pre-req landed, that can probably be refresh/submitted

Unmerged revisions

1001. By Jonas G. Drange on 2014-09-05

ui to make the "remove images…" flow more intuitive

1000. By Jonas G. Drange on 2014-09-05

merge prereq

994. By Launchpad Translations on behalf of system-settings-touch on 2014-09-04

Launchpad automatic translations update.

=== modified file 'plugins/about/CMakeLists.txt'
--- plugins/about/CMakeLists.txt	2014-09-04 00:58:34 +0000
+++ plugins/about/CMakeLists.txt	2014-09-05 14:51:18 +0000
@@ -10,6 +10,7 @@
     PageComponent.qml
     PhoneNumber.qml
     PhoneNumbers.qml
+    SingleValueStacked.qml
     Software.qml
     Storage.qml
     StorageBar.qml

=== added file 'plugins/about/SingleValueStacked.qml'
--- plugins/about/SingleValueStacked.qml	1970-01-01 00:00:00 +0000
+++ plugins/about/SingleValueStacked.qml	2014-09-05 14:51:18 +0000
@@ -0,0 +1,61 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Jonas G. Drange <[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/>.
+ *
+ * Author: Jonas G. Drange <[e-mail]>
+ *
+ * DRY
+ *
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+ListItem.SingleValue {
+
+    property alias text: label.text
+    property alias value: value.text
+
+    height: col.childrenRect.height + units.gu(2)
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+    Column {
+        anchors.fill: parent
+        anchors.topMargin: units.gu(1)
+        id: col
+        spacing: units.gu(1)
+        Label {
+            id: label
+            anchors {
+                left:parent.left
+                right:parent.right
+            }
+            wrapMode: Text.WordWrap
+        }
+        Label {
+            id: value
+            anchors {
+                left:parent.left
+                right:parent.right
+            }
+            wrapMode: Text.WordWrap
+        }
+    }
+}

=== modified file 'plugins/about/Version.qml'
--- plugins/about/Version.qml	2014-06-24 16:08:36 +0000
+++ plugins/about/Version.qml	2014-09-05 14:51:18 +0000
@@ -18,6 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Sergio Schvezov <[e-mail]>
+ *         Jonas G. Drange <[e-mail]>
  *
  */
 
@@ -33,6 +34,7 @@
     id: versionPage
     objectName: "versionPage"
     title: i18n.tr("OS Build Details")
+    flickable: flickElement
 
     UbuntuStorageAboutPanel {
         id: storedInfo
@@ -43,10 +45,20 @@
     }
 
     Flickable {
+        id: flickElement
         anchors.fill: parent
 
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > versionPage.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+        /* Set the direction to workaround https://bugreports.qt-project.org/browse/QTBUG-31905
+           otherwise the UI might end up in a situation where scrolling doesn't work */
+        flickableDirection: Flickable.VerticalFlick
+
         Column {
-            anchors.fill: parent
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
 
             ListItem.SingleValue {
                 objectName: "versionBuildNumberItem"
@@ -61,79 +73,25 @@
                 visible: updateBackendInfo.currentUbuntuBuildNumber
             }
 
-            ListItem.SingleValue {
+            SingleValueStacked {
                 objectName: "ubuntuBuildIDItem"
-                height: ubuntuBuildIDColumn.childrenRect.height + units.gu(2)
                 visible: storedInfo.ubuntuBuildID
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-
-                Column {
-                    anchors.fill: parent
-                    anchors.topMargin: units.gu(1)
-
-                    id: ubuntuBuildIDColumn
-                    spacing: units.gu(1)
-                    Label {
-                        anchors {
-                            left:parent.left
-                            right:parent.right
-                        }
-                        wrapMode: Text.WordWrap
-                        text: i18n.tr("Ubuntu build description")
-                    }
-                    Label {
-                        anchors {
-                            left:parent.left
-                            right:parent.right
-                        }
-                        wrapMode: Text.WordWrap
-                        text: storedInfo.ubuntuBuildID
-                    }
-                }
+                text: i18n.tr("Ubuntu build description")
+                value: storedInfo.ubuntuBuildID
             }
 
-            ListItem.SingleValue {
+            SingleValueStacked {
                 objectName: "deviceVersionBuildNumberItem"
                 text: i18n.tr("Device Image part")
                 value: updateBackendInfo.currentDeviceBuildNumber
                 visible: updateBackendInfo.currentDeviceBuildNumber
             }
 
-            ListItem.SingleValue {
+            SingleValueStacked {
                 objectName: "deviceBuildIDItem"
-                height: deviceBuildIDColumn.childrenRect.height + units.gu(2)
+                text: i18n.tr("Device build description")
+                value: storedInfo.deviceBuildDisplayID
                 visible: storedInfo.deviceBuildDisplayID
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-
-                Column {
-                    anchors.fill: parent
-                    anchors.topMargin: units.gu(1)
-
-                    id: deviceBuildIDColumn
-                    spacing: units.gu(1)
-                    Label {
-                        anchors {
-                            left:parent.left
-                            right:parent.right
-                        }
-                        wrapMode: Text.WordWrap
-                        text: i18n.tr("Device build description")
-                    }
-                    Label {
-                        anchors {
-                            left:parent.left
-                            right:parent.right
-                        }
-                        wrapMode: Text.WordWrap
-                        text: storedInfo.deviceBuildDisplayID
-                    }
-                }
             }
 
             ListItem.SingleValue {

=== modified file 'plugins/background/WallpaperGrid.qml'
--- plugins/background/WallpaperGrid.qml	2014-09-05 14:51:18 +0000
+++ plugins/background/WallpaperGrid.qml	2014-09-05 14:51:18 +0000
@@ -160,11 +160,22 @@
                         fillMode: Image.PreserveAspectCrop
                         asynchronous: true
                         smooth: true
+                        opacity: {
+                            if (gridItem.state === "selected") {
+                                return 1
+                            } else if (grid.state === "selection") {
+                                return 0.75;
+                            } else {
+                                return 1;
+                            }
+                        }
                     }
                     HighlightedOverlay {
                         id: highLight
                         objectName: "highLight"
-                        visible: (current === modelData) && (itemImage.status === Image.Ready)
+                        visible: (current === modelData)
+                            && (itemImage.status === Image.Ready)
+                            && (grid.state !== "selection")
                     }
                     SelectedOverlay {
                         id: selectionTick