summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Eftevaag <oliver.eftevaag@qt.io>2021-02-10 12:52:50 +0100
committerOliver Eftevaag <oliver.eftevaag@qt.io>2021-02-16 12:32:52 +0100
commit860928d5c85f015bacde952037cae14d8dee24a5 (patch)
tree91558bc964fba149f06d77fbda42b246fedae222
parent6d51f997df14f2b22c265c5b2fda679ece9edef3 (diff)
Update localstore example to use QtQuickControls2
Removing MyButton.qml and replacing it with QtQuickControls2. Task-number: QTBUG-90884 Change-Id: Ie1b22e817dedfd71593b074561bdfe2e7dc36008 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
-rw-r--r--examples/quick/localstorage/localstorage/CMakeLists.txt1
-rw-r--r--examples/quick/localstorage/localstorage/Database.js2
-rw-r--r--examples/quick/localstorage/localstorage/Header.qml22
-rw-r--r--examples/quick/localstorage/localstorage/MyButton.qml99
-rw-r--r--examples/quick/localstorage/localstorage/MyDelegate.qml15
-rw-r--r--examples/quick/localstorage/localstorage/MyModel.qml6
-rw-r--r--examples/quick/localstorage/localstorage/localstorage.qml24
-rw-r--r--examples/quick/localstorage/localstorage/localstorage.qrc1
8 files changed, 35 insertions, 135 deletions
diff --git a/examples/quick/localstorage/localstorage/CMakeLists.txt b/examples/quick/localstorage/localstorage/CMakeLists.txt
index db32a5e2eb..2ed02985ca 100644
--- a/examples/quick/localstorage/localstorage/CMakeLists.txt
+++ b/examples/quick/localstorage/localstorage/CMakeLists.txt
@@ -39,7 +39,6 @@ target_link_libraries(localstorage PUBLIC
set(localstorage_resource_files
"Database.js"
"Header.qml"
- "MyButton.qml"
"MyDelegate.qml"
"MyModel.qml"
"localstorage.qml"
diff --git a/examples/quick/localstorage/localstorage/Database.js b/examples/quick/localstorage/localstorage/Database.js
index 80cd0a2b34..6ad684a2bb 100644
--- a/examples/quick/localstorage/localstorage/Database.js
+++ b/examples/quick/localstorage/localstorage/Database.js
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
diff --git a/examples/quick/localstorage/localstorage/Header.qml b/examples/quick/localstorage/localstorage/Header.qml
index 47879500a7..d1dedaec3f 100644
--- a/examples/quick/localstorage/localstorage/Header.qml
+++ b/examples/quick/localstorage/localstorage/Header.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -48,11 +48,11 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.14
-import QtQuick.Window 2.0
-import QtQuick.LocalStorage 2.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.LocalStorage
import "Database.js" as JS
-import QtQuick.Layouts 1.1
Item {
id: root
@@ -124,24 +124,24 @@ Item {
flow: GridLayout.TopToBottom
anchors.fill: parent
- Text {
+ Label {
text: "Date"
font.pixelSize: 22
rightPadding: 10
}
- Text {
+ Label {
text: "Description"
font.pixelSize: 22
rightPadding: 10
}
- Text {
+ Label {
text: "Distance"
font.pixelSize: 22
}
- TextInput {
+ TextField {
id: dateInput
font.pixelSize: 22
activeFocusOnPress: true
@@ -157,7 +157,7 @@ Item {
}
}
- TextInput {
+ TextField {
id: descInput
font.pixelSize: 22
activeFocusOnPress: true
@@ -172,7 +172,7 @@ Item {
}
}
- TextInput {
+ TextField {
id: distInput
font.pixelSize: 22
activeFocusOnPress: true
diff --git a/examples/quick/localstorage/localstorage/MyButton.qml b/examples/quick/localstorage/localstorage/MyButton.qml
deleted file mode 100644
index c83ea63a85..0000000000
--- a/examples/quick/localstorage/localstorage/MyButton.qml
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** 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.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of The Qt Company Ltd nor the names of its
-** contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
- id: button
-
- property bool checked: false
- property alias text: buttonText.text
-
- Accessible.name: text
- Accessible.description: "This button does " + text
- Accessible.role: Accessible.Button
- Accessible.onPressAction: button.clicked()
-
- signal clicked
-
- implicitWidth: buttonText.implicitWidth + 20
- implicitHeight: 30
- gradient: Gradient {
- GradientStop {
- position: 0.0
- color: "grey"
- }
- GradientStop {
- position: 1.0
- color: button.focus ? "red" : "grey"
- }
- }
-
- radius: 5
- antialiasing: true
-
- Text {
- id: buttonText
- text: parent.description
- anchors.centerIn: parent
- font.pixelSize: parent.height * .5
- style: enabled ? Text.Sunken : Text.Normal
- color: enabled ? "white" : "#555"
- styleColor: "black"
- }
-
- MouseArea {
- id: mouseArea
- anchors.fill: parent
- onClicked: parent.clicked()
- }
-
- Keys.onSpacePressed: clicked()
-}
diff --git a/examples/quick/localstorage/localstorage/MyDelegate.qml b/examples/quick/localstorage/localstorage/MyDelegate.qml
index e8575d4f7a..6fbb9544be 100644
--- a/examples/quick/localstorage/localstorage/MyDelegate.qml
+++ b/examples/quick/localstorage/localstorage/MyDelegate.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -48,9 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
-import QtQuick.Layouts 1.1
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.LocalStorage
import "Database.js" as JS
Item {
@@ -80,21 +81,21 @@ Item {
anchors.fill:parent
columns: 3
- Text {
+ Label {
id: rDate
text: delegate.date
font.pixelSize: 22
Layout.preferredWidth: parent.width / 4
color: "black"
}
- Text {
+ Label {
id: rDesc
text: delegate.trip_desc
Layout.fillWidth: true
font.pixelSize: 22
color: "black"
}
- Text {
+ Label {
id: rDistance
text: delegate.distance
font.pixelSize: 22
diff --git a/examples/quick/localstorage/localstorage/MyModel.qml b/examples/quick/localstorage/localstorage/MyModel.qml
index 7ccb97e266..8665778a8c 100644
--- a/examples/quick/localstorage/localstorage/MyModel.qml
+++ b/examples/quick/localstorage/localstorage/MyModel.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
+import QtQuick
+import QtQuick.LocalStorage
import "Database.js" as JS
ListModel {
diff --git a/examples/quick/localstorage/localstorage/localstorage.qml b/examples/quick/localstorage/localstorage/localstorage.qml
index 418aab838e..5915b67367 100644
--- a/examples/quick/localstorage/localstorage/localstorage.qml
+++ b/examples/quick/localstorage/localstorage/localstorage.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.5
-import QtQuick.Window 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.LocalStorage 2.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.LocalStorage
import "Database.js" as JS
Window {
@@ -77,7 +77,7 @@ Window {
statusText: statustext
}
RowLayout {
- MyButton {
+ Button {
text: "New"
onClicked: {
input.initrec_new()
@@ -85,7 +85,7 @@ Window {
listView.model.setProperty(listView.currentIndex, "id", 0)
}
}
- MyButton {
+ Button {
id: saveButton
enabled: (window.creatingNewEntry || window.editingEntry) && listView.currentIndex != -1
text: "Save"
@@ -118,7 +118,7 @@ Window {
}
}
}
- MyButton {
+ Button {
id: editButton
text: "Edit"
enabled: !window.creatingNewEntry && !window.editingEntry && listView.currentIndex != -1
@@ -131,7 +131,7 @@ Window {
window.editingEntry = true
}
}
- MyButton {
+ Button {
id: deleteButton
text: "Delete"
enabled: !window.creatingNewEntry && listView.currentIndex != -1
@@ -145,7 +145,7 @@ Window {
}
}
}
- MyButton {
+ Button {
id: cancelButton
text: "Cancel"
enabled: (window.creatingNewEntry || window.editingEntry) && listView.currentIndex != -1
@@ -161,7 +161,7 @@ Window {
input.initrec()
}
}
- MyButton {
+ Button {
text: "Exit"
onClicked: Qt.quit()
}
@@ -195,7 +195,7 @@ Window {
}
}
}
- Text {
+ Label {
id: statustext
color: "red"
Layout.fillWidth: true
diff --git a/examples/quick/localstorage/localstorage/localstorage.qrc b/examples/quick/localstorage/localstorage/localstorage.qrc
index 079438be2b..a761306f3d 100644
--- a/examples/quick/localstorage/localstorage/localstorage.qrc
+++ b/examples/quick/localstorage/localstorage/localstorage.qrc
@@ -3,7 +3,6 @@
<file>Header.qml</file>
<file>Database.js</file>
<file>MyModel.qml</file>
- <file>MyButton.qml</file>
<file>MyDelegate.qml</file>
<file>localstorage.qml</file>
</qresource>