Merge lp:~nik90/ubuntu-clock-app/add-timer-placeholder-text into lp:ubuntu-clock-app/saucy

Proposed by Nekhelesh Ramananthan on 2014-01-31
Status: Rejected
Rejected by: Nekhelesh Ramananthan on 2014-04-05
Proposed branch: lp:~nik90/ubuntu-clock-app/add-timer-placeholder-text
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 13 lines (+1/-2)
1 file modified
timer/TimerPage.qml (+1/-2)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/add-timer-placeholder-text
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-02-19
David Planella Needs Fixing on 2014-02-19
Leo Arias (community) 2014-01-31 Approve on 2014-02-01
Review via email: mp+204324@code.launchpad.net

Commit message

Added a placeholder text for the timer preset name instead of showing a blank field. Fixed autopilot test to use UITK TextField emulator.

Description of the change

Just proposing to see code diff. Do not merge.

To post a comment you must log in.
Leo Arias (elopio) wrote :

Looks good to me.
Just, please update the copyright year on timer/PresetList.qml

review: Needs Fixing (code review)
Nekhelesh Ramananthan (nik90) wrote :

> Looks good to me.
> Just, please update the copyright year on timer/PresetList.qml

Actually every file in the clock app code base requires the copyright year to be updated for 2014. Do you mind if I do them all in one MP rather than this one? Also should I update it Copyright (C) 2013-2014 Canonical Ltd?

Nekhelesh Ramananthan (nik90) wrote :

> Also should I update it Copyright (C) 2013-2014 Canonical Ltd?

Never mind, I noticed that in your MP you did 2013, 2014. Will do this in another MP if you agree.

FAILED: Continuous integration, rev:317
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nik90/ubuntu-clock-app/add-timer-placeholder-text/+merge/204324/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-app-ci/180/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/913
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/180
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/180
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/98

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/180/rebuild

review: Needs Fixing (continuous-integration)
Nekhelesh Ramananthan (nik90) wrote :
Leo Arias (elopio) wrote :

Yes, it's ok, thanks for updating all of them.

It seems the TextField emulator has not been released yet. It's weird because it has been on trunk for almost 15 days. I'll ask on Monday when do they plan to have a new release.

Marking as approved, but the tests will not pass yet.

Thanks you.

review: Approve
David Planella (dpm) wrote :

10 + PropertyChanges { target: namePreset; text: "Timer #" + (listPreset.listCount + 1) }

Needs to be made translatable with i18n.tr() - is this something that we need for MWC?

review: Needs Fixing
Nekhelesh Ramananthan (nik90) wrote :

True not a priority for MWC. Postponing for next. Let's not take any chances.

Unmerged revisions

324. By Nekhelesh Ramananthan on 2014-02-19

removed textfield emulator call since it is already in trunk

323. By Nekhelesh Ramananthan on 2014-02-19

merged trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'timer/TimerPage.qml'
2--- timer/TimerPage.qml 2014-02-15 13:36:43 +0000
3+++ timer/TimerPage.qml 2014-02-19 21:31:20 +0000
4@@ -131,8 +131,7 @@
5 PropertyChanges { target: analogTimer; enableMouseArea: false }
6 PropertyChanges { target: listPreset; visible: false }
7 PropertyChanges { target: namePreset; visible: true }
8- // TODO: Fix autopilot test first before enabling this change in another MP
9- //PropertyChanges { target: namePreset; text: "Timer #" + (listPreset.listCount + 1) }
10+ PropertyChanges { target: namePreset; text: "Timer #" + (listPreset.listCount + 1) }
11 PropertyChanges { target: addPresetToolbarButton; visible: false }
12 PropertyChanges { target: editPresetToolbarButton; visible: true }
13 PropertyChanges { target: cancelPresetToolbarButton; visible: true }

Subscribers

People subscribed via source and target branches