Merge lp:~f-riccardo87/ubuntu-calculator-app/new-design into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Ferrazzo]

added simple view

Simple view creaed and merged with existent scientific view

[Dalius (dalius-sandbox)]

Could you resolve conflicts? I guess you need to pull from trunk.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:28
http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/10/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/./build=pbuilder,distribution=quantal,flavor=amd64/10/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/10//rebuild/?

review: Needs Fixing (continuous-integration)

[Riccardo Ferrazzo (f-riccardo87)]

I'm trying now

In data venerdì 8 marzo 2013 09:47:28, hai scritto:
> Could you resolve conflicts? I guess you need to pull from trunk.
--
Riccardo Ferrazzo <email address hidden>

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

29. By Riccardo Ferrazzo on 2013-03-08

conflicts resolved

30. By Riccardo Ferrazzo on 2013-03-08

added some files

[Riccardo Ferrazzo (f-riccardo87)]

Conflicts resolved, also i've seen that some files are missing in the previous
review :)

In data venerdì 8 marzo 2013 09:47:28, hai scritto:
> Could you resolve conflicts? I guess you need to pull from trunk.
--
Riccardo Ferrazzo <email address hidden>

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:29
http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/11/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/./build=pbuilder,distribution=quantal,flavor=amd64/11/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/11//rebuild/?

review: Approve (continuous-integration)

[Dalius (dalius-sandbox)]

review: Approve

=== removed file 'KeyboardButton.qml'
--- KeyboardButton.qml	2013-02-27 08:59:52 +0000
+++ KeyboardButton.qml	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-Rectangle {
-    id: buttonRect
-    width: units.gu(9)
-    height: units.gu(6)
-    radius: units.gu(1)
-    color: buttonMA.pressed ? "#c0c0c0" : "white"
-
-    property alias text: buttonText.text
-
-    signal clicked()
-    signal pressAndHold()
-
-    Text {
-        id: buttonText
-        anchors.centerIn: parent
-        color: "#dd4814"
-        font.pixelSize: units.gu(3)
-    }
-
-    MouseArea {
-        id: buttonMA
-        anchors.fill: parent
-        onClicked: buttonRect.clicked()
-        onPressAndHold: buttonRect.pressAndHold();
-    }
-}
 
=== removed file 'KeyboardsView.qml'
--- KeyboardsView.qml	2013-02-25 10:57:31 +0000
+++ KeyboardsView.qml	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-import QtQuick 2.0
-
-Flickable {
-    id: keyboardsView
-    width: parent.width
-    clip: true
-
-    contentWidth: stdKeyboard.width
-    contentHeight: stdKeyboard.height
-
-    property double buttonRowHeight: units.gu(8);
-    property double targetPosition
- 
-    onMovementEnded: {
-       var stopPositionInRow = contentY % buttonRowHeight;
-       if( Math.abs(stopPositionInRow) > (buttonRowHeight/2)) {
-            targetPosition = contentY+(buttonRowHeight - stopPositionInRow)
-       }
-       else {
-            targetPosition = contentY -stopPositionInRow
-       }
-       snap.start();
-    }
-
-    NumberAnimation {id: snap; target: keyboardsView; property: "contentY"; to: targetPosition }
-
-    StdKeyboard {
-        id: stdKeyboard
-        width: keyboardsView.width
-    }
-}
 
=== removed file 'Memory.qml'
--- Memory.qml	2013-02-25 20:13:21 +0000
+++ Memory.qml	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-import QtQuick 2.0
-
-ListModel {
-    id: memory
-
-    ListElement {
-        isLastItem: true
-        formula: ''
-        answer: ''
-        formula_data: ''
-    }
-}
 
=== added directory 'Scientific'
=== added file 'Scientific/KeyboardButton.qml'
--- Scientific/KeyboardButton.qml	1970-01-01 00:00:00 +0000
+++ Scientific/KeyboardButton.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,29 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    id: buttonRect
+    width: units.gu(9)
+    height: units.gu(6)
+    radius: units.gu(1)
+    color: buttonMA.pressed ? "#c0c0c0" : "white"
+
+    property alias text: buttonText.text
+
+    signal clicked()
+    signal pressAndHold()
+
+    Text {
+        id: buttonText
+        anchors.centerIn: parent
+        color: "#dd4814"
+        font.pixelSize: units.gu(3)
+    }
+
+    MouseArea {
+        id: buttonMA
+        anchors.fill: parent
+        onClicked: buttonRect.clicked()
+        onPressAndHold: buttonRect.pressAndHold();
+    }
+}
 
=== added file 'Scientific/KeyboardsView.qml'
--- Scientific/KeyboardsView.qml	1970-01-01 00:00:00 +0000
+++ Scientific/KeyboardsView.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,31 @@
+import QtQuick 2.0
+
+Flickable {
+    id: keyboardsView
+    width: parent.width
+    clip: true
+
+    contentWidth: stdKeyboard.width
+    contentHeight: stdKeyboard.height
+
+    property double buttonRowHeight: units.gu(8);
+    property double targetPosition
+ 
+    onMovementEnded: {
+       var stopPositionInRow = contentY % buttonRowHeight;
+       if( Math.abs(stopPositionInRow) > (buttonRowHeight/2)) {
+            targetPosition = contentY+(buttonRowHeight - stopPositionInRow)
+       }
+       else {
+            targetPosition = contentY -stopPositionInRow
+       }
+       snap.start();
+    }
+
+    NumberAnimation {id: snap; target: keyboardsView; property: "contentY"; to: targetPosition }
+
+    StdKeyboard {
+        id: stdKeyboard
+        width: keyboardsView.width
+    }
+}
 
=== added file 'Scientific/Memory.qml'
--- Scientific/Memory.qml	1970-01-01 00:00:00 +0000
+++ Scientific/Memory.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+
+ListModel {
+    id: memory
+
+    ListElement {
+        isLastItem: true
+        formula: ''
+        answer: ''
+        formula_data: ''
+    }
+}
 
