From 4940460883ee5746d554879539fd99db22fb04c5 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 27 Sep 2016 14:58:40 +0200 Subject: [PATCH] fix(app): little fixes on style --- tests/ui/modules/Linphone/Menu.qml | 4 +-- .../modules/Linphone/Styles/CollapseStyle.qml | 16 ++++----- .../modules/Linphone/Styles/DialogStyle.qml | 32 ++++++++--------- .../Linphone/Styles/ForceScrollBarStyle.qml | 26 +++++++------- .../Linphone/Styles/Form/SmallButtonStyle.qml | 1 + .../ui/modules/Linphone/Styles/MenuStyle.qml | 36 ++++++++++--------- .../ui/modules/Linphone/Styles/PopupStyle.qml | 3 +- .../Linphone/Styles/SearchBoxStyle.qml | 8 ++--- .../modules/Linphone/Styles/TimelineStyle.qml | 28 +++++++-------- 9 files changed, 79 insertions(+), 75 deletions(-) diff --git a/tests/ui/modules/Linphone/Menu.qml b/tests/ui/modules/Linphone/Menu.qml index 8670320f9..3ea3667b4 100644 --- a/tests/ui/modules/Linphone/Menu.qml +++ b/tests/ui/modules/Linphone/Menu.qml @@ -53,8 +53,8 @@ ColumnLayout { Text { Layout.fillWidth: true - color: MenuStyle.entry.textColor - font.pointSize: MenuStyle.entry.fontSize + color: MenuStyle.entry.text.color + font.pointSize: MenuStyle.entry.text.fontSize height: parent.height text: modelData.entryName verticalAlignment: Text.AlignVCenter diff --git a/tests/ui/modules/Linphone/Styles/CollapseStyle.qml b/tests/ui/modules/Linphone/Styles/CollapseStyle.qml index df6a14df2..32475ac17 100644 --- a/tests/ui/modules/Linphone/Styles/CollapseStyle.qml +++ b/tests/ui/modules/Linphone/Styles/CollapseStyle.qml @@ -2,14 +2,14 @@ pragma Singleton import QtQuick 2.7 QtObject { - property int animationDuration: 200 - property int iconSize: 32 + property int animationDuration: 200 + property int iconSize: 32 - property string icon: 'collapse' + property string icon: 'collapse' - property Rectangle background: Rectangle { - // Do not use Constants.colors. - // Collapse uses an icon without background color. - color: 'transparent' - } + property Rectangle background: Rectangle { + // Do not use Constants.colors. + // Collapse uses an icon without background color. + color: 'transparent' + } } diff --git a/tests/ui/modules/Linphone/Styles/DialogStyle.qml b/tests/ui/modules/Linphone/Styles/DialogStyle.qml index dc7dc8dd2..333af25f2 100644 --- a/tests/ui/modules/Linphone/Styles/DialogStyle.qml +++ b/tests/ui/modules/Linphone/Styles/DialogStyle.qml @@ -4,24 +4,24 @@ import QtQuick 2.7 import Linphone 1.0 QtObject { - property int leftMargin: 50 - property int rightMargin: 50 + property int leftMargin: 50 + property int rightMargin: 50 - property QtObject buttons: QtObject { - property int bottomMargin: 15 - property int spacing: 20 - property int topMargin: 15 - } + property QtObject buttons: QtObject { + property int bottomMargin: 15 + property int spacing: 20 + property int topMargin: 15 + } - property QtObject confirmDialog: QtObject { - property int height: 150 - property int width: 370 - } + property QtObject confirmDialog: QtObject { + property int height: 150 + property int width: 370 + } - property QtObject description: QtObject { - property int fontSize: 12 - property int verticalMargin: 25 + property QtObject description: QtObject { + property int fontSize: 12 + property int verticalMargin: 25 - property string color: Colors.l - } + property string color: Colors.l + } } diff --git a/tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml b/tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml index 2423693ed..55ac7e0cb 100644 --- a/tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml +++ b/tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml @@ -4,19 +4,19 @@ import QtQuick 2.7 import Linphone 1.0 QtObject { - property Rectangle background: Rectangle { - color: Colors.a - } + property Rectangle background: Rectangle { + color: Colors.a + } - property Rectangle contentItem: Rectangle { - implicitHeight: 100 - implicitWidth: 8 - radius: 10 - } + property Rectangle contentItem: Rectangle { + implicitHeight: 100 + implicitWidth: 8 + radius: 10 + } - property QtObject color: QtObject { - property string hovered: Colors.h - property string normal: Colors.c - property string pressed: Colors.b - } + property QtObject color: QtObject { + property string hovered: Colors.h + property string normal: Colors.c + property string pressed: Colors.b + } } diff --git a/tests/ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml b/tests/ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml index a02e3500c..409026277 100644 --- a/tests/ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml +++ b/tests/ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml @@ -17,6 +17,7 @@ QtObject { property QtObject text: QtObject { property int fontSize: 8 + property string color: '#FFFFFF' } } diff --git a/tests/ui/modules/Linphone/Styles/MenuStyle.qml b/tests/ui/modules/Linphone/Styles/MenuStyle.qml index 2f8c78424..25d52093c 100644 --- a/tests/ui/modules/Linphone/Styles/MenuStyle.qml +++ b/tests/ui/modules/Linphone/Styles/MenuStyle.qml @@ -4,24 +4,28 @@ import QtQuick 2.7 import Linphone 1.0 QtObject { - property int spacing: 2 + property int spacing: 2 - property QtObject entry: QtObject { - property int fontSize: 13 - property int iconSize: 24 - property int leftMargin: 20 - property int rightMargin: 20 - property int selectionIconSize: 12 - property int spacing: 18 + property QtObject entry: QtObject { + property int iconSize: 24 + property int leftMargin: 20 + property int rightMargin: 20 + property int selectionIconSize: 12 + property int spacing: 18 - property string selectionIcon: 'right_arrow' - property string textColor: Colors.k + property string selectionIcon: 'right_arrow' - property QtObject color: QtObject { - property string normal: Colors.g - property string hovered: Colors.h - property string pressed: Colors.i - property string selected: Colors.j - } + property QtObject color: QtObject { + property string normal: Colors.g + property string hovered: Colors.h + property string pressed: Colors.i + property string selected: Colors.j } + + property QtObject text: QtObject { + property int fontSize: 13 + + property string color: Colors.k + } + } } diff --git a/tests/ui/modules/Linphone/Styles/PopupStyle.qml b/tests/ui/modules/Linphone/Styles/PopupStyle.qml index a0f1d1a40..91d030682 100644 --- a/tests/ui/modules/Linphone/Styles/PopupStyle.qml +++ b/tests/ui/modules/Linphone/Styles/PopupStyle.qml @@ -7,9 +7,8 @@ QtObject { property string backgroundColor: Colors.k property QtObject shadow: QtObject { - property double radius: 8.0 - property int horizontalOffset: 0 + property int radius: 8 property int samples: 15 property int verticalOffset: 2 diff --git a/tests/ui/modules/Linphone/Styles/SearchBoxStyle.qml b/tests/ui/modules/Linphone/Styles/SearchBoxStyle.qml index 63b98384f..9dd868da5 100644 --- a/tests/ui/modules/Linphone/Styles/SearchBoxStyle.qml +++ b/tests/ui/modules/Linphone/Styles/SearchBoxStyle.qml @@ -4,9 +4,9 @@ import QtQuick 2.7 import Linphone 1.0 QtObject { - property string shadowColor: Colors.f + property string shadowColor: Colors.f - property Rectangle searchFieldBackground: Rectangle { - implicitHeight: 30 - } + property Rectangle searchFieldBackground: Rectangle { + implicitHeight: 30 + } } diff --git a/tests/ui/modules/Linphone/Styles/TimelineStyle.qml b/tests/ui/modules/Linphone/Styles/TimelineStyle.qml index 7df775e83..30dcd495a 100644 --- a/tests/ui/modules/Linphone/Styles/TimelineStyle.qml +++ b/tests/ui/modules/Linphone/Styles/TimelineStyle.qml @@ -4,21 +4,21 @@ import QtQuick 2.7 import Linphone 1.0 QtObject { - property QtObject legend: QtObject { - property int bottomMargin: 10 - property int fontSize: 13 - property int iconSize: 26 - property int leftMargin: 18 - property int spacing: 16 - property int topMargin: 10 + property QtObject legend: QtObject { + property int bottomMargin: 10 + property int fontSize: 13 + property int iconSize: 26 + property int leftMargin: 18 + property int spacing: 16 + property int topMargin: 10 - property string color: Colors.d - property string icon: 'history' - } + property string color: Colors.d + property string icon: 'history' + } - property QtObject separator: QtObject { - property int height: 1 + property QtObject separator: QtObject { + property int height: 1 - property string color: Colors.e - } + property string color: Colors.e + } }