diff options
Diffstat (limited to 'src/designer/src/components/taskmenu/treewidgeteditor.cpp')
| -rw-r--r-- | src/designer/src/components/taskmenu/treewidgeteditor.cpp | 118 |
1 files changed, 50 insertions, 68 deletions
diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.cpp b/src/designer/src/components/taskmenu/treewidgeteditor.cpp index a7117beb5..bb89b0da1 100644 --- a/src/designer/src/components/taskmenu/treewidgeteditor.cpp +++ b/src/designer/src/components/taskmenu/treewidgeteditor.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "treewidgeteditor.h" #include <formwindowbase_p.h> @@ -45,13 +20,15 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + namespace qdesigner_internal { TreeWidgetEditor::TreeWidgetEditor(QDesignerFormWindowInterface *form, QDialog *dialog) : AbstractItemEditor(form, nullptr), m_updatingBrowser(false) { m_columnEditor = new ItemListEditor(form, this); - m_columnEditor->setObjectName(QStringLiteral("columnEditor")); + m_columnEditor->setObjectName(u"columnEditor"_s); m_columnEditor->setNewItemText(tr("New Column")); ui.setupUi(dialog); @@ -62,42 +39,48 @@ TreeWidgetEditor::TreeWidgetEditor(QDesignerFormWindowInterface *form, QDialog * ui.tabWidget->insertTab(0, m_columnEditor, tr("&Columns")); ui.tabWidget->setCurrentIndex(0); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - ui.newItemButton->setIcon(createIconSet(QString::fromUtf8("plus.png"))); - ui.newSubItemButton->setIcon(createIconSet(QString::fromUtf8("downplus.png"))); - ui.deleteItemButton->setIcon(createIconSet(QString::fromUtf8("minus.png"))); - ui.moveItemUpButton->setIcon(createIconSet(QString::fromUtf8("up.png"))); - ui.moveItemDownButton->setIcon(createIconSet(QString::fromUtf8("down.png"))); - ui.moveItemRightButton->setIcon(createIconSet(QString::fromUtf8("leveldown.png"))); - ui.moveItemLeftButton->setIcon(createIconSet(QString::fromUtf8("levelup.png"))); + ui.newItemButton->setIcon(createIconSet("plus.png"_L1)); + ui.newSubItemButton->setIcon(createIconSet("downplus.png"_L1)); + ui.deleteItemButton->setIcon(createIconSet("minus.png"_L1)); + ui.moveItemUpButton->setIcon(createIconSet("up.png"_L1)); + ui.moveItemDownButton->setIcon(createIconSet("down.png"_L1)); + ui.moveItemRightButton->setIcon(createIconSet("leveldown.png"_L1)); + ui.moveItemLeftButton->setIcon(createIconSet("levelup.png"_L1)); ui.treeWidget->header()->setSectionsMovable(false); - connect(ui.newItemButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_newItemButton_clicked); - connect(ui.newSubItemButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_newSubItemButton_clicked); - connect(ui.moveItemUpButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_moveItemUpButton_clicked); - connect(ui.moveItemDownButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_moveItemDownButton_clicked); - connect(ui.moveItemRightButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_moveItemRightButton_clicked); - connect(ui.moveItemLeftButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_moveItemLeftButton_clicked); - connect(ui.deleteItemButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_deleteItemButton_clicked); + connect(ui.newItemButton, &QAbstractButton::clicked, + this, &TreeWidgetEditor::newItemButtonClicked); + connect(ui.newSubItemButton, &QAbstractButton::clicked, + this, &TreeWidgetEditor::newSubItemButtonClicked); + connect(ui.moveItemUpButton, &QAbstractButton::clicked, + this, &TreeWidgetEditor::moveItemUpButtonClicked); + connect(ui.moveItemDownButton, &QAbstractButton::clicked, + this, &TreeWidgetEditor::moveItemDownButtonClicked); + connect(ui.moveItemRightButton, &QAbstractButton::clicked, + this, &TreeWidgetEditor::moveItemRightButtonClicked); + connect(ui.moveItemLeftButton, &QAbstractButton::clicked, + this, &TreeWidgetEditor::moveItemLeftButtonClicked); + connect(ui.deleteItemButton, &QAbstractButton::clicked, + this, &TreeWidgetEditor::deleteItemButtonClicked); connect(ui.treeWidget, &QTreeWidget::currentItemChanged, - this, &TreeWidgetEditor::on_treeWidget_currentItemChanged); + this, &TreeWidgetEditor::treeWidgetCurrentItemChanged); connect(ui.treeWidget, &QTreeWidget::itemChanged, - this, &TreeWidgetEditor::on_treeWidget_itemChanged); + this, &TreeWidgetEditor::treeWidgetItemChanged); connect(m_columnEditor, &ItemListEditor::indexChanged, - this, &TreeWidgetEditor::on_columnEditor_indexChanged); + this, &TreeWidgetEditor::columnEditorIndexChanged); connect(m_columnEditor, &ItemListEditor::itemChanged, - this, &TreeWidgetEditor::on_columnEditor_itemChanged); + this, &TreeWidgetEditor::columnEditorItemChanged); connect(m_columnEditor, &ItemListEditor::itemInserted, - this, &TreeWidgetEditor::on_columnEditor_itemInserted); + this, &TreeWidgetEditor::columnEditorItemInserted); connect(m_columnEditor, &ItemListEditor::itemDeleted, - this, &TreeWidgetEditor::on_columnEditor_itemDeleted); + this, &TreeWidgetEditor::columnEditorItemDeleted); connect(m_columnEditor, &ItemListEditor::itemMovedUp, - this, &TreeWidgetEditor::on_columnEditor_itemMovedUp); + this, &TreeWidgetEditor::columnEditorItemMovedUp); connect(m_columnEditor, &ItemListEditor::itemMovedDown, - this, &TreeWidgetEditor::on_columnEditor_itemMovedDown); + this, &TreeWidgetEditor::columnEditorItemMovedDown); connect(iconCache(), &DesignerIconCache::reloaded, this, &TreeWidgetEditor::cacheReloaded); } @@ -138,7 +121,7 @@ QtVariantProperty *TreeWidgetEditor::setupPropertyGroup(const QString &title, Pr { setupProperties(propDefs); QtVariantProperty *groupProp = m_propertyManager->addProperty(QtVariantPropertyManager::groupTypeId(), title); - for (QtVariantProperty *prop : qAsConst(m_rootProperties)) + for (QtVariantProperty *prop : std::as_const(m_rootProperties)) groupProp->addSubProperty(prop); m_rootProperties.clear(); return groupProp; @@ -202,7 +185,7 @@ int TreeWidgetEditor::defaultItemFlags() const return flags; } -void TreeWidgetEditor::on_newItemButton_clicked() +void TreeWidgetEditor::newItemButtonClicked() { QTreeWidgetItem *curItem = ui.treeWidget->currentItem(); QTreeWidgetItem *newItem = nullptr; @@ -225,7 +208,7 @@ void TreeWidgetEditor::on_newItemButton_clicked() ui.treeWidget->editItem(newItem, ui.treeWidget->currentColumn()); } -void TreeWidgetEditor::on_newSubItemButton_clicked() +void TreeWidgetEditor::newSubItemButtonClicked() { QTreeWidgetItem *curItem = ui.treeWidget->currentItem(); if (!curItem) @@ -244,7 +227,7 @@ void TreeWidgetEditor::on_newSubItemButton_clicked() ui.treeWidget->editItem(newItem, ui.treeWidget->currentColumn()); } -void TreeWidgetEditor::on_deleteItemButton_clicked() +void TreeWidgetEditor::deleteItemButtonClicked() { QTreeWidgetItem *curItem = ui.treeWidget->currentItem(); if (!curItem) @@ -280,7 +263,7 @@ void TreeWidgetEditor::on_deleteItemButton_clicked() updateEditor(); } -void TreeWidgetEditor::on_moveItemUpButton_clicked() +void TreeWidgetEditor::moveItemUpButtonClicked() { QTreeWidgetItem *curItem = ui.treeWidget->currentItem(); if (!curItem) @@ -310,7 +293,7 @@ void TreeWidgetEditor::on_moveItemUpButton_clicked() updateEditor(); } -void TreeWidgetEditor::on_moveItemDownButton_clicked() +void TreeWidgetEditor::moveItemDownButtonClicked() { QTreeWidgetItem *curItem = ui.treeWidget->currentItem(); if (!curItem) @@ -343,7 +326,7 @@ void TreeWidgetEditor::on_moveItemDownButton_clicked() updateEditor(); } -void TreeWidgetEditor::on_moveItemLeftButton_clicked() +void TreeWidgetEditor::moveItemLeftButtonClicked() { QTreeWidgetItem *curItem = ui.treeWidget->currentItem(); if (!curItem) @@ -368,7 +351,7 @@ void TreeWidgetEditor::on_moveItemLeftButton_clicked() updateEditor(); } -void TreeWidgetEditor::on_moveItemRightButton_clicked() +void TreeWidgetEditor::moveItemRightButtonClicked() { QTreeWidgetItem *curItem = ui.treeWidget->currentItem(); if (!curItem) @@ -413,13 +396,13 @@ void TreeWidgetEditor::setPropertyBrowserVisible(bool v) m_propertyBrowser->setVisible(v); } -void TreeWidgetEditor::on_treeWidget_currentItemChanged() +void TreeWidgetEditor::treeWidgetCurrentItemChanged() { m_columnEditor->setCurrentIndex(ui.treeWidget->currentColumn()); updateEditor(); } -void TreeWidgetEditor::on_treeWidget_itemChanged(QTreeWidgetItem *item, int column) +void TreeWidgetEditor::treeWidgetItemChanged(QTreeWidgetItem *item, int column) { if (m_updatingBrowser) return; @@ -432,13 +415,13 @@ void TreeWidgetEditor::on_treeWidget_itemChanged(QTreeWidgetItem *item, int colu updateBrowser(); } -void TreeWidgetEditor::on_columnEditor_indexChanged(int idx) +void TreeWidgetEditor::columnEditorIndexChanged(int idx) { if (QTreeWidgetItem *item = ui.treeWidget->currentItem()) ui.treeWidget->setCurrentItem(item, idx); } -void TreeWidgetEditor::on_columnEditor_itemChanged(int idx, int role, const QVariant &v) +void TreeWidgetEditor::columnEditorItemChanged(int idx, int role, const QVariant &v) { if (role == Qt::DisplayPropertyRole) ui.treeWidget->headerItem()->setData(idx, Qt::EditRole, qvariant_cast<PropertySheetStringValue>(v).value()); @@ -561,7 +544,7 @@ void TreeWidgetEditor::moveColumnsRight(int fromColumn, int toColumn) moveColumns(toColumn, fromColumn, 1); } -void TreeWidgetEditor::on_columnEditor_itemInserted(int idx) +void TreeWidgetEditor::columnEditorItemInserted(int idx) { int columnCount = ui.treeWidget->columnCount(); ui.treeWidget->setColumnCount(columnCount + 1); @@ -571,7 +554,7 @@ void TreeWidgetEditor::on_columnEditor_itemInserted(int idx) updateEditor(); } -void TreeWidgetEditor::on_columnEditor_itemDeleted(int idx) +void TreeWidgetEditor::columnEditorItemDeleted(int idx) { closeEditors(); @@ -585,7 +568,7 @@ void TreeWidgetEditor::on_columnEditor_itemDeleted(int idx) updateEditor(); } -void TreeWidgetEditor::on_columnEditor_itemMovedUp(int idx) +void TreeWidgetEditor::columnEditorItemMovedUp(int idx) { moveColumnsRight(idx - 1, idx); @@ -593,7 +576,7 @@ void TreeWidgetEditor::on_columnEditor_itemMovedUp(int idx) updateEditor(); } -void TreeWidgetEditor::on_columnEditor_itemMovedDown(int idx) +void TreeWidgetEditor::columnEditorItemMovedDown(int idx) { moveColumnsLeft(idx, idx + 1); @@ -618,7 +601,6 @@ void TreeWidgetEditor::cacheReloaded() TreeWidgetEditorDialog::TreeWidgetEditorDialog(QDesignerFormWindowInterface *form, QWidget *parent) : QDialog(parent), m_editor(form, this) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); } TreeWidgetContents TreeWidgetEditorDialog::fillContentsFromTreeWidget(QTreeWidget *treeWidget) |