=== added file 'Scientific/ScientificPage.qml'
--- Scientific/ScientificPage.qml	1970-01-01 00:00:00 +0000
+++ Scientific/ScientificPage.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,188 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "../engine.js" as CALC
+
+Page {
+
+    property string formula_text: '';
+    property string brackets_added: '';
+    property string formula_text_for_engine: '';
+    property var formula: [];
+    property string answer: '';
+    property string angularUnit: 'RAD';
+
+    function formulaPush(visual, engine, type) {
+        var prev = null;
+        if (formula.length > 0)
+            prev = formula[formula.length-1];
+
+        var result = CALC.getFormulaTexts(prev, visual, engine, type, brackets_added.length/2)
+
+        var visual_text = result[0];
+        var engine_text = result[1];
+        var fixed_type = result[2];
+        var brackets_count = result[3];
+
+        brackets_added = brackets_added.substr(0, brackets_count*2);
+
+        if (visual_text !== null && engine_text !== null) {
+            formula_text += visual_text;
+            formula_text_for_engine += engine_text;
+            formula.push({'visual': visual_text, 'engine': engine_text, 'type': fixed_type});
+
+            answer = calculate()
+        }
+        else {
+            formulaView.showError();
+        }
+    }
+
+    function formulaPop() {
+        if (formula.length > 0) {
+            var prev = formula[formula.length-1];
+            formula_text = formula_text.substring(0, formula_text.length - prev.visual.length);
+            formula_text_for_engine = formula_text_for_engine.substring(0, formula_text_for_engine.length - prev.engine.length);
+            if (prev.type === 'function' || (prev.type === 'group' && prev.engine === '(' || prev.engine === '*('))
+                brackets_added = brackets_added.substring(0, brackets_added.length-2)
+            else if (prev.type === 'group' && prev.engine === ')')
+                brackets_added += " )"
+            formula.pop();
+
+            answer = calculate()
+        }
+    }
+
+    function formulaReset() {
+        formula_text = '';
+        formula_text_for_engine = '';
+        formula = [];
+        answer = "";
+        brackets_added = '';
+    }
+
+    function calculate() {
+
+        console.debug('Formula for engine: ' + formula_text_for_engine)
+
+        var result = 0;
+        try {
+            result = CALC.parse(angularUnit + formula_text_for_engine + brackets_added);
+            if (result === Number.POSITIVE_INFINITY)
+                result = '∞';
+            else if (result === Number.NEGATIVE_INFINITY)
+                result = '-∞';
+        } catch(exception) {
+            if(exception instanceof CALC.DivisionByZeroError){
+                result = "division by zero error";
+            } else if(exception instanceof SyntaxError){
+                result = "";
+            } else if(exception instanceof CALC.ParenthesisError){
+                if(exception.missing === '(')
+                    brackets_added = brackets_added.substr(0, brackets_added.length-2);
+                else
+                    brackets_added+=(' '+exception.missing);
+                result = calculate();
+            }
+        }
+        return result;
+    }
+
+    function addFromMemory(answerToAdd, formulaData) {
+        if (answerToAdd !== '' && answerToAdd.indexOf('error') === -1 && answerToAdd.indexOf('∞') === -1) {
+            for (var i = 0; i < answerToAdd.length; i++)
+                formulaPush(answerToAdd[i], answerToAdd[i], answerToAdd[i] === '.' ? 'real' : 'number')
+        }
+        else {
+            var fd = JSON.parse(formulaData);
+
+            var prev = null;
+            if (formula.length > 0)
+                prev = formula[formula.length-1];
+
+            var result = CALC.getFormulaTexts(prev, fd[0].engine, fd[0].engine, fd[0].type, brackets_added.length/2)
+
+            if (result[0] !== null && result[1] !== null) {
+                for (var idx = 0; idx < fd.length; idx++) {
+                    formula_text += fd[idx].visual;
+                    formula_text_for_engine += fd[idx].engine;
+                    formula.push({'visual': fd[idx].visual, 'engine': fd[idx].engine, 'type': fd[idx].type});
+                }
+                answer = calculate()
+            }
+        }
+    }
+
+    Item {
+        anchors.fill: parent
+
+        ListView {
+            id: formulaView
+            anchors.fill: parent
+            snapMode: ListView.SnapOneItem
+            clip: true
+
+            property string currentFormula: '%1<font color="lightgray">%2</font>'.arg(formula_text).arg(brackets_added)
+            property string currentAnswer: answer
+            property color color: "#FFFFFF";
+            property bool positionedAtEnd: true;
+
+            function addCurrentToMemory() {
+                if (formula_text !== '') {
+                    memory.get(memory.count-1).isLastItem = false
+                    memory.get(memory.count-1).formula_data = JSON.stringify(formula)
+                    memory.append({'formula': memory.get(memory.count-1).formula, 'answer': memory.get(count-1).answer, 'formula_data': '', 'isLastItem': true})
+                    positionViewAtEnd();
+                }
+            }
+
+            function showError() {
+                animateError.start()
+            }
+
+            PropertyAnimation {id: animateError; target: formulaView; properties: "color"; from: "#FFA0A0"; to: "#FFFFFF"; duration: 100}
+
+            add: Transition{
+                SequentialAnimation {
+                    NumberAnimation {property: "y"; from: formulaView.footerItem.y; to: formulaView.contentY; duration: 200; }
+                    ParallelAnimation{
+                        NumberAnimation { property: "scale"; from: 0; to: 1.0; duration: 200 }
+                        NumberAnimation { property: "y"; from: formulaView.contentY; duration: 0 }
+                    }
+                }
+            }
+
+            onCurrentFormulaChanged: {
+                memory.get(memory.count-1).formula = currentFormula
+                positionViewAtEnd();
+            }
+
+            onCurrentAnswerChanged: {
+                memory.get(memory.count-1).answer = currentAnswer
+            }
+
+            onContentYChanged: {
+                positionedAtEnd = formulaView.indexAt(0, contentY+0) == formulaView.model.count-1
+            }
+
+            model: Memory{
+                id: memory
+            }
+
+            delegate: Screen {
+                id: screen
+                width: formulaView.width
+
+                onUseAnswer: addFromMemory(answerToUse, formulaData)
+            }
+
+            footer: KeyboardsView {
+                height: formulaView.height - units.gu(24)
+            }
+
+            Scrollbar {
+                flickableItem: formulaView
+                align: Qt.AlignTrailing
+            }
+        }
+    }
+}
 
