Merge lp:~kalikiana/ubuntu-ui-toolkit/demoToolbar into lp:ubuntu-ui-toolkit/staging
- demoToolbar
- Merge into staging
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Tim Peeters | ||||
Approved revision: | 1032 | ||||
Merged at revision: | 1115 | ||||
Proposed branch: | lp:~kalikiana/ubuntu-ui-toolkit/demoToolbar | ||||
Merge into: | lp:ubuntu-ui-toolkit/staging | ||||
Diff against target: |
69 lines (+54/-0) 2 files modified
examples/ubuntu-ui-toolkit-gallery/Toolbar.qml (+49/-0) examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml (+5/-0) |
||||
To merge this branch: | bzr merge lp:~kalikiana/ubuntu-ui-toolkit/demoToolbar | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Tim Peeters | Approve | ||
Review via email:
|
Commit message
Add a section for the Toolbar to the gallery
Description of the change
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Cris Dywan (kalikiana) wrote : | # |
Failing on test_ubuntushape ie. bug 1308979.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1027
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Tim Peeters (tpeeters) wrote : | # |
doesn't work, if I click in the page (or wait) for the toolbar to close, then check the "Always open" switch, the toolbar is locked in closed state.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Cris Dywan (kalikiana) wrote : | # |
Unrelated failure in UbuntuShape, bug 1308979.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1028
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1029
http://
Executed test runs:
UNSTABLE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1030
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Cris Dywan (kalikiana) wrote : | # |
FTR
_StringException: Traceback (most recent call last):
File "/usr/lib/
open(
IOError: [Errno 2] No such file or directory: '/home/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1031
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1032
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) : | # |
Preview Diff
1 | === added file 'examples/ubuntu-ui-toolkit-gallery/Toolbar.qml' |
2 | --- examples/ubuntu-ui-toolkit-gallery/Toolbar.qml 1970-01-01 00:00:00 +0000 |
3 | +++ examples/ubuntu-ui-toolkit-gallery/Toolbar.qml 2014-06-19 10:15:05 +0000 |
4 | @@ -0,0 +1,49 @@ |
5 | +/* |
6 | + * Copyright 2014 Canonical Ltd. |
7 | + * |
8 | + * This program is free software; you can redistribute it and/or modify |
9 | + * it under the terms of the GNU Lesser General Public License as published by |
10 | + * the Free Software Foundation; version 3. |
11 | + * |
12 | + * This program is distributed in the hope that it will be useful, |
13 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | + * GNU Lesser General Public License for more details. |
16 | + * |
17 | + * You should have received a copy of the GNU Lesser General Public License |
18 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | + */ |
20 | + |
21 | +import QtQuick 2.0 |
22 | +import Ubuntu.Components 0.1 |
23 | +import Ubuntu.Components.Popups 0.1 |
24 | + |
25 | +Template { |
26 | + objectName: "popoversTemplate" |
27 | + |
28 | + tools: ToolbarItems { |
29 | + ToolbarButton { |
30 | + text: "Call" |
31 | + iconName: "call-start" |
32 | + } |
33 | + ToolbarButton { |
34 | + text: i18n.tr("Share") |
35 | + iconName: "share" |
36 | + } |
37 | + ToolbarButton { |
38 | + iconName: "settings" |
39 | + } |
40 | + ToolbarButton { |
41 | + iconName: "speaker" |
42 | + } |
43 | + } |
44 | + |
45 | + TemplateSection { |
46 | + className: "Toolbar" |
47 | + documentation: "qml-ubuntu-components-toolbar0-%1.html".arg(className.toLowerCase()) |
48 | + |
49 | + TemplateRow { |
50 | + title: i18n.tr("See below") |
51 | + } |
52 | + } |
53 | +} |
54 | |
55 | === modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml' |
56 | --- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml 2014-04-30 10:26:35 +0000 |
57 | +++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml 2014-06-19 10:15:05 +0000 |
58 | @@ -30,6 +30,11 @@ |
59 | source: "Toggles.qml" |
60 | } |
61 | ListElement { |
62 | + objectName: "toolbarElement" |
63 | + label: "Toolbar" |
64 | + source: "Toolbar.qml" |
65 | + } |
66 | + ListElement { |
67 | objectName: "buttonsElement" |
68 | label: "Buttons" |
69 | source: "Buttons.qml" |
FAILED: Continuous integration, rev:1026 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/114/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- trusty- touch/467 jenkins. qa.ubuntu. com/job/ generic- mediumtests- trusty/ 5092 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- trusty- amd64-ci/ 114 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- trusty- armhf-ci/ 114 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- trusty- armhf-ci/ 114/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- trusty- i386-ci/ 114 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/416 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- armhf/4727 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- armhf/4727/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 6458 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-trusty/ 4380 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- amd64/5287 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- amd64/5287/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/114/ rebuild
http://