cuteMeter.pro

@@ -59 +59 @@
     qml/components/AboutText.qml \
     qml/components/AboutButton.qml \
-    cuteMeter.desktop
+    cuteMeter.desktop \
+    qml/components/VLine.qml \
+    qml/components/PushButton.qml \
+    qml/components/Point.qml \
+    qml/components/HLine.qml \
+    qml/components/Data.qml \
+    qml/components/AboutText.qml \
+    qml/components/AboutButton.qml
 
 
@@ -76 +83 @@
 
 
+

qml/Main.qml

@@ -9 +9 @@
 
     property int size: Math.abs(p1.pix - p2.pix)
+    property int mem: 0
     
     // connection
@@ -40 +41 @@
     }
     
+    // -----------------------------------
+    // mouse handler
     MouseArea {
         property bool move1: false
@@ -68 +71 @@
             p1.pix = Math.min(parent.height - 4, Math.max(4, p1.pix));
             p2.pix = Math.min(parent.height - 4, Math.max(4, p2.pix));
-        }
-        
+        }        
     }    
+    
+    
+    // -----------------------------------
+    // memory
+    PushButton {
+        id: pb0
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.margins: 22
+        text: "MC"
+        onClicked: main_.mem = 0
+    }
+    
+    PushButton {
+        id: pb1
+        anchors.right: parent.right
+        anchors.top: pb0.bottom
+        anchors.margins: 22
+        text : "M+"
+        onClicked: main_.mem += main_.size
+    }
+    
+    
+    PushButton {
+        id: pb2
+        anchors.right: parent.right
+        anchors.top: pb1.bottom
+        anchors.margins: 22
+        text : "M-"
+        onClicked: main_.mem -= main_.size
+    }
+    
+    Data {
+        anchors.right: pb1.right        
+        anchors.verticalCenter: pb1.verticalCenter
+        text: "" + Math.round(measure.mmPerPixel * main_.mem) + " mm, " + (measure.mmPerPixel * main_.mem / 25.4).toFixed(2) + "\"";
+        visible: main_.mem !== 0
+    }                
+    
+    // -----------------------------------
+    // about
     AboutText {
-        visible: button.active
-        anchors.margins: 8
+        visible: ab.active
         anchors.left: parent.left
         anchors.right: parent.right
@@ -81 +123 @@
 
     AboutButton {
-        id: button
+        id: ab
         anchors.margins: 22
         anchors.right: parent.right
         anchors.bottom: parent.bottom
     }
-
+    
+    
+    // -----------------------------------
+    // beta release warning
     Text {
         width: parent.width
-        y: 20
+        anchors.bottom: ab.top
+        anchors.margins: 22 * 2
         horizontalAlignment: Text.AlignHCenter
         text: "For testers only. Please do not distribute!"
@@ -95 +141 @@
         color: "yellow"
     }
-
+    
+    // -----------------------------------
+    // init
     Component.onCompleted:
     {        
-        p1.pix = 100;
-        p2.pix = 200;
+        p1.pix = 250;
+        p2.pix = 400;
     }
 }

qml/components/AboutButton.qml

@@ -8 +8 @@
     
     width: parent.width / 4
-    height: 38
+    height: 44
     color: active ? "white" : "black"    
     border.color: "white"
@@ -16 +16 @@
         anchors.centerIn: parent
         color: button_.active ? "black" : "white"
-        font.pixelSize: parent.height * 0.8
+        font.pixelSize: parent.height * 0.7
         text: button_.active ? "Back" : "About"
     }

qml/components/AboutText.qml

@@ -21 +21 @@
             textFormat: Text.RichText
             wrapMode: Text.WordWrap
-            color: "blue"
-            font.pixelSize: 24
+            color: "white"
+            font.pixelSize: 20
             onLinkActivated: Qt.openUrlExternally(link)
             text : 
             "<p><br>" + 
             "<h3>cuteMeter</h3>" + 
-            "<p>Version 0.0.1" +
+            "<p>Version 0.1.0" +
             "<p>Developed by <a href=\"http://blog.tube42.se\"> Tube42</a>, " +
-            "<a href=\"mail:av@tube42.se\"> av@tube42.se</a>" + 
-            "<p>With this app, you don't need to carry a ruler in your pocket and confuse the ladies all the time.";            
+            "<a href=\"mail:av@tube42.se\"> av@tube42.se</a>" +                         
+            "<p><br>With this app, you don't need to carry a big ruler in your pocket all the time, "+
+            "which not only destorys your pants, it may also confuse the ladies." +
+            "<p><br>This app was developed in QML for the MeeGo platform. The source code is available from "+
+            "<a href=\"http://projects.developer.nokia.com/cutemeter\">Nokia Developers Forum</a> under the GPLv2 license"
+            ;
         }
         clip: true

qml/components/HLine.qml

@@ -6 +6 @@
     id: point_
     property int pix
-    property int size: 4
+    property int size: 6
     
     width: parent.width
@@ -16 +16 @@
         color: "red"
         width: parent.width
-        y: point_.size
-        height: 1
+        y: point_.size -1
+        height: 3
     }
 }

qtc_packaging/debian_harmattan/changelog

@@ +1 @@
+cutemeter (0.1.0) unstable; urgency=low
+  * <Add change description here>
+
+ -- unknown <>  Mon, 16 Jan 2012 19:03:02 +0100
+
+
 cutemeter (0.0.1) unstable; urgency=low