From c74b0fbe55bbed4b5f38d60c3cc961f5f95d3073 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 28 Sep 2016 11:30:52 +0200 Subject: [PATCH] feat(Form/TransparentComboBox): use style file --- tests/resources.qrc | 1 + .../Linphone/Form/TransparentComboBox.qml | 41 ++++++++++--------- .../modules/Linphone/Styles/DialogStyle.qml | 4 +- .../Styles/Form/AbstractTextButtonStyle.qml | 2 +- .../Linphone/Styles/Form/TextButtonAStyle.qml | 4 +- .../Linphone/Styles/Form/TextButtonBStyle.qml | 4 +- tests/ui/modules/Linphone/Styles/qmldir | 29 ++++++------- 7 files changed, 44 insertions(+), 41 deletions(-) diff --git a/tests/resources.qrc b/tests/resources.qrc index 7ac6e814c..5836abc61 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -68,6 +68,7 @@ ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml + ui/modules/Linphone/Styles/Form/TransparentComboBoxStyle.qml ui/modules/Linphone/Styles/MenuStyle.qml ui/modules/Linphone/Styles/PopupStyle.qml ui/modules/Linphone/Styles/qmldir diff --git a/tests/ui/modules/Linphone/Form/TransparentComboBox.qml b/tests/ui/modules/Linphone/Form/TransparentComboBox.qml index 4f612bf79..1308080a1 100644 --- a/tests/ui/modules/Linphone/Form/TransparentComboBox.qml +++ b/tests/ui/modules/Linphone/Form/TransparentComboBox.qml @@ -1,30 +1,31 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 +import Linphone.Styles 1.0 + // =================================================================== -// Discrete ComboBox which can be integrated in text. +// Discrete ComboBox that can be integrated in text. // =================================================================== ComboBox { + id: comboBox + + background: Rectangle { + color: 'transparent' // No Style constant, see component name. + } + delegate: ItemDelegate { + id: item + background: Rectangle { - color: 'transparent' - } - id: comboBox - delegate: ItemDelegate { - background: Rectangle { - color: delegate.down - ? '#FE5E00' - : (comboBox.currentIndex === index - ? '#F0F0F0' - : '#FFFFFF' - ) - opacity: enabled ? 1 : 0.3 - } - font.weight: comboBox.currentIndex === index - ? Font.DemiBold - : Font.Normal - id: delegate - text: key || modelData - width: comboBox.width + color: item.down + ? TransparentComboBoxStyle.item.color.pressed + : (comboBox.currentIndex === index + ? TransparentComboBoxStyle.item.color.selected + : TransparentComboBoxStyle.item.color.normal + ) } + font.bold: comboBox.currentIndex === index + text: key || modelData + width: comboBox.width + } } diff --git a/tests/ui/modules/Linphone/Styles/DialogStyle.qml b/tests/ui/modules/Linphone/Styles/DialogStyle.qml index c81d753a6..e6d57acd6 100644 --- a/tests/ui/modules/Linphone/Styles/DialogStyle.qml +++ b/tests/ui/modules/Linphone/Styles/DialogStyle.qml @@ -19,9 +19,9 @@ QtObject { } property QtObject description: QtObject { + property color color: Colors.l + property int fontSize: 12 property int verticalMargin: 25 - - property color color: Colors.l } } diff --git a/tests/ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml b/tests/ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml index d5aab303c..03c957b43 100644 --- a/tests/ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml +++ b/tests/ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml @@ -4,8 +4,8 @@ import QtQuick 2.7 QtObject { property QtObject background: QtObject { property int height: 30 - property int width: 160 property int radius: 4 + property int width: 160 } property QtObject text: QtObject { diff --git a/tests/ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml b/tests/ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml index 9a5dc345e..26e527822 100644 --- a/tests/ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml +++ b/tests/ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml @@ -6,13 +6,13 @@ import Linphone 1.0 QtObject { property QtObject backgroundColor: QtObject { property color hovered: Colors.o - property color pressed: Colors.i property color normal: Colors.j + property color pressed: Colors.i } property QtObject textColor: QtObject { property color hovered: Colors.k - property color pressed: Colors.k property color normal: Colors.k + property color pressed: Colors.k } } diff --git a/tests/ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml b/tests/ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml index 8a4b46fcd..7dfe9ebe2 100644 --- a/tests/ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml +++ b/tests/ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml @@ -6,13 +6,13 @@ import Linphone 1.0 QtObject { property QtObject backgroundColor: QtObject { property color hovered: Colors.p - property color pressed: Colors.i property color normal: Colors.m + property color pressed: Colors.i } property QtObject textColor: QtObject { property color hovered: Colors.d - property color pressed: Colors.k property color normal: Colors.d + property color pressed: Colors.k } } diff --git a/tests/ui/modules/Linphone/Styles/qmldir b/tests/ui/modules/Linphone/Styles/qmldir index c8326e18e..18f5cae28 100644 --- a/tests/ui/modules/Linphone/Styles/qmldir +++ b/tests/ui/modules/Linphone/Styles/qmldir @@ -3,18 +3,19 @@ module Linphone.Style # Components styles. -singleton CollapseStyle 1.0 CollapseStyle.qml -singleton DialogStyle 1.0 DialogStyle.qml -singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml -singleton MenuStyle 1.0 MenuStyle.qml -singleton PopupStyle 1.0 PopupStyle.qml -singleton SearchBoxStyle 1.0 SearchBoxStyle.qml -singleton TimelineStyle 1.0 TimelineStyle.qml +singleton CollapseStyle 1.0 CollapseStyle.qml +singleton DialogStyle 1.0 DialogStyle.qml +singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml +singleton MenuStyle 1.0 MenuStyle.qml +singleton PopupStyle 1.0 PopupStyle.qml +singleton SearchBoxStyle 1.0 SearchBoxStyle.qml +singleton TimelineStyle 1.0 TimelineStyle.qml -singleton AbstractTextButtonStyle 1.0 Form/AbstractTextButtonStyle.qml -singleton ActionBarStyle 1.0 Form/ActionBarStyle.qml -singleton CheckBoxTextStyle 1.0 Form/CheckBoxTextStyle.qml -singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml -singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml -singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.qml -singleton TextButtonBStyle 1.0 Form/TextButtonBStyle.qml +singleton AbstractTextButtonStyle 1.0 Form/AbstractTextButtonStyle.qml +singleton ActionBarStyle 1.0 Form/ActionBarStyle.qml +singleton CheckBoxTextStyle 1.0 Form/CheckBoxTextStyle.qml +singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml +singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml +singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.qml +singleton TextButtonBStyle 1.0 Form/TextButtonBStyle.qml +singleton TransparentComboBoxStyle 1.0 Form/TransparentComboBoxStyle.qml