=== added file 'Scientific/Screen.qml'
--- Scientific/Screen.qml	1970-01-01 00:00:00 +0000
+++ Scientific/Screen.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,68 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+
+Rectangle{
+    id: root
+    height: columnA.height + units.gu(4)
+    color: screenMA.pressed && !isLastItem ? "#FFDB88" : formulaView.color
+    transformOrigin: Item.Bottom
+
+    signal useAnswer(string answerToUse, string formulaData)
+
+    Text {
+        width: parent.width
+        visible: isLastItem && index && formulaView.positionedAtEnd > 0
+        clip: true
+        text: "^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^"
+        color: "#C0C0C0"
+    }
+
+
+    Column {
+        id: columnA
+        spacing: units.gu(2)
+        width: parent.width - units.gu(8)
+        anchors.centerIn: parent
+
+        Label {
+            id: formulaLabel
+            width: parent.width
+            height: units.gu(13)
+            font.pixelSize: units.gu(4)
+            fontSizeMode: Text.Fit
+            wrapMode: Text.WordWrap
+            text: formula
+        }
+
+        Label {
+            id: answerLabel
+            width: parent.width
+            height: units.gu(5)
+            clip: true
+            font.pixelSize: units.gu(4)
+            fontSizeMode: Text.Fit
+            color: "#dd4814"
+            text: '= ' + answer
+        }
+    }
+
+    Divider {
+        visible: !isLastItem
+        width: parent.width
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+    }
+
+    MouseArea {
+        id: screenMA
+        anchors.fill: parent
+        onClicked: {
+            if (answer.indexOf('error') === -1)
+                root.useAnswer(answer, formula_data)
+        }
+    }
+}
 
=== added file 'Scientific/StdKeyboard.qml'
--- Scientific/StdKeyboard.qml	1970-01-01 00:00:00 +0000
+++ Scientific/StdKeyboard.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,222 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Item {
+    width: parent.width
+    height: grid.height+units.gu(4)
+
+    Grid {
+        id: grid
+        columns: Math.floor(parent.width / units.gu(46))
+
+        anchors{
+            top: parent.top
+            topMargin: units.gu(2)
+            horizontalCenter: parent.horizontalCenter
+        }
+        spacing: units.gu(2)
+        Grid{
+            columns:4
+            spacing: units.gu(2)
+
+            KeyboardButton {
+                text: "("
+                onClicked: formulaPush('(', '(', 'group')
+            }
+
+            KeyboardButton {
+                text: ")"
+                onClicked: formulaPush(')', ')', 'group')
+            }
+
+            KeyboardButton {
+                text: "C"
+                onClicked: {
+                    formulaView.addCurrentToMemory();
+                    formulaReset();
+                }
+            }
+
+            KeyboardButton {
+                text: "M"
+                onClicked: {
+                    formulaView.addCurrentToMemory();
+                }
+            }
+
+            KeyboardButton {
+                text: "7"
+                onClicked: formulaPush('7', '7', 'number')
+            }
+
+            KeyboardButton {
+                text: "8"
+                onClicked: formulaPush('8', '8', 'number')
+            }
+
+            KeyboardButton {
+                text: "9"
+                onClicked: formulaPush('9', '9', 'number')
+            }
+
+            KeyboardButton {
+                text: "÷"
+                onClicked: formulaPush('÷', '/', 'operation')
+            }
+
+            KeyboardButton {
+                text: "4"
+                onClicked: formulaPush('4', '4', 'number')
+            }
+
+            KeyboardButton {
+                text: "5"
+                onClicked: formulaPush('5', '5', 'number')
+            }
+
+            KeyboardButton {
+                text: "6"
+                onClicked: formulaPush('6', '6', 'number')
+            }
+
+            KeyboardButton {
+                text: "×"
+                onClicked: formulaPush('×', '*', 'operation')
+            }
+
+            KeyboardButton {
+                text: "1"
+                onClicked: formulaPush('1', '1', 'number')
+            }
+
+            KeyboardButton {
+                text: "2"
+                onClicked: formulaPush('2', '2', 'number')
+            }
+
+            KeyboardButton {
+                text: "3"
+                onClicked: formulaPush('3', '3', 'number')
+            }
+
+            KeyboardButton {
+                text: "+"
+                onClicked: formulaPush('+', '+', 'operation')
+            }
+
+            KeyboardButton {
+                text: "0"
+                onClicked: formulaPush('0', '0', 'number')
+            }
+
+            KeyboardButton {
+                text: "."
+                onClicked: formulaPush('.', '.', 'real')
+            }
+
+            KeyboardButton {
+                text: "←"
+                onClicked: formulaPop()
+                onPressAndHold: formulaReset()
+            }
+
+            KeyboardButton {
+                text: "−"
+                onClicked: formulaPush('−', '-', 'operation')
+            }
+
+        }
+
+        Grid{
+            spacing: units.gu(2)
+
+            KeyboardButton {
+                text: "sin"
+                onClicked: formulaPush('sin', 'sin', 'function')
+            }
+
+            KeyboardButton {
+                text: "cos"
+                onClicked: formulaPush('cos', 'cos', 'function')
+            }
+
+            KeyboardButton {
+                text: "tan"
+                onClicked: formulaPush('tan', 'tan', 'function')
+            }
+
+            KeyboardButton {
+                text: angularUnit
+                onClicked: {
+                    if (angularUnit === 'RAD') {
+                        angularUnit = 'DEG';
+                    }
+                    else if (angularUnit === 'DEG') {
+                        angularUnit = 'GRAD';
+                    }
+                    else if (angularUnit === 'GRAD') {
+                        angularUnit = 'RAD'
+                    }
+                    calculate();
+                }
+            }
+
+            KeyboardButton {
+                text: "asin"
+                onClicked: formulaPush('asin', 'asin', 'function')
+            }
+
+            KeyboardButton {
+                text: "acos"
+                onClicked: formulaPush('acos', 'acos', 'function')
+            }
+
+            KeyboardButton {
+                text: "atan"
+                onClicked: formulaPush('atan', 'atan', 'function')
+            }
+
+
+            KeyboardButton {
+                text: "ln"
+                onClicked: formulaPush('ln', 'ln', 'function')
+            }
+
+            KeyboardButton {
+                text: "√"
+                onClicked: formulaPush('√', '√', 'function')
+            }
+
+            KeyboardButton {
+                text: "π"
+                onClicked: formulaPush('π', 'π', 'const')
+            }
+
+            KeyboardButton {
+                text: "e"
+                onClicked: formulaPush('e', 'E', 'const')
+            }
+
+            KeyboardButton {
+                text: "log"
+                onClicked: formulaPush('log', 'log', 'function')
+            }
+
+            KeyboardButton {
+                text: "%"
+                onClicked: formulaPush('%', '%', 'operation')
+            }
+
+            KeyboardButton {
+                text: "!"
+                onClicked: formulaPush('!', '!', 'operation')
+            }
+
+            KeyboardButton {
+                text: "^"
+                onClicked: formulaPush('^', '^', 'operation')
+            }
+        }
+
+    }
+}
 
