Merge branch 'dev' into qt_migration

client/ui/qml/Controls/BlueButtonType.qml

@@ -1,11 +1,12 @@
 import QtQuick
 import QtQuick.Controls
 
+import "../Config"
 
 BasicButtonType {
     id: root
-    width: parent.width - 80
-    height: 40
+    width: parent.width - 2 * GC.defaultMargin
+    implicitHeight: 40
 
     background: Rectangle {
         anchors.fill: parent

client/ui/qml/Controls/FlickableType.qml

@@ -0,0 +1,26 @@
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import "../Config"
+
+Flickable {
+    id: fl
+
+    clip: true
+    width: parent.width
+
+    anchors.topMargin: GC.defaultMargin
+    anchors.bottom: parent.bottom
+    anchors.bottomMargin: GC.defaultMargin
+    anchors.left: root.left
+    anchors.leftMargin: GC.defaultMargin
+    anchors.right: root.right
+    anchors.rightMargin: 1
+
+    Keys.onUpPressed: scrollBar.decrease()
+    Keys.onDownPressed: scrollBar.increase()
+
+    ScrollBar.vertical: ScrollBar {
+        id: scrollBar
+        policy: fl.height >= fl.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
+    }
+}

client/ui/qml/Controls/LabelType.qml

@@ -1,9 +1,9 @@
 import QtQuick
+import "../Config"
 
 Text {
     id: root
-    x: 40
-    width: parent.width
+    width: parent.width - 2 * GC.defaultMargin
     anchors.topMargin: 10
 
     font.family: "Lato"

client/ui/qml/Controls/TextFieldType.qml

@@ -1,19 +1,20 @@
 import QtQuick
 import QtQuick.Controls
 import Qt.labs.platform
+import "../Config"
 
 TextField {
     id: root
     property bool error: false
 
-    width: parent.width - 80
+    width: parent.width - 2 * GC.defaultMargin
     height: 40
     anchors.topMargin: 5
     selectByMouse: true
-
     selectionColor: "darkgray"
     font.pixelSize: 16
     color: "#333333"
+
     background: Rectangle {
         implicitWidth: 200
         implicitHeight: 40

client/ui/qml/Controls/UrlButtonType.qml

@@ -0,0 +1,25 @@
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+
+BasicButtonType {
+    property alias label: lbl
+    id: root
+    antialiasing: true
+    height: 21
+    background: Item {}
+
+    contentItem: Text {
+        id: lbl
+        anchors.fill: parent
+        font.family: "Lato"
+        font.styleName: "normal"
+        font.pixelSize: 18
+        font.underline: true
+
+        text: root.text
+        color: "#3045ee"
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+    }
+}