content-hub

Merge lp:~ken-vandine/content-hub/lp1249264 into lp:~content-hub-team/content-hub/trunk

  1. lp1249264
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merged at revision: 67
Proposed branch: lp:~ken-vandine/content-hub/lp1249264
Merge into: lp:~content-hub-team/content-hub/trunk
Diff against target: 31 lines (+11/-1)
1 file modified
import/Ubuntu/Content/contenthub.cpp (+11/-1)
To merge this branch: bzr merge lp:~ken-vandine/content-hub/lp1249264
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
content-hub-team Pending
Review via email: mp+195416@code.launchpad.net

Commit message

Documentation cleanup, fixes button alignment and uses MainView in the
QML code example.

Description of the change

Documentation cleanup, fixes button alignment and uses MainView in the
QML code example.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Looks fine, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'import/Ubuntu/Content/contenthub.cpp'
2--- import/Ubuntu/Content/contenthub.cpp 2013-11-07 20:12:56 +0000
3+++ import/Ubuntu/Content/contenthub.cpp 2013-11-15 16:19:08 +0000
4@@ -38,9 +38,15 @@
5 * import Ubuntu.Components 0.1
6 * import Ubuntu.Content 0.1
7 *
8- * Rectangle {
9+ * MainView {
10 * id: root
11+ * width: units.gu(60)
12+ * height: units.gu(90)
13 * Button {
14+ * anchors {
15+ * left: parent.left
16+ * margins: units.gu(2)
17+ * }
18 * text: "Import from default"
19 * onClicked: {
20 * var peer = ContentHub.defaultSourceForType(ContentType.Pictures);
21@@ -48,6 +54,10 @@
22 * }
23 * }
24 * Button {
25+ * anchors {
26+ * right: parent.right
27+ * margins: units.gu(2)
28+ * }
29 * text: "Import from a selectable list"
30 * onClicked: {
31 * activeTransfer = ContentHub.importContent(ContentType.Pictures);

Subscribers

People subscribed via source and target branches