=== removed file 'Screen.qml'
--- Screen.qml	2013-03-02 09:26:56 +0000
+++ Screen.qml	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
-
-Rectangle{
-    id: root
-    height: columnA.height + units.gu(4)
-    color: screenMA.pressed && !isLastItem ? "#FFDB88" : formulaView.color
-    transformOrigin: Item.Bottom
-
-    signal useAnswer(string answerToUse, string formulaData)
-
-    Text {
-        width: parent.width
-        visible: isLastItem && index && formulaView.positionedAtEnd > 0
-        clip: true
-        text: "^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^"
-        color: "#C0C0C0"
-    }
-
-
-    Column {
-        id: columnA
-        spacing: units.gu(2)
-        width: parent.width - units.gu(8)
-        anchors.centerIn: parent
-
-        Label {
-            id: formulaLabel
-            width: parent.width
-            height: units.gu(13)
-            font.pixelSize: units.gu(4)
-            fontSizeMode: Text.Fit
-            wrapMode: Text.WordWrap
-            text: formula
-        }
-
-        Label {
-            id: answerLabel
-            width: parent.width
-            height: units.gu(5)
-            clip: true
-            font.pixelSize: units.gu(4)
-            fontSizeMode: Text.Fit
-            color: "#dd4814"
-            text: '= ' + answer
-        }
-    }
-
-    Divider {
-        visible: !isLastItem
-        width: parent.width
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-    }
-
-    MouseArea {
-        id: screenMA
-        anchors.fill: parent
-        onClicked: {
-            if (answer.indexOf('error') === -1)
-                root.useAnswer(answer, formula_data)
-        }
-    }
-}
 
=== added directory 'Simple'
=== added file 'Simple/CalcKeyboard.qml'
--- Simple/CalcKeyboard.qml	1970-01-01 00:00:00 +0000
+++ Simple/CalcKeyboard.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,102 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Item {
+    width: parent.width
+    height: grid.height+units.gu(4)
+
+    Grid {
+        id: grid
+        columns: 4
+        anchors{
+            top: parent.top
+            topMargin: units.gu(2)
+            horizontalCenter: parent.horizontalCenter
+        }
+        spacing: units.gu(2)
+
+        KeyboardButton {
+            text: "7"
+            onClicked: formulaPush('7', '7')
+        }
+
+        KeyboardButton {
+            text: "8"
+            onClicked: formulaPush('8', '8')
+        }
+
+        KeyboardButton {
+            text: "9"
+            onClicked: formulaPush('9', '9')
+        }
+
+        KeyboardButton {
+            text: "÷"
+            onClicked: formulaPush('÷', '/')
+        }
+
+        KeyboardButton {
+            text: "4"
+            onClicked: formulaPush('4', '4')
+        }
+
+        KeyboardButton {
+            text: "5"
+            onClicked: formulaPush('5', '5')
+        }
+
+        KeyboardButton {
+            text: "6"
+            onClicked: formulaPush('6', '6')
+        }
+
+        KeyboardButton {
+            text: "×"
+            onClicked: formulaPush('×', '*')
+        }
+
+        KeyboardButton {
+            text: "1"
+            onClicked: formulaPush('1', '1')
+        }
+
+        KeyboardButton {
+            text: "2"
+            onClicked: formulaPush('2', '2')
+        }
+
+        KeyboardButton {
+            text: "3"
+            onClicked: formulaPush('3', '3')
+        }
+
+        KeyboardButton {
+            text: "+"
+            onClicked: formulaPush('+', '+')
+        }
+
+        KeyboardButton {
+            text: "0"
+            onClicked: formulaPush('0', '0')
+        }
+
+        KeyboardButton {
+            text: "."
+            onClicked: formulaPush('.', '.')
+        }
+
+        KeyboardButton {
+            text: "C"
+            onClicked: {
+                formulaView.addCurrentToMemory();
+                clear();
+            }
+        }
+
+        KeyboardButton {
+            text: "−"
+            onClicked: formulaPush('−', '-')
+        }
+
+    }
+}
 
