Merge lp:~f-riccardo87/ubuntu-calculator-app/results-appearence into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Proposed by
Riccardo Ferrazzo
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Dalius | ||||||||
Approved revision: | 36 | ||||||||
Merged at revision: | 34 | ||||||||
Proposed branch: | lp:~f-riccardo87/ubuntu-calculator-app/results-appearence | ||||||||
Merge into: | lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk | ||||||||
Diff against target: |
232 lines (+45/-57) 5 files modified
Simple/CalcLabel.qml (+7/-0) Simple/Memory.qml (+0/-1) Simple/Screen.qml (+22/-38) Simple/SimplePage.qml (+16/-17) Storage.qml (+0/-1) |
||||||||
To merge this branch: | bzr merge lp:~f-riccardo87/ubuntu-calculator-app/results-appearence | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dalius (community) | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email: mp+154159@code.launchpad.net |
Commit message
Orange text only for user inputs, every label editable, addFromMemory function restored
Description of the change
Changes:
- Orange text used only for user inputs
- Total label editable
- addFromMemory() function now works again
To post a comment you must log in.
PASSED: Continuous integration, rev:36 91.189. 93.125: 8080/job/ ubuntu- calculator- app-ci/ 3/ 91.189. 93.125: 8080/job/ ubuntu- calculator- app-quantal- amd64-ci/ 3/console 91.189. 93.125: 8080/job/ ubuntu- calculator- app-raring- amd64-ci/ 3/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.125: 8080/job/ ubuntu- calculator- app-ci/ 3/rebuild
http://