diff options
| author | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-02-23 09:13:21 +0200 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-03-02 12:51:24 +0000 |
| commit | c6b5855b446c73f8a60cc3d4427fc445e0ba400d (patch) | |
| tree | b57f45df2a297335392f56953410a4c3ab599a8d /src/settingsui/locale/Language.qml | |
| parent | f1d884b6dad5a93d7a3077b6b05d3ec7fcd9a6ea (diff) | |
Migrate settings UI to use Qt Quick Controls 2
Task-number: QTEE-1057
Change-Id: I389d784241d4b68384765dfde4b572e7652eb76c
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'src/settingsui/locale/Language.qml')
| -rw-r--r-- | src/settingsui/locale/Language.qml | 102 |
1 files changed, 45 insertions, 57 deletions
diff --git a/src/settingsui/locale/Language.qml b/src/settingsui/locale/Language.qml index 6e4e3ad..bdcfbef 100644 --- a/src/settingsui/locale/Language.qml +++ b/src/settingsui/locale/Language.qml @@ -33,79 +33,67 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles.Flat 1.0 as Flat -import "../common" +import QtQuick 2.6 +import QtQuick.Layouts 1.3 +import Qt.labs.controls 1.0 +import Qt.labs.controls.material 1.0 +import Qt.labs.controls.universal 1.0 import com.theqtcompany.settings.locale 1.0 +import QtQml 2.2 Item { id: root property string title: qsTr("Language and Region") - Column { - id: content - anchors.fill: parent - anchors.margins: Math.round(40 * Flat.FlatStyle.scaleFactor) + GroupBox { + id: groupBox + title: qsTr("Regional Format") + anchors.left: parent.left + anchors.top: parent.top + anchors.right: parent.right + anchors.margins: 20 + property var currentRegion: Qt.locale(LocaleManager.locale) - GroupBox { - id: groupBox + ColumnLayout { width: parent.width - title: qsTr("Regional Format") - Layout.fillWidth: true - property var currentRegion: Qt.locale(LocaleManager.locale) - ColumnLayout { - spacing: Math.round(10 * Flat.FlatStyle.scaleFactor) + Component { + id: regionSelect + RegionSelect {} + } + GroupBox { width: parent.width - Layout.fillWidth: true - - Component { - id: regionSelect - RegionSelect { } - } - - GroupBox { - width: parent.width - title: { - if (groupBox.currentRegion.name === "C" || groupBox.currentRegion.name === "POSIX") { - return qsTr("Default"); - } - else if (groupBox.currentRegion.name !== "") { - return qsTr("%L1/%L2").arg(groupBox.currentRegion.nativeLanguageName).arg(groupBox.currentRegion.nativeCountryName) - } - else { - return qsTr("Region not set"); - } + title: { + if (groupBox.currentRegion.name === "C" || groupBox.currentRegion.name === "POSIX") { + return qsTr("Default"); } - - flat: true - - ColumnLayout { - spacing: Math.round(10 * Flat.FlatStyle.scaleFactor) - Layout.fillWidth: true - width: parent.width - - TextLabel { - text: Date().toLocaleString(groupBox.currentRegion) - } - - TextLabel { - text: Number(2343.34).toLocaleString(groupBox.currentRegion) - } - - TextLabel { - text: Number(41334.34).toLocaleCurrencyString(groupBox.currentRegion) - } + else if (groupBox.currentRegion.name !== "") { + return qsTr("%L1/%L2").arg(groupBox.currentRegion.nativeLanguageName).arg(groupBox.currentRegion.nativeCountryName) + } + else { + return qsTr("Region not set"); } } + ColumnLayout { + spacing: 10 + Layout.fillWidth: true + width: parent.width - Button { - text: qsTr("Change region") - onClicked: stackView.push(regionSelect) + Label { + text: Date().toLocaleString(groupBox.currentRegion) + } + Label { + text: Number(2343.34).toLocaleString(groupBox.currentRegion) + } + Label { + text: Number(41334.34).toLocaleCurrencyString(groupBox.currentRegion) + } } } + Button { + text: qsTr("Change region") + onClicked: stackView.push(regionSelect) + } } } } |