=== added file 'Simple/CalcLabel.qml'
--- Simple/CalcLabel.qml	1970-01-01 00:00:00 +0000
+++ Simple/CalcLabel.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,51 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    id: root
+    width: parent.width
+    height: row.height
+    color: "white"
+
+    property int operationsWidth: operatorLabel.width+formulaLabel.width
+    property string operation: ""
+    property string numbers: ""
+    property bool labelReadOnly: false
+    property string labelText: ""
+    property int numbersHeight: units.gu(4)
+    property string numbersColor: '#757373'
+
+    Row{
+        id: row
+        height: numbersHeight
+        width: parent.width
+        TextField{
+            id: numberName
+            width: row.width-operatorLabel.width-formulaLabel.width
+            anchors.bottom: parent.bottom
+            ItemStyle.delegate: Item{} // removes ubuntu shape
+            readOnly: labelReadOnly
+            text: labelText
+            onTextChanged: { labelText = numberName.text }
+            hasClearButton: false
+        }
+        Label {
+            id: operatorLabel
+            width: units.gu(4)
+            font.pixelSize: units.gu(4)
+            text: root.operation
+            font.family: "Ubuntu"
+        }
+        Label {
+            id: formulaLabel
+            width: units.gu(25)
+            color: numbersColor
+            anchors.bottom: parent.bottom
+            font.pixelSize: numbersHeight
+            fontSizeMode: Text.Fit
+            horizontalAlignment: Text.AlignRight
+            text: root.numbers
+            font.family: "Ubuntu"
+        }
+    }
+}
 
=== added file 'Simple/KeyboardButton.qml'
--- Simple/KeyboardButton.qml	1970-01-01 00:00:00 +0000
+++ Simple/KeyboardButton.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,29 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    id: buttonRect
+    width: units.gu(9)
+    height: units.gu(6)
+    radius: units.gu(1)
+    color: buttonMA.pressed ? "#c0c0c0" : "white"
+
+    property alias text: buttonText.text
+
+    signal clicked()
+    signal pressAndHold()
+
+    Text {
+        id: buttonText
+        anchors.centerIn: parent
+        color: "#dd4814"
+        font.pixelSize: units.gu(3)
+    }
+
+    MouseArea {
+        id: buttonMA
+        anchors.fill: parent
+        onClicked: buttonRect.clicked()
+        onPressAndHold: buttonRect.pressAndHold();
+    }
+}
 
=== added file 'Simple/Memory.qml'
--- Simple/Memory.qml	1970-01-01 00:00:00 +0000
+++ Simple/Memory.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+
+ListModel {
+    id: memory
+
+    ListElement {
+        dbId: -1
+        isLastItem: true
+        answer: ''
+        operators: []
+    }
+}
 
=== added file 'Simple/Screen.qml'
--- Simple/Screen.qml	1970-01-01 00:00:00 +0000
+++ Simple/Screen.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,79 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+
+Item{
+    id: root
+    height: _content.height + divider.height
+    transformOrigin: Item.Bottom
+
+    property var ops
+    signal useAnswer(string answerToUse, string formulaData)
+    signal labelTextUpdated(int idx, string newText)
+
+    Rectangle{
+        id: _content
+        width: parent.width
+        height: inputs.height+units.gu(2)
+        Column {
+            id: inputs
+            anchors.top: parent.top
+            anchors.topMargin: units.gu(2)
+            spacing: units.gu(0.5)
+            width: parent.width - units.gu(4)
+            anchors.centerIn: parent
+
+            Repeater{
+                id: repeater
+                model: ops
+                CalcLabel{
+                    id: formulaLabel
+                    labelText: _text
+                    numbers: _number
+                    operation: _operation
+
+                    onLabelTextChanged: {
+                        root.labelTextUpdated(index, labelText)
+                    }
+                }
+            }
+
+            Rectangle{
+                height: units.gu(0.1)
+                width: answerLabel.operationsWidth
+                anchors.right: parent.right
+                color: '#757373'
+            }
+
+            CalcLabel {
+                id: answerLabel
+                numbers: answer
+                labelReadOnly: true
+                labelText: i18n.tr("Total")
+                numbersColor: "#dd4814"
+                numbersHeight: units.gu(7)
+
+                MouseArea {
+                    id: screenMA
+                    enabled: !isLastItem
+                    anchors.fill: parent
+                    onClicked: {
+                        if (answer.indexOf('error') === -1)
+                            root.useAnswer(answer, formula_data)
+                    }
+                }
+            }
+        }
+    }
+
+    Divider {
+        id: divider
+        visible: !isLastItem
+        width: parent.width
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+    }
+}
 
