Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml

[mdictionary] / src / mdictionary / qml / Button.qml

diff --git a/src/mdictionary/qml/Button.qml b/src/mdictionary/qml/Button.qml
index 748ba3c..0491e99 100644 (file)
--- a/src/mdictionary/qml/Button.qml
+++ b/src/mdictionary/qml/Button.qml
@@ -6,7 +6,7 @@ BorderImage {
     signal clicked
     opacity: 1
 
-    function setText(string) { textInButton = string; }
+    function setText(string) { textInButton = qsTr(string); }
     border { left: 10; top: 10; right: 10; bottom: 10 }
 
     MouseArea {
@@ -27,22 +27,13 @@ BorderImage {
         style: Text.Sunken; color: "white"; styleColor: "black"; smooth: true
     }
 
-    Rectangle {
-        id: shade
-        anchors.centerIn: parent;
-        radius: parent.height*.4;
-        color: "black";
-        opacity: 0
-        width:  parent.width;
-        height: parent.height;
-    }
-
     Image {
         id: image1
         width: (35*parent.height)/107 +1
         height: parent.height
         anchors.left: parent.left
         source: "qrc:/button/buttonLeft.png"
+        fillMode:Image.Stretch
     }
 
     Image {
@@ -52,6 +43,7 @@ BorderImage {
         height: parent.height
         anchors.horizontalCenter: parent.horizontalCenter
         source: "qrc:/button/buttonCenter.png"
+        fillMode:Image.Stretch
     }
 
     Image {
@@ -61,88 +53,25 @@ BorderImage {
         height: parent.height
         anchors.right: parent.right
         source: "qrc:/button/buttonR.png"
+        fillMode:Image.Stretch
     }
 
     states: [
         State {
-            name: "pressed"; when: mouseArea.pressed == true
-            PropertyChanges { target: shade; opacity: 0.4 }
-            PropertyChanges { target: image1; opacity: 0.5 }
-            PropertyChanges { target: image3; opacity: 0.5 }
-            PropertyChanges { target: image2; opacity: 0.5 }
-        }
-    ]
-
+            name: "pressed";
+            when: (mouseArea.pressed == true && button.enabled == true);
 
-
-/*    MouseArea {
-        id: mouseArea
-        anchors.centerIn: parent;
-        width:  ((parent.width > buttonText.text.length*buttonText.font.pixelSize*.8) ? (parent.width) : (buttonText.text.length*buttonText.font.pixelSize*.60)) - ((70*parent.height)/107)
-        height: parent.height
-        onClicked: {
-            button.clicked();
-        }
-    }
-
-    Text {
-        z:1
-        id: buttonText
-        anchors.centerIn: parent;
-        font.pixelSize: parent.height * .5
-        style: Text.Sunken; color: "white"; styleColor: "black"; smooth: true
-        PropertyChanges {
-            target: button;
-            width: (button.width> buttonText.text.length*buttonText.font.pixelSize*.8) ? (parent.width) : (buttonText.text.length*buttonText.font.pixelSize*.8)
-        }
-    }
-
-    Rectangle {
-        id: shade
-        anchors.centerIn: parent;
-        radius: parent.height*.4;
-        color: "black";
-        opacity: 0
-        width:  ((parent.width > buttonText.text.length*buttonText.font.pixelSize*.8) ? (parent.width) : (buttonText.text.length*buttonText.font.pixelSize*.60))
-        height: parent.height
-    }
-
-    Image {
-        id: image1
-        width: (35*parent.height)/107 +1
-        height: parent.height
-        anchors.left: parent.left
-        anchors.leftMargin: (parent.width - ((parent.width > buttonText.text.length*buttonText.font.pixelSize*.8) ? (parent.width) : (buttonText.text.length*buttonText.font.pixelSize*.60)))/2
-        source: "qrc:/button/buttonLeft.png"
-    }
-
-    Image {
-        id: image3
-        smooth: true
-        width: (((parent.width > buttonText.text.length*buttonText.font.pixelSize*.8) ? (parent.width) : (buttonText.text.length*buttonText.font.pixelSize*.60)) - ((70*parent.height)/107))+1
-        height: parent.height
-        anchors.horizontalCenter: parent.horizontalCenter
-        source: "qrc:/button/buttonCenter.png"
-    }
-
-    Image {
-        id: image2
-        smooth: true
-        width: (35*parent.height)/107 +1
-        height: parent.height
-        anchors.right: parent.right
-        anchors.rightMargin: (parent.width - ((parent.width > buttonText.text.length*buttonText.font.pixelSize*.8) ? (parent.width) : (buttonText.text.length*buttonText.font.pixelSize*.60)))/2
-        source: "qrc:/button/buttonR.png"
-    }
-
-    states: [
+            PropertyChanges { target: image1; source: "qrc:/button/buttonLeftPushed.png" }
+            PropertyChanges { target: image3; source: "qrc:/button/buttonCenterPushed.png" }
+            PropertyChanges { target: image2; source: "qrc:/button/buttonRightPushed.png" }
+        },
         State {
-            name: "pressed"; when: mouseArea.pressed == true
-            PropertyChanges { target: shade; opacity: 0.4 }
-            PropertyChanges { target: image1; opacity: 0.5 }
-            PropertyChanges { target: image3; opacity: 0.5 }
-            PropertyChanges { target: image2; opacity: 0.5 }
+            name: "disabled";
+            when: (button.enabled == false);
+
+            PropertyChanges { target: image1; source: "qrc:/button/buttonLeftDisabled.png" }
+            PropertyChanges { target: image3; source: "qrc:/button/buttonCenterDisabled.png" }
+            PropertyChanges { target: image2; source: "qrc:/button/buttonRightDisabled.png" }
         }
     ]
-    */
 }