ubuntu-system-settings

Merge lp:~ken-vandine/ubuntu-system-settings/revert_reverted into lp:ubuntu-system-settings

  1. revert_reverted
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 406
Merged at revision: 417
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/revert_reverted
Merge into: lp:ubuntu-system-settings
Diff against target: 46 lines (+23/-6)
1 file modified
plugins/background/MainPage.qml (+23/-6)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/revert_reverted
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+188371@code.launchpad.net

Commit message

revert the previous revert done in rev 391, Bug (#LP: #1231368) was caused by
gallery-app needing a rebuild for content-hub changes.

Description of the change

revert the previous revert done in rev 391, Bug (#LP: #1231368) was caused by
gallery-app needing a rebuild for content-hub changes.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:406
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/426/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/426

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

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Great, with that I get the background to persist accross reboots again on the device!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/background/MainPage.qml'
2--- plugins/background/MainPage.qml 2013-09-27 11:42:47 +0000
3+++ plugins/background/MainPage.qml 2013-09-30 15:35:20 +0000
4@@ -84,9 +84,18 @@
5 }
6
7 onClicked: {
8- activeTransfer = ContentHub.importContent(ContentType.Pictures,
9- ContentHub.defaultSourceForType(ContentType.Pictures));
10- activeTransfer.start();
11+ var transfer = ContentHub.importContent(ContentType.Pictures,
12+ ContentHub.defaultSourceForType(ContentType.Pictures));
13+ if (transfer != null)
14+ {
15+ transfer.selectionType = ContentTransfer.Single;
16+ var store = ContentHub.defaultStoreForType(ContentType.Pictures);
17+ console.log("Store is: " + store.uri);
18+ transfer.setStore(store);
19+ activeTransfer = transfer;
20+ activeTransfer.start();
21+ }
22+
23 }
24
25 Component.onCompleted: updateImage(testWelcomeImage,
26@@ -111,9 +120,17 @@
27 homeImage)
28
29 onClicked: {
30- activeTransfer = ContentHub.importContent(ContentType.Pictures,
31- ContentHub.defaultSourceForType(ContentType.Pictures));
32- activeTransfer.start();
33+ var transfer = ContentHub.importContent(ContentType.Pictures,
34+ ContentHub.defaultSourceForType(ContentType.Pictures));
35+ if (transfer != null)
36+ {
37+ transfer.selectionType = ContentTransfer.Single;
38+ var store = ContentHub.defaultStoreForType(ContentType.Pictures);
39+ console.log("Store is: " + store.uri);
40+ transfer.setStore(store);
41+ activeTransfer = transfer;
42+ activeTransfer.start();
43+ }
44 }
45
46 OverlayImage {

Subscribers

People subscribed via source and target branches