=== added file 'Simple/SimplePage.qml'
--- Simple/SimplePage.qml	1970-01-01 00:00:00 +0000
+++ Simple/SimplePage.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,175 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "../engine.js" as CALC
+
+Page {
+
+    property var context: new CALC.Context;
+    property var scanner;
+    property string answer: ''
+    property var screenFormula: [{_text:'', _operation:'', _number:''}]
+    property var engineFormula: ['']
+
+    function formulaPush(visual, engine) {
+        try{
+            scanner = new CALC.Scanner(engineFormula.join('') + engine, context);
+        } catch(exception) {
+            console.log(exception)
+            return;
+        }
+        switch(scanner.tokens.last().type){
+        case CALC.T_PLUS:
+        case CALC.T_MINUS:
+        case CALC.T_DIV:
+        case CALC.T_TIMES:
+        case CALC.T_UNARY_PLUS:
+        case CALC.T_UNARY_MINUS:
+            if(scanner.tokens.length > 1 && (scanner.tokens[scanner.tokens.length-2].type & CALC.T_OPERATOR)) return;
+            screenFormula.push({_text:'', _operation: '', _number:''});
+            screenFormula[screenFormula.length-1]._operation = visual;
+            engineFormula[engineFormula.length-1] += engine;
+            engineFormula.push('');
+            break;
+        default:
+            screenFormula[screenFormula.length-1]._number += visual;
+            engineFormula[engineFormula.length-1] += engine;
+            break;
+        }
+        formulaView.currentOperatorsChanged()
+        calculate();
+    }
+
+    function calculate() {
+        var result = 0;
+        try{
+            result = new CALC.Parser(scanner).reduce(context);
+            if (result === Number.POSITIVE_INFINITY)
+                result = '∞';
+            else if (result === Number.NEGATIVE_INFINITY)
+                result = '-∞';
+        } catch(exception) {
+            if(exception instanceof CALC.DivisionByZeroError){
+                result = "division by zero error";
+            } else if(exception instanceof SyntaxError){
+                result = "";
+            }
+        }
+        answer = result;
+    }
+
+    function remove(index){
+        screenFormula.splice(index, 1);
+        engineFormula.splice(index, 1);
+    }
+
+    function clear(){
+        answer = '';
+        screenFormula = [{_text:'', _operation:'', _number:''}];
+        engineFormula = [''];
+    }
+
+    function addFromMemory(answerToAdd, formulaData) {
+        if (answerToAdd !== '' && answerToAdd.indexOf('error') === -1 && answerToAdd.indexOf('∞') === -1) {
+            for (var i = 0; i < answerToAdd.length; i++)
+                formulaPush(answerToAdd[i], answerToAdd[i], answerToAdd[i] === '.' ? 'real' : 'number')
+        }
+    }
+
+    Item {
+        anchors.fill: parent
+
+        ListView {
+            id: formulaView
+            anchors.fill: parent
+            verticalLayoutDirection: ListView.BottomToTop
+            clip: true
+
+            signal currentOperatorsChanged()
+            property string currentAnswer: answer
+
+            function addCurrentToMemory() {
+                if (screenFormula.length > 1) {
+                    memory.get(0).isLastItem = false
+                    storage.saveCalculation(memory.get(0));
+                    memory.insert(0,{'answer': '', 'operators': [{_text:'', _operation:'', _number:''}], 'isLastItem': true})
+                    positionViewAtBeginning();
+                }
+            }
+
+            function showError() {
+                animateError.start()
+            }
+
+            PropertyAnimation {id: animateError; target: formulaView; properties: "color"; from: "#FFA0A0"; to: "#FFFFFF"; duration: 100}
+
+            displaced: Transition{
+                SequentialAnimation{
+                    NumberAnimation {property: "scale"; to: 0.9; duration: 50 }
+                    NumberAnimation {property: "y"; duration: 300 }
+                    NumberAnimation {property: "scale"; to: 1; duration: 50 }
+                }
+            }
+
+            onCurrentOperatorsChanged: {
+                memory.get(0).operators = screenFormula
+                positionViewAtBeginning();
+            }
+
+            onCurrentAnswerChanged: {
+                memory.get(0).answer = currentAnswer
+            }
+
+            model: Memory{
+                id: memory
+                Component.onCompleted: {
+                    storage.getCalculations(function(calc){
+                        memory.append(calc);
+                    });
+                }
+            }
+
+            delegate: Screen {
+                id: screen
+                width: formulaView.width
+                ops: operators
+
+                onUseAnswer: addFromMemory(answerToUse, formulaData)
+                onLabelTextUpdated: {
+                    if(index === 0){
+                        screenFormula[idx]._text = newText;
+                        return;
+                    }
+                    memory.get(index).operators.get(idx)._text = newText;
+                }
+            }
+
+            header: CalcKeyboard {
+            }
+
+            Scrollbar {
+                flickableItem: formulaView
+                align: Qt.AlignTrailing
+            }
+
+            Component.onCompleted: {
+                currentOperatorsChanged();
+            }
+
+            Component.onDestruction: {
+                //update the storage
+                for(var i=0; i<memory.count; i++){
+                    var operators = memory.get(i).operators;
+                    var newop = [];
+                    for(var j=0; j< operators.count; j++){
+                        newop.push(operators.get(j))
+                    }
+                    var newElement = {'dbId': memory.get(i).dbId,
+                        'isLastItem': false,
+                        'answer': memory.get(i).answer,
+                        'operators': newop};
+                    storage.updateCalculation(newElement);
+                }
+            }
+        }
+    }
+}
 
