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

Proposed by Tim Peeters
Status: Merged
Approved by: Cris Dywan
Approved revision: 1457
Merged at revision: 1456
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/removeToolbarExample
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 76 lines (+1/-55)
2 files modified
examples/ubuntu-ui-toolkit-gallery/Toolbar.qml (+0/-49)
examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml (+1/-6)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/removeToolbarExample
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Cris Dywan Approve
Review via email: mp+253851@code.launchpad.net

Commit message

Remove the deprecated toolbar example from the gallery.

Description of the change

Remove the deprecated toolbar example from the gallery.

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Nice! Thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'examples/ubuntu-ui-toolkit-gallery/Toolbar.qml'
--- examples/ubuntu-ui-toolkit-gallery/Toolbar.qml 2015-03-11 17:10:20 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Toolbar.qml 1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
1/*
2 * Copyright 2014 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import Ubuntu.Components 0.1
19import Ubuntu.Components.Popups 0.1
20
21Template {
22 objectName: "popoversTemplate"
23
24 tools: ToolbarItems {
25 ToolbarButton {
26 text: "Call"
27 iconName: "call-start"
28 }
29 ToolbarButton {
30 text: i18n.tr("Share")
31 iconName: "share"
32 }
33 ToolbarButton {
34 iconName: "settings"
35 }
36 ToolbarButton {
37 iconName: "speaker"
38 }
39 }
40
41 TemplateSection {
42 className: "Toolbar"
43 documentation: "qml-ubuntu-components-toolbaritems.html".arg(className.toLowerCase())
44
45 TemplateRow {
46 title: i18n.tr("See below")
47 }
48 }
49}
500
=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml 2015-03-03 13:20:06 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml 2015-03-23 16:36:24 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2013 Canonical Ltd.2 * Copyright 2013-2015 Canonical Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by5 * it under the terms of the GNU Lesser General Public License as published by
@@ -39,11 +39,6 @@
39 source: "Toggles.qml"39 source: "Toggles.qml"
40 }40 }
41 ListElement {41 ListElement {
42 objectName: "toolbarElement"
43 label: "Toolbar"
44 source: "Toolbar.qml"
45 }
46 ListElement {
47 objectName: "buttonsElement"42 objectName: "buttonsElement"
48 label: "Buttons"43 label: "Buttons"
49 source: "Buttons.qml"44 source: "Buttons.qml"

Subscribers

People subscribed via source and target branches