From 58a4ccac60ddabedaace7132cf845cdf8463459c Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 14 Oct 2016 09:17:32 +0200 Subject: [PATCH] fix(app): many code style changes --- tests/ui/modules/Common/Dialog/ConfirmDialog.qml | 2 -- tests/ui/modules/Common/ForceScrollBar.qml | 2 ++ .../modules/Common/Form/AbstractTextButton.qml | 8 ++++++-- tests/ui/modules/Common/Form/CheckBoxText.qml | 4 ++-- tests/ui/modules/Common/Form/ListForm.qml | 8 ++++++-- tests/ui/modules/Common/Menu.qml | 13 ++++++++----- tests/ui/modules/Common/SearchBox.qml | 16 ++++++++++++++-- .../Styles/Form/AbstractTextButtonStyle.qml | 2 ++ .../Common/Styles/Form/ActionBarStyle.qml | 2 ++ .../Common/Styles/Form/CheckBoxTextStyle.qml | 2 ++ .../Common/Styles/Form/ExclusiveButtonsStyle.qml | 2 ++ .../modules/Common/Styles/Form/ListFormStyle.qml | 2 ++ .../Common/Styles/Form/SmallButtonStyle.qml | 2 ++ .../Common/Styles/Form/TextButtonAStyle.qml | 2 ++ .../Common/Styles/Form/TextButtonBStyle.qml | 2 ++ .../Styles/Form/TransparentComboBoxStyle.qml | 2 ++ tests/ui/views/MainWindow/MainWindow.qml | 1 - 17 files changed, 56 insertions(+), 16 deletions(-) diff --git a/tests/ui/modules/Common/Dialog/ConfirmDialog.qml b/tests/ui/modules/Common/Dialog/ConfirmDialog.qml index c39240faf..c6801fdfb 100644 --- a/tests/ui/modules/Common/Dialog/ConfirmDialog.qml +++ b/tests/ui/modules/Common/Dialog/ConfirmDialog.qml @@ -6,8 +6,6 @@ import Common.Styles 1.0 // =================================================================== DialogPlus { - id: dialog - buttons: [ TextButtonA { text: qsTr('cancel') diff --git a/tests/ui/modules/Common/ForceScrollBar.qml b/tests/ui/modules/Common/ForceScrollBar.qml index 2d537f8fe..591c3fd42 100644 --- a/tests/ui/modules/Common/ForceScrollBar.qml +++ b/tests/ui/modules/Common/ForceScrollBar.qml @@ -3,6 +3,8 @@ import QtQuick.Controls 2.0 import Common.Styles 1.0 +// =================================================================== +// A simple custom vertical scrollbar. // =================================================================== ScrollBar { diff --git a/tests/ui/modules/Common/Form/AbstractTextButton.qml b/tests/ui/modules/Common/Form/AbstractTextButton.qml index 290a72881..bbada380d 100644 --- a/tests/ui/modules/Common/Form/AbstractTextButton.qml +++ b/tests/ui/modules/Common/Form/AbstractTextButton.qml @@ -35,8 +35,12 @@ Button { ? textColorHovered : textColorNormal ) - font.bold: true - font.pointSize: AbstractTextButtonStyle.text.fontSize + + font { + bold: true + pointSize: AbstractTextButtonStyle.text.fontSize + } + horizontalAlignment: Text.AlignHCenter text: button.text verticalAlignment: Text.AlignVCenter diff --git a/tests/ui/modules/Common/Form/CheckBoxText.qml b/tests/ui/modules/Common/Form/CheckBoxText.qml index de8435b0c..871e28b9d 100644 --- a/tests/ui/modules/Common/Form/CheckBoxText.qml +++ b/tests/ui/modules/Common/Form/CheckBoxText.qml @@ -47,8 +47,8 @@ CheckBox { radius: CheckBoxTextStyle.radius visible: checkBox.checked width: parent.width - x * 2 - x: 4 // Fixed, no style. - y: 4 // Fixed, no style. + x: 4 // Fixed, no needed to use style file. + y: 4 // Same thing. } } } diff --git a/tests/ui/modules/Common/Form/ListForm.qml b/tests/ui/modules/Common/Form/ListForm.qml index e7402aa51..d45da1f77 100644 --- a/tests/ui/modules/Common/Form/ListForm.qml +++ b/tests/ui/modules/Common/Form/ListForm.qml @@ -82,8 +82,12 @@ RowLayout { Text { anchors.fill: textEdit color: ListFormStyle.value.placeholder.color - font.italic: true - font.pointSize: ListFormStyle.value.placeholder.fontSize + + font { + italic: true + pointSize: ListFormStyle.value.placeholder.fontSize + } + padding: textEdit.padding text: textEdit.text.length === 0 && !textEdit.activeFocus ? listForm.placeholder diff --git a/tests/ui/modules/Common/Menu.qml b/tests/ui/modules/Common/Menu.qml index e82526f03..67ad4b722 100644 --- a/tests/ui/modules/Common/Menu.qml +++ b/tests/ui/modules/Common/Menu.qml @@ -37,11 +37,14 @@ ColumnLayout { width: menu.entryWidth RowLayout { - anchors.left: parent.left - anchors.leftMargin: MenuStyle.entry.leftMargin - anchors.right: parent.right - anchors.rightMargin: MenuStyle.entry.rightMargin - anchors.verticalCenter: parent.verticalCenter + anchors { + left: parent.left + leftMargin: MenuStyle.entry.leftMargin + right: parent.right + rightMargin: MenuStyle.entry.rightMargin + verticalCenter: parent.verticalCenter + } + spacing: MenuStyle.entry.spacing Icon { diff --git a/tests/ui/modules/Common/SearchBox.qml b/tests/ui/modules/Common/SearchBox.qml index 0414bf390..89978e41b 100644 --- a/tests/ui/modules/Common/SearchBox.qml +++ b/tests/ui/modules/Common/SearchBox.qml @@ -3,6 +3,9 @@ import QtQuick.Controls 2.0 import Common.Styles 1.0 +// =================================================================== +// A reusable search input which display a entries model in a menu. +// Each entry can be filtered with the search input. // =================================================================== Item { @@ -11,12 +14,15 @@ Item { property alias delegate: list.delegate property alias entryHeight: menu.entryHeight property alias maxMenuHeight: menu.maxMenuHeight + + // This property must implement `setFilterFixedString` and/or + // `invalidate` functions. property alias model: list.model + property alias placeholderText: searchField.placeholderText signal menuClosed () signal menuOpened () - signal searchTextChanged (string text) function _hideMenu () { menu.hide() @@ -48,7 +54,13 @@ Item { Keys.onEscapePressed: _hideMenu() onActiveFocusChanged: activeFocus && _showMenu() - onTextChanged: searchTextChanged(text) + onTextChanged: { + model.setFilterFixedString(text) + + if (model.invalidate) { + model.invalidate() + } + } } DropDownMenu { diff --git a/tests/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml b/tests/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml index 03c957b43..0c791c575 100644 --- a/tests/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml @@ -1,6 +1,8 @@ pragma Singleton import QtQuick 2.7 +// =================================================================== + QtObject { property QtObject background: QtObject { property int height: 30 diff --git a/tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml b/tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml index b138bb432..b0a2f3b80 100644 --- a/tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml @@ -1,6 +1,8 @@ pragma Singleton import QtQuick 2.7 +// =================================================================== + QtObject { property int spacing: 8 } diff --git a/tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml b/tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml index 1c5bda498..f90a546b3 100644 --- a/tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml @@ -3,6 +3,8 @@ import QtQuick 2.7 import Common 1.0 +// =================================================================== + QtObject { property int radius: 3 property int size: 18 diff --git a/tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml b/tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml index 5f0c14519..40023d462 100644 --- a/tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml @@ -3,6 +3,8 @@ import QtQuick 2.7 import Common 1.0 +// =================================================================== + QtObject { property int buttonsSpacing: 8 diff --git a/tests/ui/modules/Common/Styles/Form/ListFormStyle.qml b/tests/ui/modules/Common/Styles/Form/ListFormStyle.qml index a7d320853..537c9611d 100644 --- a/tests/ui/modules/Common/Styles/Form/ListFormStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/ListFormStyle.qml @@ -3,6 +3,8 @@ import QtQuick 2.7 import Common 1.0 +// =================================================================== + QtObject { property int lineHeight: 30 diff --git a/tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml b/tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml index 73f1adf43..5e46a99f3 100644 --- a/tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml @@ -3,6 +3,8 @@ import QtQuick 2.7 import Common 1.0 +// =================================================================== + QtObject { property QtObject background: QtObject { property int height: 22 diff --git a/tests/ui/modules/Common/Styles/Form/TextButtonAStyle.qml b/tests/ui/modules/Common/Styles/Form/TextButtonAStyle.qml index 1f8d1ece3..4cb056cdd 100644 --- a/tests/ui/modules/Common/Styles/Form/TextButtonAStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/TextButtonAStyle.qml @@ -3,6 +3,8 @@ import QtQuick 2.7 import Common 1.0 +// =================================================================== + QtObject { property QtObject backgroundColor: QtObject { property color hovered: Colors.o diff --git a/tests/ui/modules/Common/Styles/Form/TextButtonBStyle.qml b/tests/ui/modules/Common/Styles/Form/TextButtonBStyle.qml index 56953bcab..e4e6d3460 100644 --- a/tests/ui/modules/Common/Styles/Form/TextButtonBStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/TextButtonBStyle.qml @@ -3,6 +3,8 @@ import QtQuick 2.7 import Common 1.0 +// =================================================================== + QtObject { property QtObject backgroundColor: QtObject { property color hovered: Colors.p diff --git a/tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml b/tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml index 953344f2b..c591f1cd7 100644 --- a/tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml +++ b/tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml @@ -3,6 +3,8 @@ import QtQuick 2.7 import Common 1.0 +// =================================================================== + QtObject { property QtObject item: QtObject { property QtObject color: QtObject { diff --git a/tests/ui/views/MainWindow/MainWindow.qml b/tests/ui/views/MainWindow/MainWindow.qml index 4ab1fdb08..82b91ee84 100644 --- a/tests/ui/views/MainWindow/MainWindow.qml +++ b/tests/ui/views/MainWindow/MainWindow.qml @@ -100,7 +100,6 @@ ApplicationWindow { ActionButton { icon: 'call' onClicked: CallsWindow.show() - }, ActionButton {