ubuntu-touch-coreapps-reviewers team mailing list archive

[Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>]

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-new-layout into lp:ubuntu-calculator-app/reboot.

Commit message:
Change keypad layout according to latest design

Requested reviews:
  Ubuntu Calculator Developers (ubuntu-calculator-dev)

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-calculator-app/ubuntu-calculator-app-new-layout/+merge/252134

Change keypad layout according to latest design
-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-new-layout into lp:ubuntu-calculator-app/reboot.

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-03-02 21:11:20 +0000
+++ app/ubuntu-calculator-app.qml	2015-03-06 15:44:38 +0000
@@ -593,10 +593,15 @@
                         width: parent.width - units.gu(2)
                         height: parent.height
 
-                        color: UbuntuColors.darkGrey
+                        color: UbuntuColors.orange
                         // remove ubuntu shape
                         style: TextFieldStyle {
                             background: Item {
+                                Rectangle {
+                                    color: "#EFEEEE"
+                                    width: parent.width
+                                    height: parent.height
+                                }
                             }
                         }
 

=== modified file 'app/ui/CalcKeyboard.qml'
--- app/ui/CalcKeyboard.qml	2015-01-23 20:58:49 +0000
+++ app/ui/CalcKeyboard.qml	2015-03-06 15:44:38 +0000
@@ -65,12 +65,14 @@
 
         Row {
             id: keyboardsRow
-            anchors { left: parent.left; right: parent.right; margins: units.gu(1) }
-            spacing: units.gu(1)
+            anchors { left: parent.left; right: parent.right }
 
             onChildrenChanged: {
                 for (var i = 0; i < children.length; i++) {
-                    children[i].width = Qt.binding(function() { return (keyboardsRow.width - spacing * (children.length - 2)) / children.length; })
+                    children[i].width = Qt.binding(function() {
+                        return (keyboardsRow.width - spacing * (children.length - 2)) / children.length;
+                    }
+                    )
                 }
             }
         }

=== modified file 'app/ui/KeyboardButton.qml'
--- app/ui/KeyboardButton.qml	2015-02-10 22:12:55 +0000
+++ app/ui/KeyboardButton.qml	2015-03-06 15:44:38 +0000
@@ -26,7 +26,7 @@
 
     property real baseSize: 1
     property alias text: buttonText.text
-    property string buttonColor: "#babbbc"
+    property string buttonColor: "#eeeeee"
     property string pressedColor: "#E2E1E4"
     property alias textColor: buttonText.color
 
