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/RegionSelect.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/RegionSelect.qml')
| -rw-r--r-- | src/settingsui/locale/RegionSelect.qml | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/src/settingsui/locale/RegionSelect.qml b/src/settingsui/locale/RegionSelect.qml index 2d13afe..9282177 100644 --- a/src/settingsui/locale/RegionSelect.qml +++ b/src/settingsui/locale/RegionSelect.qml @@ -33,12 +33,13 @@ ** $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 "../common" Item { id: root @@ -46,46 +47,31 @@ Item { Component.onCompleted: country.text = LocaleFilter.filter - Column { + ColumnLayout { id: content anchors.fill: parent - anchors.margins: Math.round(20 * Flat.FlatStyle.scaleFactor) - spacing: Math.round(10 * Flat.FlatStyle.scaleFactor) - Row { - spacing: Math.round(10 * Flat.FlatStyle.scaleFactor) + anchors.margins: 20 + spacing: 10 + RowLayout { + spacing: 10 - TextLabel { + Label { text: qsTr("Search region: ") + Layout.alignment: Qt.AlignVCenter } - TextField { id: country text: "" onTextChanged: LocaleFilter.filter = country.text + Layout.alignment: Qt.AlignVCenter } } - - TableView { - width: parent.width - height: Math.round(parent.height - 40 * Flat.FlatStyle.scaleFactor) - Layout.fillWidth: true + CustomTableView { + headerTexts: [qsTr("Language"), qsTr("Country")] + roleNames: ["language", "country"] model: LocaleFilter - headerVisible: true - - TableViewColumn { - role: "language" - title: qsTr("Language") - width: Math.round(parent.width * 0.66) - } - - TableViewColumn { - role: "country" - title: qsTr("Region") - width: Math.round(parent.width * 0.33) - } - onClicked: { - var val = model.itemFromRow(row); + var val = model.itemFromRow(index); if (val !== "") { LocaleManager.locale = val; stackView.pop(); |