Merge lp:~tpeeters/ubuntu-ui-toolkit/gallery-subtitle into lp:ubuntu-ui-toolkit/staging

Proposed by Tim Peeters
Status: Merged
Approved by: Cris Dywan
Approved revision: 1961
Merged at revision: 1963
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/gallery-subtitle
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 71 lines (+41/-14)
1 file modified
examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml (+41/-14)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/gallery-subtitle
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Cris Dywan Approve
Review via email: mp+293141@code.launchpad.net

Commit message

Add header subtitle example in gallery.

To post a comment you must log in.
1961. By Tim Peeters

clean

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

Love it! Thanks!

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml'
--- examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml 2016-02-17 14:45:09 +0000
+++ examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml 2016-04-27 16:13:27 +0000
@@ -26,7 +26,47 @@
26 className: "PageHeader"26 className: "PageHeader"
2727
28 Label {28 Label {
29 text: "Use the icons in the header."29 text: "Use the icons in the header for search and edit header."
30 }
31
32 Grid {
33 id: switchGrid
34 columns: 2
35 spacing: units.gu(1)
36 anchors {
37 left: parent.left
38 leftMargin: units.gu(5)
39 }
40
41 Switch {
42 id: lockedSwitch
43 checked: standardHeader.extension
44 onTriggered: {
45 if (standardHeader.extension) {
46 standardHeader.extension = null;
47 } else {
48 standardHeader.extension = sections;
49 }
50 }
51 }
52 Label {
53 text: "Sections"
54 }
55
56 Switch {
57 id: subtitleSwitch
58 checked: standardHeader.subtitle
59 onTriggered: {
60 if (standardHeader.subtitle) {
61 standardHeader.subtitle = "";
62 } else {
63 standardHeader.subtitle = "Hello, this is your subtitle";
64 }
65 }
66 }
67 Label {
68 text: "Subtitle"
69 }
30 }70 }
31 }71 }
3272
@@ -44,19 +84,6 @@
44 iconName: "edit"84 iconName: "edit"
45 text: "Edit"85 text: "Edit"
46 onTriggered: page.header = editHeader86 onTriggered: page.header = editHeader
47 },
48 Action {
49 iconName: standardHeader.extension === sections
50 ? "media-playback-stop"
51 : "filters"
52 text: "Sections"
53 onTriggered: {
54 if (standardHeader.extension) {
55 standardHeader.extension = null;
56 } else {
57 standardHeader.extension = sections;
58 }
59 }
60 }87 }
61 ]88 ]
6289

Subscribers

People subscribed via source and target branches