=== removed file 'StdKeyboard.qml'
--- StdKeyboard.qml	2013-02-27 14:20:40 +0000
+++ StdKeyboard.qml	1970-01-01 00:00:00 +0000
@@ -1,222 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-Item {
-    width: parent.width
-    height: grid.height+units.gu(4)
-
-    Grid {
-        id: grid
-        columns: Math.floor(parent.width / units.gu(46))
-
-        anchors{
-            top: parent.top
-            topMargin: units.gu(2)
-            horizontalCenter: parent.horizontalCenter
-        }
-        spacing: units.gu(2)
-        Grid{
-            columns:4
-            spacing: units.gu(2)
-
-            KeyboardButton {
-                text: "("
-                onClicked: formulaPush('(', '(', 'group')
-            }
-
-            KeyboardButton {
-                text: ")"
-                onClicked: formulaPush(')', ')', 'group')
-            }
-
-            KeyboardButton {
-                text: "C"
-                onClicked: {
-                    formulaView.addCurrentToMemory();
-                    formulaReset();
-                }
-            }
-
-            KeyboardButton {
-                text: "M"
-                onClicked: {
-                    formulaView.addCurrentToMemory();
-                }
-            }
-
-            KeyboardButton {
-                text: "7"
-                onClicked: formulaPush('7', '7', 'number')
-            }
-
-            KeyboardButton {
-                text: "8"
-                onClicked: formulaPush('8', '8', 'number')
-            }
-
-            KeyboardButton {
-                text: "9"
-                onClicked: formulaPush('9', '9', 'number')
-            }
-
-            KeyboardButton {
-                text: "÷"
-                onClicked: formulaPush('÷', '/', 'operation')
-            }
-
-            KeyboardButton {
-                text: "4"
-                onClicked: formulaPush('4', '4', 'number')
-            }
-
-            KeyboardButton {
-                text: "5"
-                onClicked: formulaPush('5', '5', 'number')
-            }
-
-            KeyboardButton {
-                text: "6"
-                onClicked: formulaPush('6', '6', 'number')
-            }
-
-            KeyboardButton {
-                text: "×"
-                onClicked: formulaPush('×', '*', 'operation')
-            }
-
-            KeyboardButton {
-                text: "1"
-                onClicked: formulaPush('1', '1', 'number')
-            }
-
-            KeyboardButton {
-                text: "2"
-                onClicked: formulaPush('2', '2', 'number')
-            }
-
-            KeyboardButton {
-                text: "3"
-                onClicked: formulaPush('3', '3', 'number')
-            }
-
-            KeyboardButton {
-                text: "+"
-                onClicked: formulaPush('+', '+', 'operation')
-            }
-
-            KeyboardButton {
-                text: "0"
-                onClicked: formulaPush('0', '0', 'number')
-            }
-
-            KeyboardButton {
-                text: "."
-                onClicked: formulaPush('.', '.', 'real')
-            }
-
-            KeyboardButton {
-                text: "←"
-                onClicked: formulaPop()
-                onPressAndHold: formulaReset()
-            }
-
-            KeyboardButton {
-                text: "−"
-                onClicked: formulaPush('−', '-', 'operation')
-            }
-
-        }
-
-        Grid{
-            spacing: units.gu(2)
-
-            KeyboardButton {
-                text: "sin"
-                onClicked: formulaPush('sin', 'sin', 'function')
-            }
-
-            KeyboardButton {
-                text: "cos"
-                onClicked: formulaPush('cos', 'cos', 'function')
-            }
-
-            KeyboardButton {
-                text: "tan"
-                onClicked: formulaPush('tan', 'tan', 'function')
-            }
-
-            KeyboardButton {
-                text: angularUnit
-                onClicked: {
-                    if (angularUnit === 'RAD') {
-                        angularUnit = 'DEG';
-                    }
-                    else if (angularUnit === 'DEG') {
-                        angularUnit = 'GRAD';
-                    }
-                    else if (angularUnit === 'GRAD') {
-                        angularUnit = 'RAD'
-                    }
-                    calculate();
-                }
-            }
-
-            KeyboardButton {
-                text: "asin"
-                onClicked: formulaPush('asin', 'asin', 'function')
-            }
-
-            KeyboardButton {
-                text: "acos"
-                onClicked: formulaPush('acos', 'acos', 'function')
-            }
-
-            KeyboardButton {
-                text: "atan"
-                onClicked: formulaPush('atan', 'atan', 'function')
-            }
-
-
-            KeyboardButton {
-                text: "ln"
-                onClicked: formulaPush('ln', 'ln', 'function')
-            }
-
-            KeyboardButton {
-                text: "√"
-                onClicked: formulaPush('√', '√', 'function')
-            }
-
-            KeyboardButton {
-                text: "π"
-                onClicked: formulaPush('π', 'π', 'const')
-            }
-
-            KeyboardButton {
-                text: "e"
-                onClicked: formulaPush('e', 'E', 'const')
-            }
-
-            KeyboardButton {
-                text: "log"
-                onClicked: formulaPush('log', 'log', 'function')
-            }
-
-            KeyboardButton {
-                text: "%"
-                onClicked: formulaPush('%', '%', 'operation')
-            }
-
-            KeyboardButton {
-                text: "!"
-                onClicked: formulaPush('!', '!', 'operation')
-            }
-
-            KeyboardButton {
-                text: "^"
-                onClicked: formulaPush('^', '^', 'operation')
-            }
-        }
-
-    }
-}
 
=== added file 'Storage.qml'
--- Storage.qml	1970-01-01 00:00:00 +0000
+++ Storage.qml	2013-03-08 10:04:20 +0000
@@ -0,0 +1,56 @@
+//TODO: modify saved calculations text
+import QtQuick 2.0
+import QtQuick.LocalStorage 2.0
+
+Item {
+
+    property var db: null
+
+    function openDB() {
+        if(db !== null) return;
+
+        db = LocalStorage.openDatabaseSync("ubuntu-calculator-app", "0.1", "Default Ubuntu touch calculator", 100000);
+
+        db.transaction(function(tx){
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Calculations(id INTEGER PRIMARY KEY, calc TEXT)');
+        });
+    }
+
+    function getCalculations(callback){
+        openDB();
+        db.transaction(
+                    function(tx){
+                        var res = tx.executeSql('SELECT * FROM Calculations');
+                        for(var i=res.rows.length - 1; i >= 0; i--){
+                            var obj = JSON.parse(res.rows.item(i).calc);
+                            obj.dbId = res.rows.item(i).id;
+                            callback(obj);
+                        }
+                    }
+                    );
+    }
+
+    function saveCalculation(calc){
+        openDB();
+        var res;
+        db.transaction( function(tx){
+            res = tx.executeSql('INSERT INTO Calculations(calc) VALUES(?)', [JSON.stringify(calc)]);
+        });
+        return res.insertId
+    }
+
+    function updateCalculation(calc){
+        openDB();
+        var index = calc.dbId
+        db.transaction(function(tx){
+            tx.executeSql('UPDATE Calculations SET calc = ? WHERE id = ?', [JSON.stringify(calc), index])
+        });
+    }
+
+    function removeCalculation(calc){
+        openDb();
+        db.transaction(function(tx){
+            tx.executeSql('DELETE FROM Calculations WHERE id = ?', [calc.dbId]);
+        });
+    }
+}
 
