Merge lp:~dalius-sandbox/ubuntu-calculator-app/adaptive-keyboard-size into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Dalius]

Adjusting calculator keyboard to device's width.

Adjusting calculator keyboard to device's width.

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

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

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

review: Approve (continuous-integration)

[Riccardo Ferrazzo (f-riccardo87)]

review: Approve

=== modified file 'Simple/CalcKeyboard.qml'
--- Simple/CalcKeyboard.qml	2013-04-06 08:47:15 +0000
+++ Simple/CalcKeyboard.qml	2013-04-07 11:22:22 +0000
@@ -5,6 +5,9 @@
     width: parent.width
     height: grid.height+units.gu(4)
 
+    property int calcGridUnit: width / 50
+
+
     Text {
         visible: formulaView.__wasAtYBegining && formulaView.__displaceDist > units.gu(2)
         font.pixelSize: units.gu(2)
@@ -16,8 +19,8 @@
 
     Item {
         id: grid
-        width: units.gu(9)*4 + units.gu(2)*3
-        height: units.gu(6)*5 + units.gu(2)*4
+        width: (calcGridUnit*9)*4 + (calcGridUnit*2)*3
+        height: (calcGridUnit*6)*5 + (calcGridUnit*2)*4
 
         anchors{
             top: parent.top
@@ -35,7 +38,7 @@
         }
 
         KeyboardButton {
-            x: units.gu(11)
+            x: (calcGridUnit*11)
             y: 0
             text: "±"
             onClicked: {
@@ -44,14 +47,14 @@
         }
 
         KeyboardButton {
-            x: units.gu(11)*2
+            x: (calcGridUnit*11)*2
             y: 0
             text: "÷"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
-            x: units.gu(11)*3
+            x: (calcGridUnit*11)*3
             y: 0
             text: "×"
             onClicked: formulaPush(text)
@@ -59,85 +62,85 @@
 
         KeyboardButton {
             x: 0
-            y: units.gu(8)
+            y: (calcGridUnit*8)
             text: "7"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
-            x: units.gu(11)
-            y: units.gu(8)
+            x: (calcGridUnit*11)
+            y: (calcGridUnit*8)
             text: "8"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
-            x: units.gu(11)*2
-            y: units.gu(8)
+            x: (calcGridUnit*11)*2
+            y: (calcGridUnit*8)
             text: "9"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
-            x: units.gu(11)*3
-            y: units.gu(8)
+            x: (calcGridUnit*11)*3
+            y: (calcGridUnit*8)
             text: "−"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
             x: 0
-            y: units.gu(8)*2
+            y: (calcGridUnit*8)*2
             text: "4"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
-            x: units.gu(11)
-            y: units.gu(8)*2
+            x: (calcGridUnit*11)
+            y: (calcGridUnit*8)*2
             text: "5"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
-            x: units.gu(11)*2
-            y: units.gu(8)*2
+            x: (calcGridUnit*11)*2
+            y: (calcGridUnit*8)*2
             text: "6"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
-            x: units.gu(11)*3
-            y: units.gu(8)*2
+            x: (calcGridUnit*11)*3
+            y: (calcGridUnit*8)*2
             text: "+"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
             x: 0
-            y: units.gu(8)*3
+            y: (calcGridUnit*8)*3
             text: "1"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
-            x: units.gu(11)
-            y: units.gu(8)*3
+            x: (calcGridUnit*11)
+            y: (calcGridUnit*8)*3
             text: "2"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
-            x: units.gu(11)*2
-            y: units.gu(8)*3
+            x: (calcGridUnit*11)*2
+            y: (calcGridUnit*8)*3
             text: "3"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
-            x: units.gu(11)*3
-            y: units.gu(8)*3
-            height: units.gu(14)
+            x: (calcGridUnit*11)*3
+            y: (calcGridUnit*8)*3
+            height: (calcGridUnit*14)
             text: "="
             onClicked: {
                 calculate();
@@ -146,15 +149,15 @@
 
         KeyboardButton {
             x: 0
-            y: units.gu(8)*4
-            width: units.gu(20)
+            y: (calcGridUnit*8)*4
+            width: (calcGridUnit*20)
             text: "0"
             onClicked: formulaPush(text)
         }
 
         KeyboardButton {
-            x: units.gu(11)*2
-            y: units.gu(8)*4
+            x: (calcGridUnit*11)*2
+            y: (calcGridUnit*8)*4
             text: "."
             onClicked: formulaPush(text)
         }

=== modified file 'Simple/KeyboardButton.qml'
--- Simple/KeyboardButton.qml	2013-03-14 09:38:40 +0000
+++ Simple/KeyboardButton.qml	2013-04-07 11:22:22 +0000
@@ -3,9 +3,9 @@
 
 Rectangle {
     id: buttonRect
-    width: units.gu(9)
-    height: units.gu(6)
-    radius: units.gu(1)
+    width: (calcGridUnit*9)
+    height: (calcGridUnit*6)
+    radius: (calcGridUnit*1)
     color: buttonMA.pressed ? "#c0c0c0" : "white"
 
     property alias text: buttonText.text
@@ -17,7 +17,7 @@
         id: buttonText
         anchors.centerIn: parent
         color: "#dd4814"
-        font.pixelSize: units.gu(3)
+        font.pixelSize: (calcGridUnit*3)
         font.family: "Ubuntu"
     }
 

=== modified file 'ubuntu-calculator-app.qml'
--- ubuntu-calculator-app.qml	2013-03-22 17:12:16 +0000
+++ ubuntu-calculator-app.qml	2013-04-07 11:22:22 +0000
@@ -18,10 +18,6 @@
     width: units.gu(50)
     height: units.gu(75)
 
-    Component.onCompleted: {
-        units.gridUnit = width / 50
-    }
-
     Storage{
         id: storage
     }