lp:~f-riccardo87/ubuntu-calculator-app/new-design

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk at revision 20

Dalius (community): Approve on 2013-03-08

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2013-03-08

Diff: 1726 lines (+1060/-545)

19 files modified

KeyboardButton.qml (+0/-29)
KeyboardsView.qml (+0/-31)
Memory.qml (+0/-12)
Scientific/KeyboardButton.qml (+29/-0)
Scientific/KeyboardsView.qml (+31/-0)
Scientific/Memory.qml (+12/-0)
Scientific/ScientificPage.qml (+188/-0)
Scientific/Screen.qml (+68/-0)
Scientific/StdKeyboard.qml (+222/-0)
Screen.qml (+0/-68)
Simple/CalcKeyboard.qml (+102/-0)
Simple/CalcLabel.qml (+51/-0)
Simple/KeyboardButton.qml (+29/-0)
Simple/Memory.qml (+12/-0)
Simple/Screen.qml (+79/-0)
Simple/SimplePage.qml (+175/-0)
StdKeyboard.qml (+0/-222)
Storage.qml (+56/-0)
calculator.qml (+6/-183)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

30. By Riccardo Ferrazzo on 2013-03-08

added some files

29. By Riccardo Ferrazzo on 2013-03-08

conflicts resolved

28. By Riccardo Ferrazzo on 2013-03-08

tweaks

27. By Riccardo Ferrazzo on 2013-03-08

scientific calculator merged

26. By Riccardo Ferrazzo on 2013-03-06

persistent storage works

25. By Riccardo Ferrazzo on 2013-03-05

some errors fixed

24. By Riccardo Ferrazzo on 2013-03-05

persistent storage attempt

23. By Riccardo Ferrazzo on 2013-03-04

persistent label text

22. By Riccardo Ferrazzo on 2013-03-04

multiline inputs

21. By Riccardo Ferrazzo on 2013-03-02

ui improved