From 47f8ec557fed18286a8280b069e18d8b421a9e7b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 23 Mar 2018 14:36:18 +0100 Subject: Add a few missing properties to property editor Change-Id: I25bfc453bdfdc007ec10a69de92f3f339617c2d7 Reviewed-by: J-P Nurmi Reviewed-by: Mitch Curtis --- .../controls/designer/AbstractButtonSection.qml | 13 +++++++++ src/imports/controls/designer/ButtonSection.qml | 22 +++++++++++++++ .../controls/designer/ComboBoxSpecifics.qml | 32 ++++++++++++++++++++++ 3 files changed, 67 insertions(+) (limited to 'src') diff --git a/src/imports/controls/designer/AbstractButtonSection.qml b/src/imports/controls/designer/AbstractButtonSection.qml index 3d3dad5d..3cc50925 100644 --- a/src/imports/controls/designer/AbstractButtonSection.qml +++ b/src/imports/controls/designer/AbstractButtonSection.qml @@ -53,6 +53,19 @@ Section { } } + Label { + text: qsTr("Display") + tooltip: qsTr("Determines how the icon and text are displayed within the button.") + } + SecondColumnLayout { + ComboBox { + backendValue: backendValues.display + model: [ "IconOnly", "TextOnly", "TextBesideIcon" ] + scope: "AbstractButton" + Layout.fillWidth: true + } + } + Label { visible: checkable text: qsTr("Checkable") diff --git a/src/imports/controls/designer/ButtonSection.qml b/src/imports/controls/designer/ButtonSection.qml index 15e23df9..038abab7 100644 --- a/src/imports/controls/designer/ButtonSection.qml +++ b/src/imports/controls/designer/ButtonSection.qml @@ -43,6 +43,28 @@ Section { caption: qsTr("Button") SectionLayout { + Label { + text: qsTr("AutoRepeat") + tooltip: qsTr("Whether the button repeats pressed(), released() and clicked() signals while the button is pressed and held down.") + } + SecondColumnLayout { + CheckBox { + text: backendValues.autoRepeat.valueToString + backendValue: backendValues.autoRepeat + Layout.fillWidth: true + } + } + Label { + text: qsTr("Flat") + tooltip: qsTr("Whether the button is flat.") + } + SecondColumnLayout { + CheckBox { + text: backendValues.flat.valueToString + backendValue: backendValues.flat + Layout.fillWidth: true + } + } Label { text: qsTr("Highlighted") tooltip: qsTr("Whether the button is highlighted.") diff --git a/src/imports/controls/designer/ComboBoxSpecifics.qml b/src/imports/controls/designer/ComboBoxSpecifics.qml index 3ed283ca..c5fc6781 100644 --- a/src/imports/controls/designer/ComboBoxSpecifics.qml +++ b/src/imports/controls/designer/ComboBoxSpecifics.qml @@ -70,6 +70,38 @@ Column { Layout.fillWidth: true } } + Label { + text: qsTr("Editable") + tooltip: qsTr("Whether the combo box is editable.") + } + SecondColumnLayout { + CheckBox { + text: backendValues.editable.valueToString + backendValue: backendValues.editable + Layout.fillWidth: true + } + } + Label { + text: qsTr("Flat") + tooltip: qsTr("Whether the combo box button is flat.") + } + SecondColumnLayout { + CheckBox { + text: backendValues.flat.valueToString + backendValue: backendValues.flat + Layout.fillWidth: true + } + } + Label { + text: qsTr("DisplayText") + tooltip: qsTr("Holds the text that is displayed on the combo box button.") + } + SecondColumnLayout { + LineEdit { + backendValue: backendValues.displayText + Layout.fillWidth: true + } + } } } -- cgit v1.2.3 From 8ea6c34606d4afc0b408debd939d5e6d651adf05 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 21 Mar 2018 12:47:58 +0100 Subject: Do not execute a deferred property when component complete is disabled The Qt Quick Designer disables component complete and completes the items manually at a later point. To avoid undefined behavior on items quickBeginDeferred() should not be called if completion is disabled. Task-number: QTBUG-67152 Change-Id: Ibf5c6c834436889cfda7862ea7b327731a026cf9 Reviewed-by: J-P Nurmi --- src/quicktemplates2/qquickdeferredexecute_p_p.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/quicktemplates2/qquickdeferredexecute_p_p.h b/src/quicktemplates2/qquickdeferredexecute_p_p.h index 400c5734..29d95ee9 100644 --- a/src/quicktemplates2/qquickdeferredexecute_p_p.h +++ b/src/quicktemplates2/qquickdeferredexecute_p_p.h @@ -51,6 +51,8 @@ #include #include +#include + QT_BEGIN_NAMESPACE class QString; @@ -65,6 +67,9 @@ namespace QtQuickPrivate { template void quickBeginDeferred(QObject *object, const QString &property, QQuickDeferredPointer &delegate) { + if (!QQmlVME::componentCompleteEnabled()) + return; + delegate.setExecuting(true); QtQuickPrivate::beginDeferred(object, property); delegate.setExecuting(false); -- cgit v1.2.3 From 4df12d1ae59da65c1338b1e3b894e8f88beded0f Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Fri, 23 Mar 2018 13:22:58 +0900 Subject: Fix current color is not set first time in ColorDialog Task-number: QT3DS-1363 Change-Id: Id464f3373bdc486060dcd1e351ffe29c55d85696 Reviewed-by: J-P Nurmi --- src/imports/platform/qquickplatformcolordialog.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/imports/platform/qquickplatformcolordialog.cpp b/src/imports/platform/qquickplatformcolordialog.cpp index 55957896..9b0283d0 100644 --- a/src/imports/platform/qquickplatformcolordialog.cpp +++ b/src/imports/platform/qquickplatformcolordialog.cpp @@ -185,6 +185,7 @@ void QQuickPlatformColorDialog::onCreate(QPlatformDialogHelper *dialog) { if (QPlatformColorDialogHelper *colorDialog = qobject_cast(dialog)) { connect(colorDialog, &QPlatformColorDialogHelper::currentColorChanged, this, &QQuickPlatformColorDialog::currentColorChanged); + colorDialog->setCurrentColor(m_currentColor); colorDialog->setOptions(m_options); } } -- cgit v1.2.3