diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2022-11-18 15:15:16 +0800 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2022-12-01 10:26:20 +0800 |
| commit | 4bd87b903b355b53e3105ba1ae7c154c4e55cdaf (patch) | |
| tree | cc2edb597f0d5871302eb86e9dda78217384a5aa /src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml | |
| parent | 786e1748d4469c135a922a221024f3f9c421c0de (diff) | |
Remove "2" from Qt Quick Controls directories
Qt Quick Controls 2 was named that way because it was a follow-up to
Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer
supported, we don't need to have "2" in the name. Work on this was
already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.
By doing this renaming a few weeks before feature freeze, it won't
affect the release but still results in as little time possible spent
manually fixing conflicts in cherry-picks from non-LTS releases as a
result of the renaming.
This patch does the following:
- Renames directories.
- Adapts CMakeLists.txt and other files to account for the new paths.
A follow-up patch will handle documentation.
It does not touch library names or other user-facing stuff, as that
will have to be done in Qt 7.
Task-number: QTBUG-95413
Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml')
| -rw-r--r-- | src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml new file mode 100644 index 0000000000..5dc7ee7873 --- /dev/null +++ b/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml @@ -0,0 +1,136 @@ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +import QtQuick +import QtQuick.Controls +import QtQuick.Dialogs +import QtQuick.Dialogs.quickimpl +import QtQuick.Layouts + +MessageDialogImpl { + id: control + + implicitWidth: Math.max(control.implicitBackgroundWidth + control.leftInset + control.rightInset, + control.implicitHeaderWidth, + rowLayout.implicitWidth) + implicitHeight: Math.max(control.implicitBackgroundHeight + control.topInset + control.bottomInset, + control.contentHeight + control.topPadding + control.bottomPadding + + (control.implicitHeaderHeight > 0 ? control.implicitHeaderHeight + control.spacing : 0) + + (control.implicitFooterHeight > 0 ? control.implicitFooterHeight + control.spacing : 0)) + leftPadding: 20 + rightPadding: 20 + + // Ensure that the background's border is visible. + leftInset: -1 + rightInset: -1 + topInset: -1 + bottomInset: -1 + + spacing: 16 + + MessageDialogImpl.buttonBox: buttonBox + MessageDialogImpl.detailedTextButton: detailedTextButton + + background: Rectangle { + implicitWidth: 320 + implicitHeight: 160 + color: control.palette.window + border.color: control.palette.dark + } + + header: Pane { + palette.window: control.palette.light + padding: 20 + + contentItem: Label { + width: parent.width + text: control.title + visible: control.title.length > 0 + horizontalAlignment: Label.AlignHCenter + elide: Label.ElideRight + font.bold: true + } + } + + contentItem: Column { + padding: 10 + spacing: 16 + + Label { + id: textLabel + objectName: "textLabel" + text: control.text + visible: text.length > 0 + wrapMode: Text.Wrap + width: parent.width - parent.leftPadding - parent.rightPadding + + } + + Label { + id: informativeTextLabel + objectName: "informativeTextLabel" + text: control.informativeText + visible: text.length > 0 + wrapMode: Text.Wrap + width: parent.width - parent.leftPadding - parent.rightPadding + } + } + + footer: ColumnLayout { + id: columnLayout + + RowLayout { + id: rowLayout + spacing: 12 + + Layout.leftMargin: 20 + Layout.rightMargin: 20 + Layout.bottomMargin: 20 + + Button { + id: detailedTextButton + objectName: "detailedTextButton" + text: control.showDetailedText ? qsTr("Hide Details...") : qsTr("Show Details...") + padding: 0 + } + + DialogButtonBox { + id: buttonBox + objectName: "buttonBox" + spacing: 12 + padding: 0 + + Layout.fillWidth: true + } + } + + TextArea { + id: detailedTextArea + objectName: "detailedText" + text: control.detailedText + visible: control.showDetailedText + wrapMode: TextEdit.WordWrap + readOnly: true + + Layout.fillWidth: true + Layout.leftMargin: 20 + Layout.rightMargin: 20 + Layout.bottomMargin: 20 + + background: Rectangle { + color: Qt.rgba(1,1,1,1) + radius: 3 + border.color: Qt.darker(control.palette.light) + border.width: 1 + } + } + } + + Overlay.modal: Rectangle { + color: Color.transparent(control.palette.shadow, 0.5) + } + + Overlay.modeless: Rectangle { + color: Color.transparent(control.palette.shadow, 0.12) + } +} |