StandardButton/StandardDropdown QML development

2 files changed, 33 insertions, 28 deletions

diff --git a/components/StandardButton.qml b/components/StandardButton.qml
index 99917752..b7c020e9 100644
--- a/components/StandardButton.qml
+++ b/components/StandardButton.qml
@@ -28,17 +28,18 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
+import "." 1.0
 
 Item {
     id: button
     height: 37 * scaleRatio
-    property string shadowPressedColor: "#B32D00"
-    property string shadowReleasedColor: "#FF4304"
-    property string pressedColor: "#FF4304"
-    property string releasedColor: "#FF6C3C"
+    property string shadowPressedColor: Style.buttonBackgroundColor
+    property string shadowReleasedColor: Style.buttonBackgroundColor
+    property string pressedColor: Style.buttonBackgroundColor
+    property string releasedColor: Style.buttonBackgroundColor
     property string icon: ""
-    property string textColor: "#FFFFFF"
-    property int fontSize: 12 * scaleRatio
+    property string textColor: button.enabled? Style.buttonTextColor: Style.buttonTextColorDisabled
+    property int fontSize: 18 * scaleRatio
     property alias text: label.text
     signal clicked()
 
@@ -56,30 +57,31 @@ Item {
         anchors.right: parent.right
         height: parent.height - 1
         y: buttonArea.pressed ? 0 : 1
-        //radius: 4
-        color: {
-            parent.enabled ? (buttonArea.pressed ? parent.shadowPressedColor : parent.shadowReleasedColor)
-                           : Qt.lighter(parent.shadowReleasedColor)
-        }
+        radius: 3
+        color: parent.enabled ? Style.buttonBackgroundColor : Style.buttonBackgroundColorDisabled
+//        color: {
+//            parent.enabled ? (buttonArea.pressed ? parent.shadowPressedColor : parent.shadowReleasedColor)
+//                           : Qt.lighter(parent.shadowReleasedColor)
+//        }
         border.color: Qt.darker(parent.releasedColor)
         border.width: parent.focus ? 1 : 0
 
     }
 
-    Rectangle {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        height: parent.height - 1
-        y: buttonArea.pressed ? 1 : 0
-        color: {
-            parent.enabled ? (buttonArea.pressed ? parent.pressedColor : parent.releasedColor)
-                           : Qt.lighter(parent.releasedColor)
+//    Rectangle {
+//        anchors.left: parent.left
+//        anchors.right: parent.right
+//        height: parent.height - 1
+//        y: buttonArea.pressed ? 1 : 0
+//        color: {
+//            parent.enabled ? (buttonArea.pressed ? parent.pressedColor : parent.releasedColor)
+//                           : Qt.lighter(parent.releasedColor)
 
-        }
-        //radius: 4
+//        }
+//        //radius: 4
 
 
-    }
+//    }
 
     Text {
         id: label
@@ -87,7 +89,7 @@ Item {
         anchors.left: parent.left
         anchors.right: parent.right
         horizontalAlignment: Text.AlignHCenter
-        font.family: "Arial"
+        font.family: Style.fontBold.name
         font.bold: true
         font.pixelSize: button.fontSize
         color: parent.textColor
diff --git a/components/StandardDropdown.qml b/components/StandardDropdown.qml
index 91a514eb..2818541e 100644
--- a/components/StandardDropdown.qml
+++ b/components/StandardDropdown.qml
@@ -27,6 +27,7 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import QtQuick 2.0
+import "." 1.0
 
 Item {
     id: dropdown
@@ -175,10 +176,10 @@ Item {
                         anchors.right: col2Text.left
                         anchors.leftMargin: 12 * scaleRatio
                         anchors.rightMargin: column2.length > 0 ? 12  * scaleRatio: 0
-                        font.family: "Arial"
+                        font.family: Style.fontRegular.name
                         font.bold: true
-                        font.pixelSize: 12 * scaleRatio
-                        color: "#FFFFFF"
+                        font.pixelSize: 14 * scaleRatio
+                        color: itemArea.containsMouse || index === column.currentIndex || itemArea.containsMouse ? "#FA6800" : "#FFFFFF"
                         text: qsTr(column1) + translationManager.emptyString
                     }
 
@@ -187,8 +188,8 @@ Item {
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.right: parent.right
                         anchors.rightMargin: 45 * scaleRatio
-                        font.family: "Arial"
-                        font.pixelSize: 12 * scaleRatio
+                        font.family: Style.fontRegular.name
+                        font.pixelSize: 14 * scaleRatio
                         color: "#FFFFFF"
                         text: column2
                     }
@@ -211,6 +212,8 @@ Item {
                         id: itemArea
                         anchors.fill: parent
                         hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+
                         onClicked: {
                             dropdown.expanded = false
                             column.currentIndex = index