diff options
Diffstat (limited to 'tests/manual/quickdialogs/dialogs')
9 files changed, 96 insertions, 10 deletions
diff --git a/tests/manual/quickdialogs/dialogs/ColorDialogPage.qml b/tests/manual/quickdialogs/dialogs/ColorDialogPage.qml index 678f978146..ff17bd73a0 100644 --- a/tests/manual/quickdialogs/dialogs/ColorDialogPage.qml +++ b/tests/manual/quickdialogs/dialogs/ColorDialogPage.qml @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick.Controls @@ -20,6 +20,7 @@ ColumnLayout { title: qsTr("Dialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -41,17 +42,20 @@ ColumnLayout { RadioButton { text: qsTr("Qt.NonModal") + Layout.fillWidth: false readonly property int modality: Qt.NonModal } RadioButton { text: qsTr("Qt.WindowModal") checked: true + Layout.fillWidth: false readonly property int modality: Qt.WindowModal } RadioButton { text: qsTr("Qt.ApplicationModal") + Layout.fillWidth: false readonly property int modality: Qt.ApplicationModal } @@ -65,6 +69,7 @@ ColumnLayout { text: colorDialog.result === 1 ? qsTr("Accepted") : qsTr("Rejected") readOnly: true enabled: false + Layout.fillWidth: false } Label { @@ -73,6 +78,7 @@ ColumnLayout { TextField { id: titleTextField text: qsTr("A Color Dialog") + Layout.fillWidth: false } } } @@ -81,6 +87,7 @@ ColumnLayout { title: qsTr("ColorDialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -122,15 +129,25 @@ ColumnLayout { CheckBox { id: showAlphaChannel text: qsTr("ShowAlphaChannel") + Layout.fillWidth: false readonly property int colorOption: checked ? ColorDialog.ShowAlphaChannel : 0 } CheckBox { id: noButtons text: qsTr("NoButtons") + Layout.fillWidth: false readonly property int colorOption: checked ? ColorDialog.NoButtons : 0 } + + CheckBox { + id: noEyeDropperButton + text: qsTr("NoEyeDropperButton") + Layout.fillWidth: false + + readonly property int colorOption: checked ? ColorDialog.NoEyeDropperButton : 0 + } } } } @@ -139,7 +156,7 @@ ColumnLayout { id: colorDialog modality: modalityButtonGroup.checkedButton.modality title: titleTextField.text - options: showAlphaChannel.colorOption | noButtons.colorOption + options: showAlphaChannel.colorOption | noButtons.colorOption | noEyeDropperButton.colorOption } } } diff --git a/tests/manual/quickdialogs/dialogs/FileDialogPage.qml b/tests/manual/quickdialogs/dialogs/FileDialogPage.qml index a7fb46b232..c4f8ddc01c 100644 --- a/tests/manual/quickdialogs/dialogs/FileDialogPage.qml +++ b/tests/manual/quickdialogs/dialogs/FileDialogPage.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick.Controls @@ -22,6 +22,7 @@ ColumnLayout { title: qsTr("Dialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -43,17 +44,20 @@ ColumnLayout { RadioButton { text: qsTr("Qt.NonModal") + Layout.fillWidth: false readonly property int modality: Qt.NonModal } RadioButton { text: qsTr("Qt.WindowModal") checked: true + Layout.fillWidth: false readonly property int modality: Qt.WindowModal } RadioButton { text: qsTr("Qt.ApplicationModal") + Layout.fillWidth: false readonly property int modality: Qt.ApplicationModal } @@ -67,6 +71,7 @@ ColumnLayout { text: fileDialog.result === 1 ? qsTr("Accepted") : qsTr("Rejected") readOnly: true enabled: false + Layout.fillWidth: false } Label { @@ -75,6 +80,7 @@ ColumnLayout { TextField { id: titleTextField text: qsTr("Choose a file") + Layout.fillWidth: false } } } @@ -83,6 +89,7 @@ ColumnLayout { title: qsTr("FileDialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -97,6 +104,7 @@ ColumnLayout { TextField { id: acceptLabelTextField text: qsTr("OK") + Layout.fillWidth: false } Label { @@ -145,24 +153,28 @@ ColumnLayout { CheckBox { id: dontResolveSymlinksCheckBox text: qsTr("DontResolveSymlinks") + Layout.fillWidth: false readonly property int fileOption: checked ? FileDialog.DontResolveSymlinks : 0 } CheckBox { id: dontConfirmOverwriteCheckBox text: qsTr("DontConfirmOverwrite") + Layout.fillWidth: false readonly property int fileOption: checked ? FileDialog.DontConfirmOverwrite : 0 } CheckBox { id: readOnlyCheckBox text: qsTr("ReadOnly") + Layout.fillWidth: false readonly property int fileOption: checked ? FileDialog.ReadOnly : 0 } CheckBox { id: hideNameFilterDetailsCheckBox text: qsTr("HideNameFilterDetails") + Layout.fillWidth: false readonly property int fileOption: checked ? FileDialog.HideNameFilterDetails : 0 } @@ -182,17 +194,20 @@ ColumnLayout { RadioButton { text: qsTr("OpenFile") + Layout.fillWidth: false readonly property int fileMode: FileDialog.OpenFile } RadioButton { text: qsTr("OpenFiles") checked: true + Layout.fillWidth: false readonly property int fileMode: FileDialog.OpenFiles } RadioButton { text: qsTr("SaveFile") + Layout.fillWidth: false readonly property int fileMode: FileDialog.SaveFile } @@ -218,6 +233,7 @@ ColumnLayout { TextField { id: rejectLabelTextField text: qsTr("Cancel") + Layout.fillWidth: false } Label { diff --git a/tests/manual/quickdialogs/dialogs/FolderDialogPage.qml b/tests/manual/quickdialogs/dialogs/FolderDialogPage.qml index 765b886cff..67db8b8dbc 100644 --- a/tests/manual/quickdialogs/dialogs/FolderDialogPage.qml +++ b/tests/manual/quickdialogs/dialogs/FolderDialogPage.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick.Controls @@ -22,6 +22,7 @@ ColumnLayout { title: qsTr("Dialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -43,17 +44,20 @@ ColumnLayout { RadioButton { text: qsTr("Qt.NonModal") + Layout.fillWidth: false readonly property int modality: Qt.NonModal } RadioButton { text: qsTr("Qt.WindowModal") checked: true + Layout.fillWidth: false readonly property int modality: Qt.WindowModal } RadioButton { text: qsTr("Qt.ApplicationModal") + Layout.fillWidth: false readonly property int modality: Qt.ApplicationModal } @@ -67,6 +71,7 @@ ColumnLayout { text: folderDialog.result === 1 ? qsTr("Accepted") : qsTr("Rejected") readOnly: true enabled: false + Layout.fillWidth: false } Label { @@ -75,6 +80,7 @@ ColumnLayout { TextField { id: titleTextField text: qsTr("Choose a folder") + Layout.fillWidth: false } } } @@ -83,6 +89,7 @@ ColumnLayout { title: qsTr("FolderDialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -97,6 +104,7 @@ ColumnLayout { TextField { id: acceptLabelTextField text: qsTr("OK") + Layout.fillWidth: false } Label { @@ -105,6 +113,7 @@ ColumnLayout { TextField { id: rejectLabelTextField text: qsTr("Cancel") + Layout.fillWidth: false } Label { @@ -130,12 +139,14 @@ ColumnLayout { CheckBox { id: dontResolveSymlinksCheckBox text: qsTr("DontResolveSymlinks") + Layout.fillWidth: false readonly property int folderOption: checked ? FolderDialog.DontResolveSymlinks : 0 } CheckBox { id: readOnlyCheckBox text: qsTr("ReadOnly") + Layout.fillWidth: false readonly property int folderOption: checked ? FolderDialog.ReadOnly : 0 } diff --git a/tests/manual/quickdialogs/dialogs/FontDialogPage.qml b/tests/manual/quickdialogs/dialogs/FontDialogPage.qml index 285d5f764d..f80ed09d72 100644 --- a/tests/manual/quickdialogs/dialogs/FontDialogPage.qml +++ b/tests/manual/quickdialogs/dialogs/FontDialogPage.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick.Controls @@ -22,6 +22,7 @@ ColumnLayout { title: qsTr("Dialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -43,17 +44,20 @@ ColumnLayout { RadioButton { text: qsTr("Qt.NonModal") + Layout.fillWidth: false readonly property int modality: Qt.NonModal } RadioButton { text: qsTr("Qt.WindowModal") checked: true + Layout.fillWidth: false readonly property int modality: Qt.WindowModal } RadioButton { text: qsTr("Qt.ApplicationModal") + Layout.fillWidth: false readonly property int modality: Qt.ApplicationModal } @@ -67,6 +71,7 @@ ColumnLayout { text: fontDialog.result === 1 ? qsTr("Accepted") : qsTr("Rejected") readOnly: true enabled: false + Layout.fillWidth: false } Label { @@ -75,6 +80,7 @@ ColumnLayout { TextField { id: titleTextField text: qsTr("Pick a font") + Layout.fillWidth: false } } } @@ -83,6 +89,7 @@ ColumnLayout { title: qsTr("FontDialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -127,30 +134,35 @@ ColumnLayout { CheckBox { id: noButtons text: qsTr("NoButtons") + Layout.fillWidth: false readonly property int fontOption: checked ? FontDialog.NoButtons : 0 } CheckBox { id: scalableFonts text: qsTr("ScalableFonts") + Layout.fillWidth: false readonly property int fontOption: checked ? FontDialog.ScalableFonts : 0 } CheckBox { id: nonScalableFonts text: qsTr("NonScalableFonts") + Layout.fillWidth: false readonly property int fontOption: checked ? FontDialog.NonScalableFonts : 0 } CheckBox { id: monospacedFonts text: qsTr("MonospacedFonts") + Layout.fillWidth: false readonly property int fontOption: checked ? FontDialog.MonospacedFonts : 0 } CheckBox { id: proportionalFonts text: qsTr("ProportionalFonts") + Layout.fillWidth: false readonly property int fontOption: checked ? FontDialog.ProportionalFonts : 0 } diff --git a/tests/manual/quickdialogs/dialogs/MessageDialogPage.qml b/tests/manual/quickdialogs/dialogs/MessageDialogPage.qml index 1fa2deef18..8ed211183b 100644 --- a/tests/manual/quickdialogs/dialogs/MessageDialogPage.qml +++ b/tests/manual/quickdialogs/dialogs/MessageDialogPage.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick.Controls @@ -20,6 +20,7 @@ ColumnLayout { title: qsTr("Dialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -41,17 +42,20 @@ ColumnLayout { RadioButton { text: qsTr("Qt.NonModal") + Layout.fillWidth: false readonly property int modality: Qt.NonModal } RadioButton { text: qsTr("Qt.WindowModal") checked: true + Layout.fillWidth: false readonly property int modality: Qt.WindowModal } RadioButton { text: qsTr("Qt.ApplicationModal") + Layout.fillWidth: false readonly property int modality: Qt.ApplicationModal } @@ -65,6 +69,7 @@ ColumnLayout { text: messageBox.result === 1 ? qsTr("Accepted") : qsTr("Rejected") readOnly: true enabled: false + Layout.fillWidth: false } Label { @@ -73,6 +78,7 @@ ColumnLayout { TextField { id: titleTextField text: qsTr("Hello World") + Layout.fillWidth: false } } } @@ -81,6 +87,7 @@ ColumnLayout { title: qsTr("MessageBox properties") Layout.fillWidth: true + Layout.fillHeight: false ColumnLayout { RowLayout { @@ -90,6 +97,7 @@ ColumnLayout { TextField { id: textProperty text: qsTr("default text") + Layout.fillWidth: false } } RowLayout { @@ -99,6 +107,7 @@ ColumnLayout { TextField { id: informativeTextProperty text: qsTr("default informative text") + Layout.fillWidth: false } } @@ -116,6 +125,8 @@ ColumnLayout { border.width: 1 } Layout.maximumWidth: ApplicationWindow.window.width * 0.5 + Layout.fillWidth: false + Layout.fillHeight: false wrapMode: TextEdit.WordWrap text: qsTr("This text will be displayed in the 'detailed text' textArea, which the user must press a button to see.\n" + "If this is an empty string, the button will not be visible.") @@ -125,102 +136,119 @@ ColumnLayout { CheckBox { id: okCheckbox text: qsTr("Ok") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Ok : MessageDialog.NoButton } CheckBox { id: saveCheckbox text: qsTr("Save") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Save : MessageDialog.NoButton } CheckBox { id: saveAllCheckbox text: qsTr("Save All") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.SaveAll : MessageDialog.NoButton } CheckBox { id: openCheckbox text: qsTr("Open") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Open : MessageDialog.NoButton } CheckBox { id: yesCheckbox text: qsTr("Yes") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Yes : MessageDialog.NoButton } CheckBox { id: yesToAllCheckbox text: qsTr("Yes to all") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.YesToAll : MessageDialog.NoButton } CheckBox { id: noCheckbox text: qsTr("No") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.No : MessageDialog.NoButton } CheckBox { id: noToAllCheckbox text: qsTr("No to all") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.NoToAll : MessageDialog.NoButton } CheckBox { id: abortCheckbox text: qsTr("Abort") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Abort : MessageDialog.NoButton } CheckBox { id: retryCheckbox text: qsTr("Retry") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Retry : MessageDialog.NoButton } CheckBox { id: ignoreCheckbox text: qsTr("Ignore") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Ignore : MessageDialog.NoButton } CheckBox { id: closeCheckbox text: qsTr("Close") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Close : MessageDialog.NoButton } CheckBox { id: cancelCheckbox text: qsTr("Cancel") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Cancel : MessageDialog.NoButton } CheckBox { id: discardCheckbox text: qsTr("Discard") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Discard : MessageDialog.NoButton } CheckBox { id: helpCheckbox text: qsTr("Help") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Help : MessageDialog.NoButton } CheckBox { id: applyCheckbox text: qsTr("Apply") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Apply : MessageDialog.NoButton } CheckBox { id: resetCheckbox text: qsTr("Reset") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Reset : MessageDialog.NoButton } diff --git a/tests/manual/quickdialogs/dialogs/StringListView.qml b/tests/manual/quickdialogs/dialogs/StringListView.qml index a93b925142..72dfbe5d4f 100644 --- a/tests/manual/quickdialogs/dialogs/StringListView.qml +++ b/tests/manual/quickdialogs/dialogs/StringListView.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick.Controls diff --git a/tests/manual/quickdialogs/dialogs/Theme.qml b/tests/manual/quickdialogs/dialogs/Theme.qml index 4b7f49fe27..29c2262a47 100644 --- a/tests/manual/quickdialogs/dialogs/Theme.qml +++ b/tests/manual/quickdialogs/dialogs/Theme.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only pragma Singleton diff --git a/tests/manual/quickdialogs/dialogs/dialogs.cpp b/tests/manual/quickdialogs/dialogs/dialogs.cpp index 25763c4279..2e17c3994c 100644 --- a/tests/manual/quickdialogs/dialogs/dialogs.cpp +++ b/tests/manual/quickdialogs/dialogs/dialogs.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/qsettings.h> #include <QtGui/qguiapplication.h> diff --git a/tests/manual/quickdialogs/dialogs/dialogs.qml b/tests/manual/quickdialogs/dialogs/dialogs.qml index cd0c2e7e7f..0356755b6a 100644 --- a/tests/manual/quickdialogs/dialogs/dialogs.qml +++ b/tests/manual/quickdialogs/dialogs/dialogs.qml @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtCore import QtQuick @@ -80,6 +80,7 @@ ApplicationWindow { id: useNativeDialogsCheckBox text: qsTr("Use Native Dialogs (requires restart)") checked: settings.useNativeDialogs + Layout.fillWidth: false } Item { @@ -88,6 +89,7 @@ ApplicationWindow { Button { text: qsTr("Open") + Layout.fillWidth: false onClicked: stackLayout.children[stackLayout.currentIndex].dialog.open() } |