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

Proposed by Tim Peeters
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1094
Merged at revision: 1095
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/deprecateSheets
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 70 lines (+14/-1)
3 files modified
modules/Ubuntu/Components/Popups/ComposerSheet.qml (+3/-0)
modules/Ubuntu/Components/Popups/DefaultSheet.qml (+4/-0)
modules/Ubuntu/Components/Popups/SheetBase.qml (+7/-1)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/deprecateSheets
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+221879@code.launchpad.net

Commit message

Deprecate sheets

Description of the change

Deprecate sheets

To post a comment you must log in.
Revision history for this message
Zsombor Egri (zsombi) wrote :

Finally!!!

review: Approve
Revision history for this message
Tim Peeters (tpeeters) wrote :

heh :)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1091
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/629
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/578
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/154
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1066
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1209
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1209/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8023
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/717
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/717/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/322/rebuild

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/151/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/590
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/95
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/95
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1236
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8047
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/522
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/729
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/729/artifact/work/output/*zip*/output.zip

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

FAILED: Continuous integration, rev:1093
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/340/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/172
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/172
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1287
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8096
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/758
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/758/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/340/rebuild

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
2--- modules/Ubuntu/Components/Popups/ComposerSheet.qml 2014-04-23 08:50:20 +0000
3+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml 2014-06-05 13:52:21 +0000
4@@ -20,6 +20,7 @@
5 \qmltype ComposerSheet
6 \inherits SheetBase
7 \inqmlmodule Ubuntu.Components.Popups 1.0
8+ \deprecated
9 \ingroup ubuntu-popups
10 \brief Much like the \l DefaultSheet the Composer Sheet allows an application to insert a content
11 view over the focused view without disrupting the navigation pattern. However the Composer Sheet
12@@ -56,6 +57,8 @@
13 }
14 }
15 \endqml
16+
17+ \b{Sheets are deprecated. Consider using \l Dialog, \l Popover or \l PageStack instead.}
18 */
19
20 SheetBase {
21
22=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
23--- modules/Ubuntu/Components/Popups/DefaultSheet.qml 2014-04-23 08:50:20 +0000
24+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml 2014-06-05 13:52:21 +0000
25@@ -19,6 +19,7 @@
26
27 /*!
28 \qmltype DefaultSheet
29+ \deprecated
30 \inherits SheetBase
31 \inqmlmodule Ubuntu.Components.Popups 1.0
32 \ingroup ubuntu-popups
33@@ -58,6 +59,9 @@
34 }
35 }
36 \endqml
37+
38+ \b{Sheets are deprecated. Consider using \l Dialog, \l Popover or \l PageStack instead.}
39+
40 */
41 SheetBase {
42 id: sheet
43
44=== modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml'
45--- modules/Ubuntu/Components/Popups/SheetBase.qml 2014-04-23 08:50:20 +0000
46+++ modules/Ubuntu/Components/Popups/SheetBase.qml 2014-06-05 13:52:21 +0000
47@@ -19,16 +19,22 @@
48
49 /*!
50 \qmltype SheetBase
51+ \deprecated
52 \inqmlmodule Ubuntu.Components.Popups 1.0
53 \ingroup ubuntu-popups
54 \brief Parent class of different types of sheets. Not to be used directly.
55
56 Examples: See subclasses.
57- \b{This component is under heavy development.}
58+ \b{Sheets are deprecated. Consider using \l Dialog, \l Popover or \l PageStack instead.}
59 */
60 PopupBase {
61 id: sheet
62
63+ Component.onCompleted: {
64+ print("WARNING: Sheets are deprecated. " +
65+ "Consider using Dialog, Popover or PageStack instead.")
66+ }
67+
68 /*!
69 \preliminary
70 \qmlproperty list<Object> container

Subscribers

People subscribed via source and target branches