diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml deleted file mode 100644 index ae4d6535694..00000000000 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml +++ /dev/null @@ -1,118 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -import QtQuick 2.15 -import QtQuick.Layouts 1.0 -import StudioControls 1.0 as StudioControls -import StudioTheme 1.0 as StudioTheme -import QtQuickDesignerTheme 1.0 - -Loader { - id: gradientDialogLoader - parent: itemPane - anchors.fill: parent - - visible: false - active: visible - - function toggle() { - gradientDialogLoader.visible = !gradientDialogLoader.visible - } - - property Component content - - property int dialogHeight: 240 - property int dialogWidth: 400 - - sourceComponent: Component { - FocusScope { - id: popup - - Keys.onEscapePressed: { - event.accepted = true - gradientDialogLoader.visible = false - } - - Component.onCompleted: { - popup.forceActiveFocus() - } - - Rectangle { - anchors.fill: parent - color: StudioTheme.Values.themePopupOverlayColor - } - - MouseArea { - anchors.fill: parent - onClicked: gradientDialogLoader.visible = false - preventStealing: true - hoverEnabled: true - } - Rectangle { - id: background - - property int xOffset: itemPane.width - gradientDialogLoader.dialogWidth - x: 4 + xOffset - Component.onCompleted: { - var pos = itemPane.mapFromItem(buttonRow.parent, 0, 0) - y = pos.y + 32 - } - - width: parent.width - 8 - xOffset - height: gradientDialogLoader.dialogHeight - - color: StudioTheme.Values.themePanelBackground - border.color: StudioTheme.Values.themeControlOutline - - Label { - id: title - x: 8 - y: 6 - font.bold: true - text: qsTr("Gradient Properties") - } - - StudioControls.AbstractButton { - width: 16 - height: 16 - buttonIcon: StudioTheme.Constants.closeCross - onClicked: gradientDialogLoader.visible = false - backgroundRadius: 2 - anchors.right: parent.right - anchors.top: parent.top - anchors.margins: 4 - } - - Loader { - anchors.top: title.bottom - anchors.topMargin: 8 - anchors.left: parent.left - anchors.leftMargin: 8 - sourceComponent: gradientDialogLoader.content - } - } - } - } -} diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml deleted file mode 100644 index 33473c6eb44..00000000000 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml +++ /dev/null @@ -1,130 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -import QtQuick 2.15 -import HelperWidgets 2.0 -import StudioControls 1.0 as StudioControls -import StudioTheme 1.0 as StudioTheme - -Item { - id: root - - property color selectedColor - property bool clickable: true - property color oldColor - - width: 200 - height: 40 - enabled: clickable - - function addColorToPalette(colorCode) { - paletteModel.addItem(colorCode) - } - - function showColorDialog(color) { - root.oldColor = color - paletteModel.showDialog(color) - } - - signal dialogColorChanged - - Component { - id: colorItemDelegate - - Rectangle { - id: backgroundColor - - property var favorite: isFavorite - - height: 27 - width: 27 - border.color: backgroundColor.favorite ? "#ffd700" : "#555555" - border.width: backgroundColor.favorite ? 2 : 1 - color: "white" - radius: 0 - - Rectangle { - id: colorRectangle - width: 25 - height: 25 - anchors.centerIn: parent - color: colorCode - border.color: StudioTheme.Values.themeControlOutline - border.width: StudioTheme.Values.border - } - - ToolTipArea { - anchors.fill: parent - acceptedButtons: Qt.LeftButton | Qt.RightButton - - tooltip: colorCode - - onClicked: { - if (mouse.button === Qt.LeftButton && clickable) - root.selectedColor = colorRectangle.color - } - onPressed: { - if (mouse.button === Qt.RightButton) - contextMenu.popup() - } - } - - StudioControls.Menu { - id: contextMenu - - StudioControls.MenuItem { - text: backgroundColor.favorite ? qsTr("Remove from Favorites") - : qsTr("Add to Favorites") - onTriggered: paletteModel.toggleFavorite(index) - } - } - } - } - - SimpleColorPaletteModel { - id: paletteModel - - onCurrentColorChanged: { - root.selectedColor = color - dialogColorChanged() - } - - onColorDialogRejected: { - root.selectedColor = root.oldColor - dialogColorChanged() - } - } - - ListView { - id: colorPaletteView - model: paletteModel - delegate: colorItemDelegate - orientation: Qt.Horizontal - anchors.fill: parent - clip: true - interactive: false - spacing: 2 - } -} diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir index 9d7c2cae5d6..13e7de2f885 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir @@ -29,7 +29,6 @@ FontComboBox 2.0 FontComboBox.qml FontExtrasSection 2.0 FontExtrasSection.qml FontSection 2.0 FontSection.qml FontStyleButtons 2.0 FontStyleButtons.qml -GradientDialogPopup 2.0 GradientDialogPopup.qml GradientLine 2.0 GradientLine.qml GradientPopupIndicator 2.0 GradientPopupIndicator.qml GradientPresetList 2.0 GradientPresetList.qml @@ -59,7 +58,6 @@ ScrollView 2.0 ScrollView.qml SecondColumnLayout 2.0 SecondColumnLayout.qml Section 2.0 Section.qml SectionLayout 2.0 SectionLayout.qml -SimpleColorPalette 2.0 SimpleColorPalette.qml Spacer 2.0 Spacer.qml SpinBox 2.0 SpinBox.qml StandardTextSection 2.0 StandardTextSection.qml