@@ -41,7 +41,7 @@
 
     Rectangle {
         anchors.fill: parent
-        border.color: "#bdbec0"
+        border.color: "#d0d0d0"
         border.width: units.dp(2)
         color: buttonMA.pressed || buttonRect.kbdPressed ? pressedColor : buttonColor
 

=== modified file 'app/ui/KeyboardPage.qml'
--- app/ui/KeyboardPage.qml	2015-02-13 22:23:53 +0000
+++ app/ui/KeyboardPage.qml	2015-03-06 15:44:38 +0000
@@ -43,7 +43,8 @@
     property real buttonRatio: 0.7
     property real buttonMaxHeight: units.gu(10)
 
-    spacing: units.gu(1)
+    //Space between the buttons
+    spacing: units.gu(0)
 
     Component.onCompleted: {
         buildModel();

=== modified file 'app/ui/LandscapeKeyboard.qml'
--- app/ui/LandscapeKeyboard.qml	2015-02-10 22:12:55 +0000
+++ app/ui/LandscapeKeyboard.qml	2015-03-06 15:44:38 +0000
@@ -10,10 +10,9 @@
         columns: 8
 
         keyboardModel: new Array(
-            { text: "←", name: "delete", action: "delete", kbdKeys: [Qt.Key_Backspace], secondaryAction: "clearFormula" },
-            { text: "( )", name: "universalBracket", pushText: "()" },
+            { text: "←", name: "delete", wFactor: 2, action: "delete", kbdKeys: [Qt.Key_Backspace], secondaryAction: "clearFormula" },
+            { text: "√", name: "sqrt", pushText: "sqrt(" },
             { text: "÷", name: "divide", pushText: "/", kbdKeys: [Qt.Key_Slash] },
-            { text: "×", name: "multiply", pushText: "*", kbdKeys: [Qt.Key_Asterisk] },
             { text: "xⁿ", name: "power", pushText: "^", kbdKeys: [Qt.Key_AsciiCircum] },
             { text: "x²", name: "square", pushText: "^2" },
             { text: "x³", name: "cube", pushText: "^3" },
@@ -21,7 +20,7 @@
             { number: 7, name: "seven" },
             { number: 8, name: "eight" },
             { number: 9, name: "nine" },
-            { text: "−", name: "minus", pushText: "-", kbdKeys: [Qt.Key_Minus] },
+            { text: "×", name: "multiply", pushText: "*", kbdKeys: [Qt.Key_Asterisk] },
             { text: "ℯ", name: "eNumber", pushText: "E", kbdKeys: [Qt.Key_E] },
             { text: "π", name: "piNumber", pushText: "pi", kbdKeys: [Qt.Key_P] },
             { text: i18n.tr("mod"), name: "modulo", pushText: "%", kbdKeys: [Qt.Key_Percent] },
@@ -29,21 +28,23 @@
             { number: 4, name: "four" },
             { number: 5, name: "five" },
             { number: 6, name: "six" },
-            { text: "+", name: "plus" },
-            { text: "√", name: "sqrt", pushText: "sqrt("},
+            { text: "−", name: "minus", pushText: "-", kbdKeys: [Qt.Key_Minus] },
+            { text: "ℯⁿ", name: "exp", pushText: "E^"},
             { text: "1/x", name: "multiplicativeInverse", pushText: "^-1" },
             { text: "1/x²", name: "multiplicativeInverse2", pushText: "^-2" },
             { text: "1/x³", name: "multiplicativeInverse3", pushText: "^-3" },
             { number: 1, name: "one" },
             { number: 2, name: "two" },
             { number: 3, name: "three" },
-            { text: "=", name: "equals", hFactor: 2, action: "calculate", kbdKeys: [Qt.Key_Enter, Qt.Key_Return] },
-            { text: "eⁿ", name: "exp", pushText: "exp("},
+            { text: "+", name: "plus" },
+            { text: "i", name: "i", pushText: "i", kbdKeys: [Qt.Key_I] },
             { text: "sin", name: "sinus", pushText: "sin(", kbdKeys: [Qt.Key_S] },
             { text: "cos", name: "cos", pushText: "cos(", kbdKeys: [Qt.Key_C] },
             { text: "tan", name: "tangens", pushText: "tan(", kbdKeys: [Qt.Key_T] },
-            { number: 0, name: "zero", wFactor: 2, forceNumber: true },
             { text: decimalPoint, name: "point", pushText: "." },
+            { number: 0, name: "zero", forceNumber: true },
+            { text: "( )", name: "universalBracket", pushText: "()" },
+            { text: "=", name: "equals", action: "calculate", kbdKeys: [Qt.Key_Enter, Qt.Key_Return] },
             { text: "abs", name: "abs", pushText: "abs(", kbdKeys: [Qt.Key_A] },
             { text: "sin⁻¹", name: "arcsinus", pushText: "asin(" },
             { text: "cos⁻¹", name: "arccos", pushText: "acos(" },

=== modified file 'app/ui/PortraitKeyboard.qml'
--- app/ui/PortraitKeyboard.qml	2015-02-10 22:12:55 +0000
+++ app/ui/PortraitKeyboard.qml	2015-03-06 15:44:38 +0000
@@ -9,24 +9,25 @@
         buttonMaxHeight: scrollableView.height / 10.0
 
         keyboardModel: new Array(
-            { text: "←", name: "delete", action: "delete", kbdKeys: [Qt.Key_Backspace], secondaryAction: "clearFormula" },
-            { text: "( )", name: "universalBracket", pushText: "()" },
+            { text: "←", name: "delete", wFactor: 2, action: "delete", kbdKeys: [Qt.Key_Backspace], secondaryAction: "clearFormula" },
+            { text: "√", name: "sqrt", pushText: "sqrt("},
             { text: "÷", name: "divide", pushText: "/", kbdKeys: [Qt.Key_Slash] },
-            { text: "×", name: "multiply", pushText: "*", kbdKeys: [Qt.Key_Asterisk] },
             { number: 7, name: "seven" },
             { number: 8, name: "eight" },
             { number: 9, name: "nine" },
-            { text: "−", name: "minus", pushText: "-", kbdKeys: [Qt.Key_Minus] },
+            { text: "×", name: "multiply", pushText: "*", kbdKeys: [Qt.Key_Asterisk] },
             { number: 4, name: "four" },
             { number: 5, name: "five" },
             { number: 6, name: "six" },
-            { text: "+", name: "plus" },
+            { text: "−", name: "minus", pushText: "-", kbdKeys: [Qt.Key_Minus] },
             { number: 1, name: "one" },
             { number: 2, name: "two" },
             { number: 3, name: "three" },
-            { text: "=", name: "equals", hFactor: 2, action: "calculate", kbdKeys: [Qt.Key_Enter, Qt.Key_Return] },
-            { number: 0, name: "zero", wFactor: 2, forceNumber: true },
-            { text: decimalPoint, name: "point", pushText: "." }
+            { text: "+", name: "plus" },
+            { text: decimalPoint, name: "point", pushText: "." },
+            { number: 0, name: "zero", forceNumber: true },
+            { text: "( )", name: "universalBracket", pushText: "()" },
+            { text: "=", name: "equals", action: "calculate", kbdKeys: [Qt.Key_Enter, Qt.Key_Return] }
         )
     }
 
@@ -43,12 +44,12 @@
             { text: "π", name: "piNumber", pushText: "pi", kbdKeys: [Qt.Key_P] },
             { text: i18n.tr("mod"), name: "modulo", pushText: "%", kbdKeys: [Qt.Key_Percent] },
             { text: "!", name: "factorialNumber", kbdKeys: [Qt.Key_Exclam] },
-            { text: "√", name: "sqrt", pushText: "sqrt("},
+            { text: "ℯⁿ", name: "exp", pushText: "E^"},
             { text: "1/x", name: "multiplicativeInverse", pushText: "^-1" },
             { text: "1/x²", name: "multiplicativeInverse2", pushText: "^-2" },
             { text: "1/x³", name: "multiplicativeInverse3", pushText: "^-3" },
-            { text: "eⁿ", name: "exp", pushText: "exp("},
-            { text: "sin", name: "sinus", pushText: "sin(", kbdKeys: [Qt.Key_S]  },
+            { text: "i", name: "i", pushText: "i", kbdKeys: [Qt.Key_I] },
+            { text: "sin", name: "sinus", pushText: "sin(", kbdKeys: [Qt.Key_S] },
             { text: "cos", name: "cos", pushText: "cos(", kbdKeys: [Qt.Key_C]  },
             { text: "tan", name: "tangens", pushText: "tan(", kbdKeys: [Qt.Key_T]  },
             { text: "abs", name: "abs", pushText: "abs(", kbdKeys: [Qt.Key_A] },

=== modified file 'po/com.ubuntu.calculator.pot'
--- po/com.ubuntu.calculator.pot	2015-03-02 21:49:22 +0000
+++ po/com.ubuntu.calculator.pot	2015-03-06 15:44:38 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-02 22:49+0100\n"
+"POT-Creation-Date: 2015-03-05 23:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -64,11 +64,11 @@
 msgid "dd MMM yyyy"
 msgstr ""
 
-#: ../app/ui/LandscapeKeyboard.qml:20 ../app/ui/PortraitKeyboard.qml:41
+#: ../app/ui/LandscapeKeyboard.qml:19 ../app/ui/PortraitKeyboard.qml:42
 msgid "log"
 msgstr ""
 
-#: ../app/ui/LandscapeKeyboard.qml:27 ../app/ui/PortraitKeyboard.qml:44
+#: ../app/ui/LandscapeKeyboard.qml:26 ../app/ui/PortraitKeyboard.qml:45
 msgid "mod"
 msgstr ""
 
@@ -91,14 +91,14 @@
 msgid "Yesterday"
 msgstr ""
 
-#: /home/m/dev/core/build-reboot-favourite-Desktop-Default/po/ubuntu-calculator-app.desktop.in.in.h:1
+#: /home/m/dev/core/build-reboot-Desktop-Default/po/ubuntu-calculator-app.desktop.in.in.h:1
 msgid "Calculator"
 msgstr ""
 
-#: /home/m/dev/core/build-reboot-favourite-Desktop-Default/po/ubuntu-calculator-app.desktop.in.in.h:2
+#: /home/m/dev/core/build-reboot-Desktop-Default/po/ubuntu-calculator-app.desktop.in.in.h:2
 msgid "A calculator for Ubuntu."
 msgstr ""
 
-#: /home/m/dev/core/build-reboot-favourite-Desktop-Default/po/ubuntu-calculator-app.desktop.in.in.h:3
+#: /home/m/dev/core/build-reboot-Desktop-Default/po/ubuntu-calculator-app.desktop.in.in.h:3
 msgid "math;addition;subtraction;multiplication;division;"
 msgstr ""