=== modified file 'calculator.qml'
--- calculator.qml	2013-03-02 09:26:56 +0000
+++ calculator.qml	2013-03-08 10:04:20 +0000
@@ -1,6 +1,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import "engine.js" as CALC
+import "Simple"
+import "Scientific"
 
 /*!
     \brief MainView with Tabs element.
@@ -9,118 +10,15 @@
 */
 
 MainView {
+    id: mainView
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "calculator"
 
     width: units.gu(50)
     height: units.gu(75)
 
-    property string formula_text: '';
-    property string brackets_added: '';
-    property string formula_text_for_engine: '';
-    property var formula: [];
-    property string answer: '';
-    property string angularUnit: 'RAD';
-
-    function formulaPush(visual, engine, type) {
-        var prev = null;
-        if (formula.length > 0)
-            prev = formula[formula.length-1];
-
-        var result = CALC.getFormulaTexts(prev, visual, engine, type, brackets_added.length/2)
-
-        var visual_text = result[0];
-        var engine_text = result[1];
-        var fixed_type = result[2];
-        var brackets_count = result[3];
-
-        brackets_added = brackets_added.substr(0, brackets_count*2);
-
-        if (visual_text !== null && engine_text !== null) {
-            formula_text += visual_text;
-            formula_text_for_engine += engine_text;
-            formula.push({'visual': visual_text, 'engine': engine_text, 'type': fixed_type});
-
-            answer = calculate()
-        }
-        else {
-            formulaView.showError();
-        }
-    }
-
-    function formulaPop() {
-        if (formula.length > 0) {
-            var prev = formula[formula.length-1];
-            formula_text = formula_text.substring(0, formula_text.length - prev.visual.length);
-            formula_text_for_engine = formula_text_for_engine.substring(0, formula_text_for_engine.length - prev.engine.length);
-            if (prev.type === 'function' || (prev.type === 'group' && prev.engine === '(' || prev.engine === '*('))
-                brackets_added = brackets_added.substring(0, brackets_added.length-2)
-            else if (prev.type === 'group' && prev.engine === ')')
-                brackets_added += " )"
-            formula.pop();
-
-            answer = calculate()
-        }
-    }
-
-    function formulaReset() {
-        formula_text = '';
-        formula_text_for_engine = '';
-        formula = [];
-        answer = "";
-        brackets_added = '';
-    }
-
-    function calculate() {
-
-        console.debug('Formula for engine: ' + formula_text_for_engine)
-
-        var result = 0;
-        try {
-            result = CALC.parse(angularUnit + formula_text_for_engine + brackets_added);
-            if (result === Number.POSITIVE_INFINITY)
-                result = '∞';
-            else if (result === Number.NEGATIVE_INFINITY)
-                result = '-∞';
-        } catch(exception) {
-            if(exception instanceof CALC.DivisionByZeroError){
-                result = "division by zero error";
-            } else if(exception instanceof SyntaxError){
-                result = "";
-            } else if(exception instanceof CALC.ParenthesisError){
-                if(exception.missing === '(')
-                    brackets_added = brackets_added.substr(0, brackets_added.length-2);
-                else
-                    brackets_added+=(' '+exception.missing);
-                result = calculate();
-            }
-        }
-        return result;
-    }
-
-    function addFromMemory(answerToAdd, formulaData) {
-        if (answerToAdd !== '' && answerToAdd.indexOf('error') === -1 && answerToAdd.indexOf('∞') === -1) {
-            for (var i = 0; i < answerToAdd.length; i++)
-                formulaPush(answerToAdd[i], answerToAdd[i], answerToAdd[i] === '.' ? 'real' : 'number')
-        }
-        else {
-            var fd = JSON.parse(formulaData);
-
-            var prev = null;
-            if (formula.length > 0)
-                prev = formula[formula.length-1];
-
-            var result = CALC.getFormulaTexts(prev, fd[0].engine, fd[0].engine, fd[0].type, brackets_added.length/2)
-
-            if (result[0] !== null && result[1] !== null) {
-                for (var idx = 0; idx < fd.length; idx++) {
-                    formula_text += fd[idx].visual;
-                    formula_text_for_engine += fd[idx].engine;
-                    formula.push({'visual': fd[idx].visual, 'engine': fd[idx].engine, 'type': fd[idx].type});
-                }
-                answer = calculate()
-            }
-        }
+    Storage{
+        id: storage
     }
 
     Tabs {
@@ -134,82 +32,7 @@
             title: i18n.tr("Calculator")
             
             // Tab content begins here
-            page: Page {
-
-                Item {
-                    anchors.fill: parent
-
-                    ListView {
-                        id: formulaView
-                        anchors.fill: parent
-                        snapMode: ListView.SnapOneItem
-                        clip: true
-
-                        property string currentFormula: '%1<font color="lightgray">%2</font>'.arg(formula_text).arg(brackets_added)
-                        property string currentAnswer: answer
-                        property color color: "#FFFFFF";
-                        property bool positionedAtEnd: true;
-
-                        function addCurrentToMemory() {
-                            if (formula_text !== '') {
-                                memory.get(memory.count-1).isLastItem = false
-                                memory.get(memory.count-1).formula_data = JSON.stringify(formula)
-                                memory.append({'formula': memory.get(memory.count-1).formula, 'answer': memory.get(count-1).answer, 'formula_data': '', 'isLastItem': true})
-                                positionViewAtEnd();
-                            }
-                        }
-
-                        function showError() {
-                            animateError.start()
-                        }
-
-                        PropertyAnimation {id: animateError; target: formulaView; properties: "color"; from: "#FFA0A0"; to: "#FFFFFF"; duration: 100}
-
-                        add: Transition{
-                            SequentialAnimation {
-                                NumberAnimation {property: "y"; from: formulaView.footerItem.y; to: formulaView.contentY; duration: 200; }
-                                ParallelAnimation{
-                                    NumberAnimation { property: "scale"; from: 0; to: 1.0; duration: 200 }
-                                    NumberAnimation { property: "y"; from: formulaView.contentY; duration: 0 }
-                                }
-                            }
-                        }
-
-                        onCurrentFormulaChanged: {
-                            memory.get(memory.count-1).formula = currentFormula
-                            positionViewAtEnd();
-                        }
-
-                        onCurrentAnswerChanged: {
-                            memory.get(memory.count-1).answer = currentAnswer
-                        }
-
-                        onContentYChanged: {
-                            positionedAtEnd = formulaView.indexAt(0, contentY+0) == formulaView.model.count-1
-                        }
-
-                        model: Memory{
-                            id: memory
-                        }
-
-                        delegate: Screen {
-                            id: screen
-                            width: formulaView.width
-
-                            onUseAnswer: addFromMemory(answerToUse, formulaData)
-                        }
-
-                        footer: KeyboardsView {
-                            height: formulaView.height - units.gu(24)
-                        }
-
-                        Scrollbar {
-                            flickableItem: formulaView
-                            align: Qt.AlignTrailing
-                       }
-                    }
-                }
-            }
+            page: SimplePage{} //ScientificPage{} for a better calculator
         }
 
         Tab {