summaryrefslogtreecommitdiffstats
path: root/examples/webengine/customdialogs/forms
diff options
context:
space:
mode:
Diffstat (limited to 'examples/webengine/customdialogs/forms')
-rw-r--r--examples/webengine/customdialogs/forms/Authentication.qml4
-rw-r--r--examples/webengine/customdialogs/forms/AuthenticationForm.ui.qml19
-rw-r--r--examples/webengine/customdialogs/forms/ColorCell.qml4
-rw-r--r--examples/webengine/customdialogs/forms/ColorPicker.qml2
-rw-r--r--examples/webengine/customdialogs/forms/ColorPickerForm.ui.qml13
-rw-r--r--examples/webengine/customdialogs/forms/CustomButton.qml (renamed from examples/webengine/customdialogs/forms/Button.qml)2
-rw-r--r--examples/webengine/customdialogs/forms/FilePicker.qml2
-rw-r--r--examples/webengine/customdialogs/forms/FilePickerForm.ui.qml13
-rw-r--r--examples/webengine/customdialogs/forms/FileRow.qml5
-rw-r--r--examples/webengine/customdialogs/forms/JavaScript.qml4
-rw-r--r--examples/webengine/customdialogs/forms/JavaScriptForm.ui.qml17
-rw-r--r--examples/webengine/customdialogs/forms/Menu.qml2
-rw-r--r--examples/webengine/customdialogs/forms/MenuForm.ui.qml19
13 files changed, 46 insertions, 60 deletions
diff --git a/examples/webengine/customdialogs/forms/Authentication.qml b/examples/webengine/customdialogs/forms/Authentication.qml
index e8995eebc..6365db9c3 100644
--- a/examples/webengine/customdialogs/forms/Authentication.qml
+++ b/examples/webengine/customdialogs/forms/Authentication.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.4
-import QtWebEngine 1.4
+import QtQuick
+import QtWebEngine
AuthenticationForm {
property QtObject request
diff --git a/examples/webengine/customdialogs/forms/AuthenticationForm.ui.qml b/examples/webengine/customdialogs/forms/AuthenticationForm.ui.qml
index 8b8523388..ab334aae0 100644
--- a/examples/webengine/customdialogs/forms/AuthenticationForm.ui.qml
+++ b/examples/webengine/customdialogs/forms/AuthenticationForm.ui.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.4
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 1.0 as Controls
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
Item {
id: item1
@@ -79,10 +79,7 @@ Item {
Rectangle {
id: rectangle
height: 30
- anchors.rightMargin: 0
- anchors.leftMargin: 0
- anchors.right: parent.right
- anchors.left: parent.left
+ Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
gradient: Gradient {
GradientStop {
position: 0
@@ -116,7 +113,7 @@ Item {
font.pointSize: 12
}
- Controls.TextField {
+ TextField {
id: userName
width: 300
height: 22
@@ -130,7 +127,7 @@ Item {
font.pointSize: 12
}
- Controls.TextField {
+ TextField {
id: password
width: 300
height: 26
@@ -151,7 +148,7 @@ Item {
Layout.fillWidth: true
}
- Button {
+ CustomButton {
id: cancelButton
width: 90
height: 30
@@ -159,7 +156,7 @@ Item {
btnBlue: false
}
- Button {
+ CustomButton {
id: loginButton
width: 90
height: 30
diff --git a/examples/webengine/customdialogs/forms/ColorCell.qml b/examples/webengine/customdialogs/forms/ColorCell.qml
index 0da029357..495a2900c 100644
--- a/examples/webengine/customdialogs/forms/ColorCell.qml
+++ b/examples/webengine/customdialogs/forms/ColorCell.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick
Rectangle {
id: rectangle
@@ -58,6 +58,6 @@ Rectangle {
MouseArea {
id: mouseArea
anchors.fill: parent
- onClicked: rectangle.clicked(color)
+ onClicked: rectangle.clicked()
}
}
diff --git a/examples/webengine/customdialogs/forms/ColorPicker.qml b/examples/webengine/customdialogs/forms/ColorPicker.qml
index 6684db2c6..7c1545c43 100644
--- a/examples/webengine/customdialogs/forms/ColorPicker.qml
+++ b/examples/webengine/customdialogs/forms/ColorPicker.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick
ColorPickerForm {
property QtObject request
diff --git a/examples/webengine/customdialogs/forms/ColorPickerForm.ui.qml b/examples/webengine/customdialogs/forms/ColorPickerForm.ui.qml
index 611244867..c2de234e7 100644
--- a/examples/webengine/customdialogs/forms/ColorPickerForm.ui.qml
+++ b/examples/webengine/customdialogs/forms/ColorPickerForm.ui.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.4
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Layouts
Item {
property alias cancelButton: cancelButton
@@ -78,10 +78,7 @@ Item {
Rectangle {
height: 30
- anchors.rightMargin: 0
- anchors.leftMargin: 0
- anchors.right: parent.right
- anchors.left: parent.left
+ Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
gradient: Gradient {
GradientStop {
position: 0
@@ -215,7 +212,7 @@ Item {
Layout.fillWidth: true
}
- Button {
+ CustomButton {
id: cancelButton
width: 90
height: 30
@@ -223,7 +220,7 @@ Item {
btnBlue: false
}
- Button {
+ CustomButton {
id: okButton
width: 90
height: 30
diff --git a/examples/webengine/customdialogs/forms/Button.qml b/examples/webengine/customdialogs/forms/CustomButton.qml
index 474f514d2..3ab90a752 100644
--- a/examples/webengine/customdialogs/forms/Button.qml
+++ b/examples/webengine/customdialogs/forms/CustomButton.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick
Rectangle {
id: root
diff --git a/examples/webengine/customdialogs/forms/FilePicker.qml b/examples/webengine/customdialogs/forms/FilePicker.qml
index 77a9c604c..97acda326 100644
--- a/examples/webengine/customdialogs/forms/FilePicker.qml
+++ b/examples/webengine/customdialogs/forms/FilePicker.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick
FilePickerForm {
property QtObject request
diff --git a/examples/webengine/customdialogs/forms/FilePickerForm.ui.qml b/examples/webengine/customdialogs/forms/FilePickerForm.ui.qml
index 9c69204b4..8a230c982 100644
--- a/examples/webengine/customdialogs/forms/FilePickerForm.ui.qml
+++ b/examples/webengine/customdialogs/forms/FilePickerForm.ui.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.4
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Layouts
Item {
property alias cancelButton: cancelButton
@@ -78,10 +78,7 @@ Item {
Rectangle {
id: rectangle
height: 30
- anchors.rightMargin: 0
- anchors.leftMargin: 0
- anchors.right: parent.right
- anchors.left: parent.left
+ Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
gradient: Gradient {
GradientStop {
position: 0
@@ -157,7 +154,7 @@ Item {
Layout.fillWidth: true
}
- Button {
+ CustomButton {
id: cancelButton
width: 90
height: 30
@@ -165,7 +162,7 @@ Item {
btnBlue: false
}
- Button {
+ CustomButton {
id: okButton
width: 90
height: 30
diff --git a/examples/webengine/customdialogs/forms/FileRow.qml b/examples/webengine/customdialogs/forms/FileRow.qml
index 6946c633d..0356dceae 100644
--- a/examples/webengine/customdialogs/forms/FileRow.qml
+++ b/examples/webengine/customdialogs/forms/FileRow.qml
@@ -48,9 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.4
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 1.0 as Controls
+import QtQuick
+import QtQuick.Layouts
Item {
id: root
diff --git a/examples/webengine/customdialogs/forms/JavaScript.qml b/examples/webengine/customdialogs/forms/JavaScript.qml
index 08d0227dc..61e009e54 100644
--- a/examples/webengine/customdialogs/forms/JavaScript.qml
+++ b/examples/webengine/customdialogs/forms/JavaScript.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.4
-import QtWebEngine 1.4
+import QtQuick
+import QtWebEngine
JavaScriptForm {
property QtObject request
diff --git a/examples/webengine/customdialogs/forms/JavaScriptForm.ui.qml b/examples/webengine/customdialogs/forms/JavaScriptForm.ui.qml
index 1c7fd29ed..14d9dc304 100644
--- a/examples/webengine/customdialogs/forms/JavaScriptForm.ui.qml
+++ b/examples/webengine/customdialogs/forms/JavaScriptForm.ui.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.4
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 1.0 as Controls
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
Item {
id: item
@@ -80,10 +80,7 @@ Item {
Rectangle {
id: rectangle
height: 30
- anchors.rightMargin: 0
- anchors.leftMargin: 0
- anchors.right: parent.right
- anchors.left: parent.left
+ Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
gradient: Gradient {
GradientStop {
position: 0
@@ -118,7 +115,7 @@ Item {
font.pointSize: 12
}
- Controls.TextField {
+ TextField {
id: prompt
width: 300
height: 22
@@ -139,7 +136,7 @@ Item {
Layout.fillWidth: true
}
- Button {
+ CustomButton {
id: cancelButton
width: 90
height: 30
@@ -147,7 +144,7 @@ Item {
btnBlue: false
}
- Button {
+ CustomButton {
id: okButton
width: 90
height: 30
diff --git a/examples/webengine/customdialogs/forms/Menu.qml b/examples/webengine/customdialogs/forms/Menu.qml
index f1b692e07..4f7f9f9e6 100644
--- a/examples/webengine/customdialogs/forms/Menu.qml
+++ b/examples/webengine/customdialogs/forms/Menu.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick
MenuForm {
property QtObject request
diff --git a/examples/webengine/customdialogs/forms/MenuForm.ui.qml b/examples/webengine/customdialogs/forms/MenuForm.ui.qml
index 6126f0623..cba7a1b3f 100644
--- a/examples/webengine/customdialogs/forms/MenuForm.ui.qml
+++ b/examples/webengine/customdialogs/forms/MenuForm.ui.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.4
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Layouts
Item {
property alias followLink: followLink
@@ -73,41 +73,40 @@ Item {
source: "qrc:/icon.svg"
}
- Button {
+ CustomButton {
id: followLink
btnText: qsTr("Follow")
}
- Button {
+ CustomButton {
id: back
btnText: qsTr("Back")
}
- Button {
+ CustomButton {
id: forward
btnText: qsTr("Forward")
}
- Button {
+ CustomButton {
id: reload
btnText: qsTr("Reload")
}
- Button {
+ CustomButton {
id: copyLinkUrl
btnText: qsTr("Copy Link URL")
}
- Button {
+ CustomButton {
id: saveLink
btnText: qsTr("Save Link")
}
- Button {
+ CustomButton {
id: close
btnBlue: false
btnText: qsTr("Close")
}
-
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 17:24:45 +0000