Added font property to flat button style

Author: githubuser0xFFFF

.gitignore

@@ -1,2 +1,5 @@
 build
 /src/virtualkeyboard.pro.user
+/examples/qmlapp/qmlappdemo.pro.user.3.3-pre1
+/examples/qmlapp/*.exe
+/examples/qmlapp/qmlappdemo.pro.user

examples/qmlapp/ButtonFlatStyle.qml

@@ -0,0 +1,31 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
+
+ButtonStyle {
+    id: textfieldstyle
+    property font font
+
+    background: Rectangle {
+        id: bg
+        color: !control.pressed ? "#00FFFFFF" : "#5caa15"
+        radius: 6
+        border.color: "#5caa15"
+        border.width: 1.4
+    }
+
+    label: Text {
+        id: textLabel
+        renderType: Text.NativeRendering
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        color: control.pressed ? "white" : "#5caa15"
+        text: control.text
+        font: textfieldstyle.font
+    }
+
+    padding.left: 20
+    padding.right: 20
+    padding.top: 10
+    padding.bottom: 10
+}

examples/qmlapp/FontAwesome.otf

@@ -9,6 +9,10 @@ Rectangle {
     height: parent.height
     color: "white"
 
+    FontLoader {
+        source: "FontAwesome.otf"
+    }
+
     Flickable {
         id: flickable
         anchors.fill: parent
@@ -24,10 +28,35 @@ Rectangle {
             width: flickable.width - 26
             height: syringe.implicitHeight
 
-            Syringe {
+            Row {
                 id: syringe
-                anchors.horizontalCenter: parent.horizontalCenter
-                width: parent.width * 0.7
+                anchors.left: content.left
+                anchors.right: content.right
+                Button {
+                    id: emptyButton
+                    text: "\uf049"
+                    width: content.width * 0.1
+                    height: parent.height
+                    style: ButtonFlatStyle {
+                        font.family: "FontAwesome"
+                        font.pixelSize: 40
+                    }
+                }
+
+                Syringe {
+                    width: content.width * 0.8
+                }
+
+                Button {
+                    id: refillButton
+                    text: "\uf050"
+                    width: content.width * 0.1
+                    height: parent.height
+                    style: ButtonFlatStyle {
+                        font.family: "FontAwesome"
+                        font.pixelSize: 40
+                    }
+                }
             }
 
 
@@ -54,6 +83,7 @@ Rectangle {
                     width: grid.width - x
                     placeholderText: "Volume (ml)"
                     inputMethodHints: Qt.ImhFormattedNumbersOnly
+                    text: "0"
                     validator: DoubleValidator {
                         bottom: 0;
                         top: 2000;
@@ -73,6 +103,12 @@ Rectangle {
                     width: grid.width - x
                     placeholderText: "Flow (ml/s)"
                     inputMethodHints: Qt.ImhFormattedNumbersOnly
+                    validator: DoubleValidator {
+                        bottom: 0;
+                        top: 2000;
+                        notation: DoubleValidator.StandardNotation
+                        decimals: 3
+                    }
                 }
 
                 // 3rd row ----------------------
@@ -88,6 +124,9 @@ Rectangle {
                     maximumValue: 100
                     value: 30
                     style: SliderFlatStyle {}
+                    onValueChanged: {
+                        flowTextField.text = value
+                    }
                 }
             }
         }

examples/qmlapp/MainQuickControls.qml

@@ -18,14 +18,16 @@ Item {
     ProgressBar {
         id: progressBar
         anchors.left: parent.left
-        anchors.leftMargin: 70
+        anchors.leftMargin: Math.round(
+            (syringeImage.width - syringeImage.paintedWidth) / 2 + syringeImage.paintedWidth * 0.125)
         anchors.right: parent.right
-        anchors.rightMargin: 70
+        anchors.rightMargin: Math.round(
+            (syringeImage.width - syringeImage.paintedWidth) / 2 + syringeImage.paintedWidth * 0.13)
         anchors.verticalCenter: parent.verticalCenter
-        height: 80
+        height: syringeImage.height * 0.65
         minimumValue: 0
         maximumValue: 100
-        value: 70
+        value: 100
         style: syringeProgressBarStyle
         z: 0
     }