diff options
author | Doris Verria <doris.verria@qt.io> | 2022-03-29 06:50:19 +0200 |
---|---|---|
committer | Doris Verria <doris.verria@qt.io> | 2022-03-30 21:46:07 +0200 |
commit | 1f4851e3eb0798876b1f0328a4bb3889f98506c9 (patch) | |
tree | 15569c4edb1996ea0f51ebdee8c156017631ff65 | |
parent | bb7891f35026c3a9cf8641c2d0e815580d4a9a43 (diff) |
iOS Style: Add RadioButton and CheckBox controlswip/iosstyle
Change-Id: Iaeb72aa1eac1b444ccb30529e409f11983573366
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
27 files changed, 165 insertions, 0 deletions
diff --git a/src/quickcontrols2/ios/CMakeLists.txt b/src/quickcontrols2/ios/CMakeLists.txt index a1254d772e..1e0afc34a8 100644 --- a/src/quickcontrols2/ios/CMakeLists.txt +++ b/src/quickcontrols2/ios/CMakeLists.txt @@ -7,6 +7,8 @@ set(qml_files "RangeSlider.qml" "Switch.qml" "Button.qml" + "CheckBox.qml" + "RadioButton.qml" ) set_source_files_properties(Slider.qml PROPERTIES QT_QML_SOURCE_VERSIONS "2.2;6.0" diff --git a/src/quickcontrols2/ios/CheckBox.qml b/src/quickcontrols2/ios/CheckBox.qml new file mode 100644 index 0000000000..38eb77c583 --- /dev/null +++ b/src/quickcontrols2/ios/CheckBox.qml @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2022 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.iOS +import QtQuick.Controls.impl + +T.CheckBox { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding, + implicitIndicatorHeight + topPadding + bottomPadding) + + spacing: 6 + + indicator: Image { + x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + opacity: control.enabled ? 1 : 0.5 + + source: control.IOS.url + (control.checkState === Qt.Unchecked ? "radiobutton-indicator" : "checkbox-indicator") + ImageSelector on source { + states: [ + {"checked": control.checkState === Qt.Checked}, + {"partially-checked": control.checkState === Qt.PartiallyChecked}, + {"light": control.IOS.theme == IOS.Light}, + {"dark": control.IOS.theme == IOS.Dark} + ] + } + } + + contentItem: Text { + leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 + rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 + + text: control.text + font: control.font + color: control.palette.windowText + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + } +} diff --git a/src/quickcontrols2/ios/RadioButton.qml b/src/quickcontrols2/ios/RadioButton.qml new file mode 100644 index 0000000000..606916d61d --- /dev/null +++ b/src/quickcontrols2/ios/RadioButton.qml @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2022 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.iOS +import QtQuick.Controls.impl + +T.RadioButton { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding, + implicitIndicatorHeight + topPadding + bottomPadding) + + spacing: 6 + + indicator: Image { + x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + opacity: control.enabled ? 1 : 0.5 + + source: control.IOS.url + "radiobutton-indicator" + ImageSelector on source { + states: [ + {"checked": control.checked}, + {"light": control.IOS.theme == IOS.Light}, + {"dark": control.IOS.theme == IOS.Dark} + ] + } + } + + contentItem: Text { + leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 + rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 + + text: control.text + font: control.font + color: control.palette.windowText + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + } +} diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark.png b/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark.png Binary files differnew file mode 100644 index 0000000000..c498cd2b0c --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark.png diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark@2x.png b/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark@2x.png Binary files differnew file mode 100644 index 0000000000..caedc3d97a --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark@2x.png diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark@3x.png b/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark@3x.png Binary files differnew file mode 100644 index 0000000000..fc3a67efd1 --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-checked-dark@3x.png diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-light.png b/src/quickcontrols2/ios/images/checkbox-indicator-checked-light.png Binary files differnew file mode 100644 index 0000000000..949087e5ad --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-checked-light.png diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-light@2x.png b/src/quickcontrols2/ios/images/checkbox-indicator-checked-light@2x.png Binary files differnew file mode 100644 index 0000000000..cd41b52c5d --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-checked-light@2x.png diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-checked-light@3x.png b/src/quickcontrols2/ios/images/checkbox-indicator-checked-light@3x.png Binary files differnew file mode 100644 index 0000000000..4162e351fb --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-checked-light@3x.png diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark.png b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark.png Binary files differnew file mode 100644 index 0000000000..3ed6d9ea41 --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark.png diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark@2x.png b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark@2x.png Binary files differnew file mode 100644 index 0000000000..b3547a13fd --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark@2x.png diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark@3x.png b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark@3x.png Binary files differnew file mode 100644 index 0000000000..1b33ce0f73 --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-dark@3x.png diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light.png b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light.png Binary files differnew file mode 100644 index 0000000000..eca003a936 --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light.png diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light@2x.png b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light@2x.png Binary files differnew file mode 100644 index 0000000000..7b31b89e61 --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light@2x.png diff --git a/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light@3x.png b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light@3x.png Binary files differnew file mode 100644 index 0000000000..177cd32f4d --- /dev/null +++ b/src/quickcontrols2/ios/images/checkbox-indicator-partially-checked-light@3x.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark.png b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark.png Binary files differnew file mode 100644 index 0000000000..cddef4216b --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark@2x.png b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark@2x.png Binary files differnew file mode 100644 index 0000000000..1870087617 --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark@2x.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark@3x.png b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark@3x.png Binary files differnew file mode 100644 index 0000000000..027490559f --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-dark@3x.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light.png b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light.png Binary files differnew file mode 100644 index 0000000000..2797173beb --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light@2x.png b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light@2x.png Binary files differnew file mode 100644 index 0000000000..62dc4a1684 --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light@2x.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light@3x.png b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light@3x.png Binary files differnew file mode 100644 index 0000000000..facb325db2 --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-checked-light@3x.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-dark.png b/src/quickcontrols2/ios/images/radiobutton-indicator-dark.png Binary files differnew file mode 100644 index 0000000000..b8a6b01ebf --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-dark.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-dark@2x.png b/src/quickcontrols2/ios/images/radiobutton-indicator-dark@2x.png Binary files differnew file mode 100644 index 0000000000..903c53a343 --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-dark@2x.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-dark@3x.png b/src/quickcontrols2/ios/images/radiobutton-indicator-dark@3x.png Binary files differnew file mode 100644 index 0000000000..d02e61be5a --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-dark@3x.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-light.png b/src/quickcontrols2/ios/images/radiobutton-indicator-light.png Binary files differnew file mode 100644 index 0000000000..af95b89bbf --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-light.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-light@2x.png b/src/quickcontrols2/ios/images/radiobutton-indicator-light@2x.png Binary files differnew file mode 100644 index 0000000000..16460c72c8 --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-light@2x.png diff --git a/src/quickcontrols2/ios/images/radiobutton-indicator-light@3x.png b/src/quickcontrols2/ios/images/radiobutton-indicator-light@3x.png Binary files differnew file mode 100644 index 0000000000..13a421baa4 --- /dev/null +++ b/src/quickcontrols2/ios/images/radiobutton-indicator-light@3x.png |