Merge lp:~f-riccardo87/ubuntu-calculator-app/results-appearence into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Ferrazzo]

Orange text only for user inputs, every label editable, addFromMemory function restored

Changes:
- Orange text used only for user inputs
- Total label editable
- addFromMemory() function now works again

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

PASSED: Continuous integration, rev:36
http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/3/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calculator-app-quantal-amd64-ci/3/console
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calculator-app-raring-amd64-ci/3/console

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

review: Approve (continuous-integration)

[Dalius (dalius-sandbox)]

Good

review: Approve

=== modified file 'Simple/CalcLabel.qml'
--- Simple/CalcLabel.qml	2013-03-14 09:38:40 +0000
+++ Simple/CalcLabel.qml	2013-03-19 18:11:22 +0000
@@ -49,4 +49,11 @@
             font.family: "Ubuntu"
         }
     }
+
+    MouseArea{
+        anchors.fill: parent
+        onClicked: {
+            addFromMemory(root.numbers)
+        }
+    }
 }

=== modified file 'Simple/Memory.qml'
--- Simple/Memory.qml	2013-03-09 14:23:13 +0000
+++ Simple/Memory.qml	2013-03-19 18:11:22 +0000
@@ -6,7 +6,6 @@
     ListElement {
         dbId: -1
         isLastItem: true
-        answer: ''
         operators: []
         mainLabel: ''
     }

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2013-03-16 09:18:09 +0000
+++ Simple/Screen.qml	2013-03-19 18:11:22 +0000
@@ -2,6 +2,8 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 
+//TODO: reuse a number clicking on it
+
 Item{
     id: root
     height: _content.height + divider.height
@@ -21,7 +23,6 @@
             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
 
@@ -40,44 +41,27 @@
             Repeater{
                 id: repeater
                 model: ops
-                CalcLabel {
-                    id: formulaLabel
-                    labelText: _text
-                    numbers: _number
-                    operation: _operation
-                    numbersColor: (answer === '' && index === repeater.model.count-1) ? "#dd4814" : "#757373"
-                    numbersHeight: (answer === '' && index === repeater.model.count-1) ? units.gu(7) : units.gu(4)
-
-                    onLabelTextChanged: {
-                        root.labelTextUpdated(index, labelText)
+                Column{
+                    width: parent.width
+                    spacing: units.gu(0.5)
+                    Rectangle{
+                        visible: (_operation == '=')
+                        height: units.gu(0.1)
+                        width: formulaLabel.operationsWidth
+                        anchors.right: parent.right
+                        color: '#757373'
                     }
-                }
-            }
-
-            Rectangle{
-                visible: answerLabel.visible
-                height: units.gu(0.1)
-                width: answerLabel.operationsWidth
-                anchors.right: parent.right
-                color: '#757373'
-            }
-
-            CalcLabel {
-                id: answerLabel
-                visible: (answer !== '')
-                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)
+                    CalcLabel {
+                        id: formulaLabel
+                        labelText: _text
+                        numbers: _number
+                        operation: _operation
+                        numbersColor: (isLastItem && index === repeater.model.count-1) ? "#dd4814" : "#757373"
+                        numbersHeight: (isLastItem && index === repeater.model.count-1) ? units.gu(7) : units.gu(4)
+
+                        onLabelTextChanged: {
+                            root.labelTextUpdated(index, labelText)
+                        }
                     }
                 }
             }

=== modified file 'Simple/SimplePage.qml'
--- Simple/SimplePage.qml	2013-03-18 15:39:31 +0000
+++ Simple/SimplePage.qml	2013-03-19 18:11:22 +0000
@@ -6,7 +6,6 @@
 
     property var context: new CALC.Context;
     property var scanner: new CALC.Scanner(engineFormula.join(''), context);
-    property string answer: ''
     property var screenFormula: [{_text:'', _operation: '', _number:''}]
     property var engineFormula: ['']
 
@@ -110,10 +109,11 @@
             if(exception instanceof CALC.DivisionByZeroError){
                 result = "division by zero error";
             } else if(exception instanceof SyntaxError){
-                result = "";
+                return;
             }
         }
-        answer = result;
+        screenFormula.push({_text:'', _operation: '=', _number:result.toString()});
+        formulaView.currentOperatorsChanged();
     }
 
     function remove(index){
@@ -123,17 +123,20 @@
     }
 
     function clear(){
-        answer = '';
         screenFormula = [{_text:'', _operation: '', _number:''}];
         engineFormula = [''];
         scanner = new CALC.Scanner(engineFormula.join(''), context);
         formulaView.currentOperatorsChanged();
     }
 
-    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')
+    function addFromMemory(numberToAdd) {
+        try{
+            var temp = new CALC.Scanner(numberToAdd, context);
+        }catch(e){
+            return;
+        }
+        if(temp.tokens.length === 1 && temp.tokens.last().type === CALC.T_NUMBER){
+            formulaPush(numberToAdd, numberToAdd);
         }
     }
 
@@ -147,16 +150,15 @@
             clip: true
 
             signal currentOperatorsChanged()
-            property string currentAnswer: answer
 
             function addCurrentToMemory() {
-                if (answer !== '') {
+                if (screenFormula[screenFormula.length-1]._operation === '=') {
                     var currentDate = new Date();
                     if (memory.get(0).mainLabel.length == 0)
                         memory.get(0).mainLabel = currentDate.toString();
                     memory.get(0).isLastItem = false
                     memory.setProperty(0, "timeStamp", currentDate.getTime());
-                    memory.insert(0,{'dbId': -1, 'answer': '', 'operators': [{_text:'', _operation:'', _number:''}], 'isLastItem': true, 'mainLabel': ''});
+                    memory.insert(0,{'dbId': -1, 'operators': [{_text:'', _operation:'', _number:''}], 'isLastItem': true, 'mainLabel': ''});
                     positionViewAtBeginning();
                 }
             }
@@ -180,14 +182,10 @@
             }
 
             onCurrentOperatorsChanged: {
-                memory.get(0).operators = screenFormula
+                memory.set(0, {"operators": screenFormula});
                 positionViewAtBeginning();
             }
 
-            onCurrentAnswerChanged: {
-                memory.get(0).answer = currentAnswer
-            }
-
             model: Memory{
                 id: memory
                 Component.onCompleted: {
@@ -208,6 +206,7 @@
                 onMainLabelUpdated: {
                     memory.get(index).mainLabel = newText;
                 }
+
                 onLabelTextUpdated: {
                     if(index === 0){
                         screenFormula[idx]._text = newText;
@@ -215,6 +214,7 @@
                     }
                     memory.get(index).operators.get(idx)._text = newText;
                 }
+
                 onRemoveItem: {
                     storage.removeCalculation(memory.get(index));
                     memory.remove(index)
@@ -246,7 +246,6 @@
                     var newElement = {'dbId': memory.get(i).dbId,
                         'isLastItem': false,
                         'mainLabel': memory.get(i).mainLabel,
-                        'answer': memory.get(i).answer,
                         'operators': newop};
                     calculations.push({"calc": newElement, "date": memory.get(i).timeStamp})
                 }

=== modified file 'Storage.qml'
--- Storage.qml	2013-03-11 22:33:27 +0000
+++ Storage.qml	2013-03-19 18:11:22 +0000
@@ -1,4 +1,3 @@
-//TODO: modify saved calculations text
 import QtQuick 2.0
 import QtQuick.LocalStorage 2.0