Ubuntu Calculator App

Merge lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard into lp://qastaging/ubuntu-calculator-app

  1. ubuntu-calculator-app-welcome-wizard
  2. Merge into trunk
Proposed by Bartosz Kosiorek
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 198
Merged at revision: 263
Proposed branch: lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard
Merge into: lp://qastaging/ubuntu-calculator-app
Diff against target: 3578 lines (+3199/-26)
35 files modified
CMakeLists.txt (+2/-0)
app/CMakeLists.txt (+2/-0)
app/graphics/CMakeLists.txt (+16/-0)
app/graphics/access-sci-keyboard.svg (+91/-0)
app/graphics/copy-formula.svg (+275/-0)
app/graphics/copy-item-from-history.svg (+297/-0)
app/graphics/delete-formula.svg (+137/-0)
app/graphics/delete-item-from-history.svg (+184/-0)
app/graphics/edit-formula.svg (+106/-0)
app/graphics/edit-item-from-history.svg (+297/-0)
app/graphics/fav-item-from-history.svg (+297/-0)
app/graphics/rotate-keyboard.svg (+190/-0)
app/graphics/select-multiple-item-from-history.svg (+318/-0)
app/ubuntu-calculator-app.qml (+17/-3)
app/ui/ActionButton.qml (+41/-0)
app/ui/Walkthrough.qml (+170/-0)
app/welcomewizard/CMakeLists.txt (+8/-0)
app/welcomewizard/Slide1.qml (+31/-0)
app/welcomewizard/Slide10.qml (+31/-0)
app/welcomewizard/Slide11.qml (+112/-0)
app/welcomewizard/Slide2.qml (+31/-0)
app/welcomewizard/Slide3.qml (+31/-0)
app/welcomewizard/Slide4.qml (+31/-0)
app/welcomewizard/Slide5.qml (+31/-0)
app/welcomewizard/Slide6.qml (+31/-0)
app/welcomewizard/Slide7.qml (+31/-0)
app/welcomewizard/Slide8.qml (+31/-0)
app/welcomewizard/Slide9.qml (+31/-0)
app/welcomewizard/SlideBase.qml (+98/-0)
app/welcomewizard/WelcomeWizard.qml (+48/-0)
debian/changelog (+9/-3)
po/com.ubuntu.calculator.pot (+133/-19)
tests/autopilot/ubuntu_calculator_app/__init__.py (+31/-1)
tests/autopilot/ubuntu_calculator_app/tests/__init__.py (+9/-0)
tests/autopilot/ubuntu_calculator_app/tests/test_main.py (+1/-0)
To merge this branch: bzr merge lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Michal Predotka (community) Approve
Review via email: mp+281699@code.qastaging.launchpad.net

Commit message

Display "Tip of the day"/"Welcome wizard" during first calculator run (lp: #1442804)

Description of the change

Display "Tip of the day"/"Welcome wizard" during first calculator run (lp: #1442804)

To post a comment you must log in.
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

To do not break Autopilot, we should implement a way to skip Welcome Wizard.
It is already implemented in Music App.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:186
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/52/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/365/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/52/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard updated
187. By Bartosz Kosiorek

Fix missing icon

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:187
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/53/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/367/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/53/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard updated
188. By Bartosz Kosiorek

Merge with trunk

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:188
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/54/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/368/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/54/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard updated
189. By Bartosz Kosiorek

Fix installing icon

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:189
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/55/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/369/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/55/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard updated
190. By Bartosz Kosiorek

Fix icon

191. By Bartosz Kosiorek

Update translations

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:191
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/98/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/370/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/98/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:191
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/100/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/372/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/100/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard updated
192. By Bartosz Kosiorek

Small improvement in function parameters

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:192
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/101/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/373/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/101/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard updated
193. By Bartosz Kosiorek

Remove ~/.config/com.ubuntu.calculator directory every test run

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:193
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/115/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/389/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/115/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard updated
194. By Bartosz Kosiorek

Remove double Welcome Screen

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:194
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/140/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/417/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/140/rebuild

review: Approve (continuous-integration)
lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard updated
195. By Bartosz Kosiorek

Add Michal to changelog

196. By Bartosz Kosiorek

Migrate to SDK components 1.3

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:196
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/141/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/418/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/141/rebuild

review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:196
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/143/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/420/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/143/rebuild

review: Approve (continuous-integration)
lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard updated
197. By Bartosz Kosiorek

Update translations

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:197
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/147/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/424/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/147/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

I would simplify the texts:-

"Enjoy the power of maths using Calculator" (note en_GB is maths, en_US is math)
"Access scientific functions with a left swipe on the numeric keypad"
"Rotate device to show numeric and scientific functions together"
"Swipe right to delete items from calculator history"
"Long press to select multiple calculations for deletion"
"Long press <-- to clear all formulas from input bar"
"Swipe left and press pencil to edit calculation"
"Swipe left and press star to add calculations to favourites view"
"Click in the middle of a formula to edit in place"
"Long press to copy part or all of a formula to the clipboard"

lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-welcome-wizard updated
198. By Bartosz Kosiorek

Update text of slides.

Revision history for this message
Michal Predotka (mpredotka) wrote :

@popey many thanks for your input regarding the text.
In my opinion the wizard can be merged now.

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:198
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/148/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/425/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/148/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Screenshots for review:-

http://people.canonical.com/~alan/screenshots/device-2016-01-29-105654.png
http://people.canonical.com/~alan/screenshots/device-2016-01-29-105708.png
http://people.canonical.com/~alan/screenshots/device-2016-01-29-105713.png
http://people.canonical.com/~alan/screenshots/device-2016-01-29-105718.png
http://people.canonical.com/~alan/screenshots/device-2016-01-29-105722.png
http://people.canonical.com/~alan/screenshots/device-2016-01-29-105726.png
http://people.canonical.com/~alan/screenshots/device-2016-01-29-105731.png
http://people.canonical.com/~alan/screenshots/device-2016-01-29-105735.png
http://people.canonical.com/~alan/screenshots/device-2016-01-29-105740.png
http://people.canonical.com/~alan/screenshots/device-2016-01-29-105744.png
http://people.canonical.com/~alan/screenshots/device-2016-01-29-105749.png

Revision history for this message
James Mulholland (jamesmulholland) wrote :

I'm in agreement with Popeys suggestion for simplified language.

Other than that, I think the content/tone of the tutorial is good.
We may benefit from applying the new style shown in the SDK/Toolkit documentation - the biggest difference being that we would point to elements of the calculator UI itself, rather than using the static images we currently have.

Instructional Overlays Toolkit Doc:
https://docs.google.com/a/canonical.com/document/d/1Ki-b5N2A_R8vkQhGBcY1s_Y-EAooB8j2jrd6NENuUB4/edit?usp=sharing

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