1
=== modified file 'Simple/CalcLabel.qml'
2
--- Simple/CalcLabel.qml	2013-08-07 19:48:44 +0000
3
+++ Simple/CalcLabel.qml	2013-08-08 14:10:49 +0000
4
@@ -54,13 +54,16 @@
5
54
            Image {
54
            Image {
6
55
                anchors.verticalCenter: parent.verticalCenter
55
                anchors.verticalCenter: parent.verticalCenter
7
56
                source: Qt.resolvedUrl("images/edit.png")
56
                source: Qt.resolvedUrl("images/edit.png")
8
57
                visible: root.numbers || root.operation
9
57
            }
58
            }
10
58
59
11
59
            MouseArea {
60
            MouseArea {
12
60
                anchors.fill: parent
61
                anchors.fill: parent
13
61
                onClicked: {
62
                onClicked: {
16
62
                    numberName.focus = true;
63
                    if (root.numbers || root.operation) {
17
63
                    numberName.forceActiveFocus();
64
                        numberName.focus = true;
18
65
                        numberName.forceActiveFocus();
19
66
                    }
20
64
                }
67
                }
21
65
            }
68
            }
22
66
        }
69
        }
23
@@ -78,15 +81,18 @@
24
78
                    background: Item {}
81
                    background: Item {}
25
79
                }
82
                }
26
80
83
27
84
                visible: root.numbers || root.operation
28
85
29
81
                readOnly: labelReadOnly
86
                readOnly: labelReadOnly
30
82
                text: labelText
87
                text: labelText
31
83
                color: "#FEFEFE"
88
                color: "#FEFEFE"
32
84
                onTextChanged: { labelText = numberName.text }
89
                onTextChanged: { labelText = numberName.text }
33
85
                hasClearButton: false
90
                hasClearButton: false
34
91
35
86
            }
92
            }
36
87
93
37
88
            Image {
94
            Image {
39
89
                visible: numberName.focus
95
                visible: numberName.focus && (root.numbers || root.operation)
40
90
                anchors.bottom: parent.bottom
96
                anchors.bottom: parent.bottom
41
91
                source: Qt.resolvedUrl("images/dot.png")
97
                source: Qt.resolvedUrl("images/dot.png")
42
92
                fillMode: Image.Tile
98
                fillMode: Image.Tile
43
93
99
44
=== modified file 'Simple/Screen.qml'
45
--- Simple/Screen.qml	2013-08-07 19:48:44 +0000
46
+++ Simple/Screen.qml	2013-08-08 14:10:49 +0000
47
@@ -29,6 +29,7 @@
48
29
    transformOrigin: Item.Bottom
29
    transformOrigin: Item.Bottom
49
30
30
50
31
    property var ops
31
    property var ops
51
32
    property var pencilVisible: false
52
32
    signal useAnswer(string answerToUse, string formulaData)
33
    signal useAnswer(string answerToUse, string formulaData)
53
33
    signal labelTextUpdated(int idx, string newText)
34
    signal labelTextUpdated(int idx, string newText)
54
34
    signal mainLabelUpdated(int idx, string newText)
35
    signal mainLabelUpdated(int idx, string newText)
55
@@ -169,6 +170,7 @@
56
169
                id: row
170
                id: row
57
170
                height: units.gu(4)
171
                height: units.gu(4)
58
171
                width: parent.width
172
                width: parent.width
59
173
                visible: !isLastItem || pencilVisible
60
172
                Item {
174
                Item {
61
173
                    id: editIcon
175
                    id: editIcon
62
174
                    height: parent.height
176
                    height: parent.height
63
@@ -245,6 +247,10 @@
64
245
                        onLabelTextChanged: {
247
                        onLabelTextChanged: {
65
246
                            root.labelTextUpdated(index, labelText)
248
                            root.labelTextUpdated(index, labelText)
66
247
                        }
249
                        }
67
250
68
251
                        onNumbersChanged: {
69
252
                            pencilVisible = true
70
253
                        }
71
248
                    }
254
                    }
72
249
                }
255
                }
73
250
            }
256
            }
Reviewer	Review Type	Date Requested	Status
David Planella			Approve on 2013-08-08
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-08-08
Mihir Soni		2013-08-08	Approve on 2013-08-08
Review via email: mp+179189@code.launchpad.net