Merge lp:~jonas-drange/ubuntu-system-settings/fix-1365167-numerous-custom-background-issues into lp:ubuntu-system-settings

[Jonas G. Drange]

[background] always keep custom images, and remove press-and-hold action.

[background] always keep custom images, and remove press-and-hold action.

[Sebastien Bacher (seb128)]

The stacking fix works, the import workflow feels broken though (if you pick an image, you get a preview dialog, if you click cancel there it imports the image anyway ... maybe the buttons should be renamed "just import" "set as background" or something similar?)
Setting as "need info" because previous cancel was doing what the label says which felt more right

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:995
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1383/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5714
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5714/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12668
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2733
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3623
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3623/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, that looks better. Did you get feedback from design about the interactions and the strings used?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:998
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1394/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4520/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3353
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/586
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4301/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5772
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5772/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12757
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2760
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3655
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3655/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:998
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1405/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4545/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/597
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4340/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5797
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5797/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12800
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2781
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3678
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3678/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:998
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1413/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4582
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/605
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5834
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5834/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12832
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2801
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3699
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3699/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:998
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1421/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/613
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5854
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5854/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12874
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3708
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3708/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'plugins/background/Components/AddRemove.qml'
--- plugins/background/Components/AddRemove.qml	2014-07-07 11:47:06 +0000
+++ plugins/background/Components/AddRemove.qml	2014-09-05 14:01:00 +0000
@@ -99,5 +99,4 @@
             enteredQueueMode();
         }
     }
-
 }

=== modified file 'plugins/background/MainPage.qml'
--- plugins/background/MainPage.qml	2014-08-27 22:18:55 +0000
+++ plugins/background/MainPage.qml	2014-09-05 14:01:00 +0000
@@ -61,7 +61,9 @@
         // a callback that pushes the preview stack
         onTriggered: {
             startContentTransfer(function(uri) {
-                pageStack.push(Qt.resolvedUrl("Preview.qml"), {uri: uri});
+                pageStack.push(Qt.resolvedUrl("Preview.qml"), {
+                    uri: uri, imported: true
+                });
                 // set Connection target
                 selectedItemConnection.target = pageStack.currentPage;
             });
@@ -189,10 +191,17 @@
                     trans.state = ContentTransfer.Finalized;
                 }
             }
-            // if we did an import, clean up
+
             if ((target.state === "cancelled") &&
                 (trans && trans.state === ContentTransfer.Collected)) {
-                backgroundPanel.rmFile(target.uri);
+
+                if (target.imported) {
+                    // if we just did an import, remove the image if the user
+                    // cancels
+                    backgroundPanel.rmFile(target.uri);
+                } else {
+                    backgroundPanel.prepareBackgroundFile(target.uri, true);
+                }
                 trans.state = ContentTransfer.Finalized;
             }
         }

=== modified file 'plugins/background/Preview.qml'
--- plugins/background/Preview.qml	2014-06-26 09:39:57 +0000
+++ plugins/background/Preview.qml	2014-09-05 14:01:00 +0000
@@ -28,6 +28,9 @@
     anchors.fill: parent
 
     property string uri
+
+    // whether an image was just imported from e.g. contentHub
+    property bool imported: false
     signal save
     property Item headerStyle: header.__styleInstance ?
                                    header.__styleInstance : null
@@ -94,7 +97,8 @@
 
             Button {
                 objectName: "cancelButton"
-                text: i18n.tr("Cancel")
+                text: preview.imported ?
+                    i18n.tr("Remove image") : i18n.tr("Cancel")
                 width: (previewButtons.width-units.gu(2)*4)/2
                 gradient: UbuntuColors.greyGradient
                 onClicked: preview.state = "cancelled"

=== modified file 'plugins/background/WallpaperGrid.qml'
--- plugins/background/WallpaperGrid.qml	2014-07-04 12:00:55 +0000
+++ plugins/background/WallpaperGrid.qml	2014-09-05 14:01:00 +0000
@@ -179,35 +179,11 @@
                         id: emptyItemForCaller
                         anchors.centerIn: parent
                     }
-                    ActionSelectionPopover {
-                        id: actPop
-                        caller: emptyItemForCaller
-                        delegate: ListItem.Standard {
-                            text: action.text
-                        }
-                        actions: ActionList {
-                            Action {
-                                text: i18n.tr("Remove")
-                                onTriggered: {
-                                    // removing current background, revert to default
-                                    if (modelData === current) {
-                                        Utilities.revertBackgroundToDefault();
-                                    }
-                                    backgroundPanel.rmFile(modelData);
-                                }
-                            }
-                        }
-                    }
                     MouseArea {
                         id: imgMouseArea
                         anchors.fill: parent
-                        onPressAndHold: {
-                            if (editable && (grid.state === "")) {
-                                actPop.show();
-                            }
-                        }
                         onClicked: {
-                            if (!actPop.visible && (grid.state === "")) {
+                            if (grid.state === "") {
                                 selected(modelData);
                             }