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

List:       kde-commits
Subject:    [kdeplasma-addons/bettio/qml-gsoc-calculator] applets/calculator/package/contents/ui: Improved QML c
From:       Davide Bettio <bettio () kde ! org>
Date:       2012-08-21 0:25:59
Message-ID: 20120821002559.34A4BA6042 () git ! kde ! org
[Download RAW message or body]

Git commit 312d32105d1507aa5f9b680ddfde825fe57b80b6 by Davide Bettio.
Committed on 21/08/2012 at 02:24.
Pushed by bettio into branch 'bettio/qml-gsoc-calculator'.

Improved QML calculator behavior (now it's more similar to C++ calculator).

M  +6    -0    applets/calculator/package/contents/ui/calculator.qml

http://commits.kde.org/kdeplasma-addons/312d32105d1507aa5f9b680ddfde825fe57b80b6

diff --git a/applets/calculator/package/contents/ui/calculator.qml \
b/applets/calculator/package/contents/ui/calculator.qml index 3818906..6962cf0 100644
--- a/applets/calculator/package/contents/ui/calculator.qml
+++ b/applets/calculator/package/contents/ui/calculator.qml
@@ -294,16 +294,22 @@ Item
                 display.text = locale.formatNumber(factor / \
locale.readNumber(display.text), 0);  break;
         }
+
+        waitingForDigit = true;
     }
 
     function clearClicked()
     {
         display.text = "0";
+        waitingForDigit = ture;
     }
 
     function allClearClicked()
     {
         display.text = "0";
+        sum = 0;
+        factor = 0;
+        waitingForDigit = true;
     }
 }
 


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