diff --git a/tests/resources.qrc b/tests/resources.qrc index 743468c01..549115d50 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -56,6 +56,7 @@ ui/modules/Common/SearchBox.qml ui/modules/Common/Styles/CollapseStyle.qml ui/modules/Common/Styles/DialogStyle.qml + ui/modules/Common/Styles/DroppableTextAreaStyle.qml ui/modules/Common/Styles/ForceScrollBarStyle.qml ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml ui/modules/Common/Styles/Form/ActionBarStyle.qml diff --git a/tests/ui/modules/Common/DroppableTextArea.qml b/tests/ui/modules/Common/DroppableTextArea.qml index 4cfc56af5..99f194e41 100644 --- a/tests/ui/modules/Common/DroppableTextArea.qml +++ b/tests/ui/modules/Common/DroppableTextArea.qml @@ -4,6 +4,8 @@ import QtQuick.Dialogs 1.2 import Common.Styles 1.0 +// =================================================================== + Item { signal dropped (var files) @@ -34,7 +36,9 @@ Item { TextArea.flickable: TextArea { id: textArea - rightPadding: fileChooserButton.width + fileChooserButton.anchors.rightMargin + 6 + rightPadding: fileChooserButton.width + + fileChooserButton.anchors.rightMargin + + DroppableTextAreaStyle.fileChooserButton.margins wrapMode: TextArea.Wrap } anchors.fill: parent @@ -46,11 +50,12 @@ Item { anchors { right: parent.right - rightMargin: scrollBar.width + 6 + rightMargin: scrollBar.width + + DroppableTextAreaStyle.fileChooserButton.margins } height: parent.height - width: 40 + width: DroppableTextAreaStyle.fileChooserButton.width onClicked: fileDialog.open() @@ -75,14 +80,14 @@ Item { id: hoverContent anchors.fill: parent - color: '#FFFFFF' + color: DroppableTextAreaStyle.hoverContent.backgroundColor visible: false Text { anchors.centerIn: parent - color: '#FE5E00' - font.pointSize: 11 - text: qsTr('DROP YOUR ATTACHMENT') + color: DroppableTextAreaStyle.hoverContent.text.color + font.pointSize: DroppableTextAreaStyle.hoverContent.text.fontSize + text: qsTr('dropYourAttachment') } } diff --git a/tests/ui/modules/Common/Styles/qmldir b/tests/ui/modules/Common/Styles/qmldir index 2e74365b2..9da690748 100644 --- a/tests/ui/modules/Common/Styles/qmldir +++ b/tests/ui/modules/Common/Styles/qmldir @@ -5,6 +5,8 @@ module Common.Styles # Components styles. singleton CollapseStyle 1.0 CollapseStyle.qml singleton DialogStyle 1.0 DialogStyle.qml +singleton DroppableTextAreaStyle 1.0 DroppableTextAreaStyle.qml + singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml singleton MenuStyle 1.0 MenuStyle.qml singleton PanedStyle 1.0 PanedStyle.qml