[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [abakus] src/mobile/harmattan/qml: replaced trigonometric keypad with functions and numerals keypad
From:       Mathias Kraus <k.hias () gmx ! de>
Date:       2013-12-08 14:55:41
Message-ID: E1Vpfll-0002v7-5c () scm ! kde ! org
[Download RAW message or body]

Git commit 94b0ed5d13ba5bd74eb298ff8f55395ed550a941 by Mathias Kraus.
Committed on 08/12/2013 at 14:29.
Pushed by mkraus into branch 'master'.

replaced trigonometric keypad with functions and numerals keypad

M  +1    -1    src/mobile/harmattan/qml/KeyPad.qml
R  +46   -46   src/mobile/harmattan/qml/KeyPadFunctionsAndNumerals.qml [from: \
src/mobile/harmattan/qml/KeyPadTrig.qml - 076% similarity]

http://commits.kde.org/abakus/94b0ed5d13ba5bd74eb298ff8f55395ed550a941

diff --git a/src/mobile/harmattan/qml/KeyPad.qml \
b/src/mobile/harmattan/qml/KeyPad.qml index 14768f3..489466b 100644
--- a/src/mobile/harmattan/qml/KeyPad.qml
+++ b/src/mobile/harmattan/qml/KeyPad.qml
@@ -140,7 +140,7 @@ Rectangle {
                 buttonWidth: internal.buttonWidth
                 buttonHeight: internal.buttonHeight
             }
-            KeyPadTrig {
+            KeyPadFunctionsAndNumerals {
                 id: trigPad
                 anchors.top: parent.top
                 anchors.left: genericPad.right
diff --git a/src/mobile/harmattan/qml/KeyPadTrig.qml \
b/src/mobile/harmattan/qml/KeyPadFunctionsAndNumerals.qml similarity index 76%
rename from src/mobile/harmattan/qml/KeyPadTrig.qml
rename to src/mobile/harmattan/qml/KeyPadFunctionsAndNumerals.qml
index caa667f..46ae866 100644
--- a/src/mobile/harmattan/qml/KeyPadTrig.qml
+++ b/src/mobile/harmattan/qml/KeyPadFunctionsAndNumerals.qml
@@ -16,31 +16,31 @@ Grid {
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "sin"
-        onPressed: root.pressed("sin(")
+        text: "ans"
+        onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "cos"
-        onPressed: root.pressed("cos(")
+        text: "e"
+        onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "Ï€"
-        onPressed: root.pressed("pi")
+        text: ""
+        onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "("
+        text: ""
         onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: ")"
+        text: ""
         onPressed: root.pressed(text)
     }
 
@@ -48,127 +48,127 @@ Grid {
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "tan"
-        onPressed: root.pressed("tan(")
+        text: "sin"
+        onPressed: root.pressed("sin(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "8"
-        onPressed: root.pressed(text)
+        text: "cos"
+        onPressed: root.pressed("cos(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "9"
-        onPressed: root.pressed(text)
+        text: "tan"
+        onPressed: root.pressed("tan(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "x ²"
-        onPressed: root.pressed("^2")
+        text: ""
+        onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "√"
-        onPressed: root.pressed("sqrt(")
+        text: ""
+        onPressed: root.pressed(text)
     }
 
     // third row
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "4"
-        onPressed: root.pressed(text)
+        text: "abs"
+        onPressed: root.pressed("abs(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "5"
+        text: ""
         onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "6"
-        onPressed: root.pressed(text)
+        text: "ln"
+        onPressed: root.pressed("ln(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "×"
-        onPressed: root.pressed("*")
+        text: "log"
+        onPressed: root.pressed("log(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "÷"
-        onPressed: root.pressed("/")
+        text: "eˣ"
+        onPressed: root.pressed("exp(")
     }
 
     // fourth row
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "1"
-        onPressed: root.pressed(text)
+        text: "round"
+        onPressed: root.pressed("round(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "2"
-        onPressed: root.pressed(text)
+        text: "ceil"
+        onPressed: root.pressed("ceil(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "3"
-        onPressed: root.pressed(text)
+        text: "floor"
+        onPressed: root.pressed("floor(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "+"
-        onPressed: root.pressed(text)
+        text: "int"
+        onPressed: root.pressed("int(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "-"
-        onPressed: root.pressed(text)
+        text: "frac"
+        onPressed: root.pressed("frac(")
     }
 
     // fifth row
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "0"
-        onPressed: root.pressed(text)
+        text: "hex"
+        onPressed: root.pressed("hex(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "."
-        onPressed: root.pressed(text)
+        text: "bin"
+        onPressed: root.pressed("bin(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "10Ë£"
-        onPressed: root.pressed("*10^")
+        text: "dec"
+        onPressed: root.pressed("dec(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "ans"
-        onPressed: root.pressed(text)
+        text: "oct"
+        onPressed: root.pressed("oct(")
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "="
+        text: ""
         textColor: "orange"
         onPressed: root.evaluate()
     }


[prev in list] [next in list] [prev in thread] [next in thread]