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

List:       kde-commits
Subject:    [abakus] src/mobile/harmattan/qml: improve keypads, expecially the logic one
From:       Mathias Kraus <k.hias () gmx ! de>
Date:       2013-12-06 22:38:06
Message-ID: E1Vp42A-0007OT-Gm () scm ! kde ! org
[Download RAW message or body]

Git commit 4d1bca7517a5d4c6a74490ac6c0cb7f66491fc16 by Mathias Kraus.
Committed on 06/12/2013 at 22:22.
Pushed by mkraus into branch 'master'.

improve keypads, expecially the logic one

M  +1    -1    src/mobile/harmattan/qml/KeyPadGeneric.qml
M  +21   -21   src/mobile/harmattan/qml/KeyPadLogic.qml
M  +1    -1    src/mobile/harmattan/qml/KeyPadTrig.qml

http://commits.kde.org/abakus/4d1bca7517a5d4c6a74490ac6c0cb7f66491fc16

diff --git a/src/mobile/harmattan/qml/KeyPadGeneric.qml b/src/mobile/harmat=
tan/qml/KeyPadGeneric.qml
index 2e34cfc..9f09905 100644
--- a/src/mobile/harmattan/qml/KeyPadGeneric.qml
+++ b/src/mobile/harmattan/qml/KeyPadGeneric.qml
@@ -156,7 +156,7 @@ Grid {
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "10^x"
+        text: "10=CB=A3"
         onPressed: root.pressed("*10^")
     }
     Button {
diff --git a/src/mobile/harmattan/qml/KeyPadLogic.qml b/src/mobile/harmatta=
n/qml/KeyPadLogic.qml
index 0a2308c..70f0512 100644
--- a/src/mobile/harmattan/qml/KeyPadLogic.qml
+++ b/src/mobile/harmattan/qml/KeyPadLogic.qml
@@ -17,31 +17,31 @@ Grid {
         width: root.buttonWidth
         height: root.buttonHeight
         text: "<<"
-        onPressed: root.pressed("<<")
+        onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
         text: ">>"
-        onPressed: root.pressed(">>")
+        onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: ""
-        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: ""
-        onPressed: root.pressed(text)
+        text: "oct"
+        onPressed: root.pressed("oct(")
     }
 =

     // second row
@@ -66,13 +66,13 @@ Grid {
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "x^y"
-        onPressed: root.pressed("^")
+        text: "E"
+        onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: ""
+        text: "F"
         onPressed: root.pressed(text)
     }
 =

@@ -98,14 +98,14 @@ Grid {
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "=C3=97"
-        onPressed: root.pressed("*")
+        text: "C"
+        onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "=C3=B7"
-        onPressed: root.pressed("/")
+        text: "D"
+        onPressed: root.pressed(text)
     }
 =

     // fourth row
@@ -130,13 +130,13 @@ Grid {
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "+"
+        text: "A"
         onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "-"
+        text: "B"
         onPressed: root.pressed(text)
     }
 =

@@ -150,19 +150,19 @@ Grid {
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: ""
+        text: "0x"
         onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "10^x"
-        onPressed: root.pressed("*10^")
+        text: "0b"
+        onPressed: root.pressed(text)
     }
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "ans"
+        text: "0o"
         onPressed: root.pressed(text)
     }
     Button {
diff --git a/src/mobile/harmattan/qml/KeyPadTrig.qml b/src/mobile/harmattan=
/qml/KeyPadTrig.qml
index fccddf9..caa667f 100644
--- a/src/mobile/harmattan/qml/KeyPadTrig.qml
+++ b/src/mobile/harmattan/qml/KeyPadTrig.qml
@@ -156,7 +156,7 @@ Grid {
     Button {
         width: root.buttonWidth
         height: root.buttonHeight
-        text: "10^x"
+        text: "10=CB=A3"
         onPressed: root.pressed("*10^")
     }
     Button {

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