Ubuntu Calculator App

Merge lp://staging/~rpadovani/ubuntu-calculator-app/1365564 into lp://staging/~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

1365564
Merge into old_trunk

Proposed by Riccardo Padovani on 2014-09-04

Status:

Merged

Approved by:

Alan Pope 🍺🐧🐱 🦄 on 2014-10-28

Approved revision:

325

Merged at revision:

339

Proposed branch:

lp://staging/~rpadovani/ubuntu-calculator-app/1365564

Merge into:

lp://staging/~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

Diff against target:

783 lines (+42/-516)

9 files modified

Simple/CalcLabel.qml (+1/-53)
Simple/Memory.qml (+1/-2)
Simple/Screen.qml (+2/-115)
Simple/SimplePage.qml (+33/-106)
images/dot.svg (+0/-74)
images/edit.svg (+0/-81)
images/generate.py (+0/-24)
tests/autopilot/ubuntu_calculator_app/__init__.py (+5/-13)
tests/autopilot/ubuntu_calculator_app/tests/test_screen.py (+0/-48)

To merge this branch:

bzr merge lp://staging/~rpadovani/ubuntu-calculator-app/1365564

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-10-20
Mihir Soni		2014-09-04	Approve on 2014-09-04
Review via email: mp+233400@code.staging.launchpad.net

Commit message

Removed labels from calculations, as per-design request

Description of the change

Removed labels from calculations, as per-design request

Revision history for this message

Alan Pope 🍺🐧🐱 🦄 (popey) wrote on 2014-09-04:

Not sure about the width of the numbers with the sign over on the far left. I think we should make sure this passes CI then build a click for the design team to review.

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-09-04:

PASSED: Continuous integration, rev:321
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/241/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1887
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1887/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/36

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

review: Approve (continuous-integration)

Revision history for this message

Riccardo Padovani (rpadovani) wrote on 2014-09-04:

Ok, seems tests work well.
I build a click, you can find it here: http://people.ubuntu.com/~rpadovani/touch/calc/com.ubuntu.calculator_1.3.321_all.click

Revision history for this message

Mihir Soni (mihirsoni) wrote on 2014-09-04:

Looks good to me thanks a lot Riccardo ?

Don't you think we should increase number limit ?

review: Approve

Revision history for this message

Alan Pope 🍺🐧🐱 🦄 (popey) wrote on 2014-09-05:

Have requested John Lea review.

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-09-08:

LOL Riccardo, I just moved these tests into test_screen.py. This will need a rebase with trunk now.

lp://staging/~rpadovani/ubuntu-calculator-app/1365564 updated on 2014-09-08

322. By Riccardo Padovani on 2014-09-08: Merged from trunk

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-09-08:

FAILED: Continuous integration, rev:322
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/256/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1950
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1950/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/51

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

review: Needs Fixing (continuous-integration)

lp://staging/~rpadovani/ubuntu-calculator-app/1365564 updated on 2014-09-08

323. By Riccardo Padovani on 2014-09-08: Removed unused tests

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-09-08:

PASSED: Continuous integration, rev:323
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/257/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1952
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1952/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/52

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

review: Approve (continuous-integration)

Revision history for this message

Leo Arias (elopio) wrote on 2014-09-12:

Can you please also remove the workaround we did for bug #1329536 ?
If this works just as with any label, then swipe_to_delete and _drag_pointing_device_to_delete in emulators.py are no longer needed/