Ubuntu UI Toolkit

Merge lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/modellessDatePicker into lp://qastaging/ubuntu-ui-toolkit/staging

  1. modellessDatePicker
  2. Merge into staging
Proposed by Cris Dywan
Status: Work in progress
Proposed branch: lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/modellessDatePicker
Merge into: lp://qastaging/ubuntu-ui-toolkit/staging
Diff against target: 1382 lines (+248/-972) (has conflicts)
12 files modified
examples/ubuntu-ui-toolkit-gallery/Pickers.qml (+3/-3)
src/Ubuntu/Components/Pickers/1.3/DatePicker.qml (+239/-224)
src/Ubuntu/Components/Pickers/1.3/DayModel.qml (+0/-86)
src/Ubuntu/Components/Pickers/1.3/HoursModel.qml (+0/-63)
src/Ubuntu/Components/Pickers/1.3/MinutesModel.qml (+0/-63)
src/Ubuntu/Components/Pickers/1.3/MonthModel.qml (+0/-98)
src/Ubuntu/Components/Pickers/1.3/PickerModelBase.qml (+0/-154)
src/Ubuntu/Components/Pickers/1.3/PickerRow.qml (+0/-137)
src/Ubuntu/Components/Pickers/1.3/SecondsModel.qml (+0/-63)
src/Ubuntu/Components/Pickers/1.3/YearModel.qml (+0/-69)
src/Ubuntu/Components/Pickers/Pickers.pro (+0/-8)
src/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml (+6/-4)
Text conflict in src/Ubuntu/Components/Pickers/1.3/DatePicker.qml
To merge this branch: bzr merge lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/modellessDatePicker
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu SDK team Pending
Review via email: mp+273873@code.qastaging.launchpad.net

Commit message

Modelless declarative DatePicker

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1667
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2384/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1114
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1114/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1111

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

review: Needs Fixing (continuous-integration)
Reply
lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/modellessDatePicker updated
1668. By Cris Dywan

Simplify picking of format

1669. By Cris Dywan

Restore normal DatePicker demo page

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

FAILED: Continuous integration, rev:1669
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2424/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1152/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1154/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1151/console

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

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

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/10/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/10/console

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

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/25/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/25/console

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

FAILED: Continuous integration, rev:1669
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/61/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/143/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/61/rebuild

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

FAILED: Continuous integration, rev:1669
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/59/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/150/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/59/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

1669. By Cris Dywan

Restore normal DatePicker demo page

1668. By Cris Dywan

Simplify picking of format

1667. By Cris Dywan

Drop internal picker models

1666. By Cris Dywan

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1665. By Cris Dywan

Redo sizing based on one Label like the original code

1664. By Cris Dywan

Correct positioning and styling

1663. By Cris Dywan

Modelless declarative DatePicker

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches