diff options
Diffstat (limited to 'src/designer/src/components/taskmenu/tablewidgeteditor.cpp')
| -rw-r--r-- | src/designer/src/components/taskmenu/tablewidgeteditor.cpp | 124 |
1 files changed, 54 insertions, 70 deletions
diff --git a/src/designer/src/components/taskmenu/tablewidgeteditor.cpp b/src/designer/src/components/taskmenu/tablewidgeteditor.cpp index b5f41626c..725db1151 100644 --- a/src/designer/src/components/taskmenu/tablewidgeteditor.cpp +++ b/src/designer/src/components/taskmenu/tablewidgeteditor.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 "tablewidgeteditor.h" #include <abstractformbuilder.h> @@ -44,16 +19,19 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + namespace qdesigner_internal { TableWidgetEditor::TableWidgetEditor(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->setAlignDefault(Qt::AlignCenter); m_columnEditor->setNewItemText(tr("New Column")); m_rowEditor = new ItemListEditor(form, this); - m_rowEditor->setObjectName(QStringLiteral("rowEditor")); + m_rowEditor->setObjectName(u"rowEditor"_s); m_rowEditor->setNewItemText(tr("New Row")); ui.setupUi(dialog); @@ -65,41 +43,40 @@ TableWidgetEditor::TableWidgetEditor(QDesignerFormWindowInterface *form, QDialog ui.tabWidget->insertTab(0, m_columnEditor, tr("&Columns")); ui.tabWidget->insertTab(1, m_rowEditor, tr("&Rows")); ui.tabWidget->setCurrentIndex(0); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); ui.tableWidget->setSelectionMode(QAbstractItemView::SingleSelection); connect(iconCache(), &DesignerIconCache::reloaded, this, &TableWidgetEditor::cacheReloaded); connect(ui.tableWidget, &QTableWidget::currentCellChanged, - this, &TableWidgetEditor::on_tableWidget_currentCellChanged); + this, &TableWidgetEditor::tableWidgetCurrentCellChanged); connect(ui.tableWidget, &QTableWidget::itemChanged, - this, &TableWidgetEditor::on_tableWidget_itemChanged); + this, &TableWidgetEditor::tableWidgetItemChanged); connect(m_columnEditor, &ItemListEditor::indexChanged, - this, &TableWidgetEditor::on_columnEditor_indexChanged); + this, &TableWidgetEditor::columnEditorIndexChanged); connect(m_columnEditor, &ItemListEditor::itemChanged, - this, &TableWidgetEditor::on_columnEditor_itemChanged); + this, &TableWidgetEditor::columnEditorItemChanged); connect(m_columnEditor, &ItemListEditor::itemInserted, - this, &TableWidgetEditor::on_columnEditor_itemInserted); + this, &TableWidgetEditor::columnEditorItemInserted); connect(m_columnEditor, &ItemListEditor::itemDeleted, - this, &TableWidgetEditor::on_columnEditor_itemDeleted); + this, &TableWidgetEditor::columnEditorItemDeleted); connect(m_columnEditor, &ItemListEditor::itemMovedUp, - this, &TableWidgetEditor::on_columnEditor_itemMovedUp); + this, &TableWidgetEditor::columnEditorItemMovedUp); connect(m_columnEditor, &ItemListEditor::itemMovedDown, - this, &TableWidgetEditor::on_columnEditor_itemMovedDown); + this, &TableWidgetEditor::columnEditorItemMovedDown); connect(m_rowEditor, &ItemListEditor::indexChanged, - this, &TableWidgetEditor::on_rowEditor_indexChanged); + this, &TableWidgetEditor::rowEditorIndexChanged); connect(m_rowEditor, &ItemListEditor::itemChanged, - this, &TableWidgetEditor::on_rowEditor_itemChanged); + this, &TableWidgetEditor::rowEditorItemChanged); connect(m_rowEditor, &ItemListEditor::itemInserted, - this, &TableWidgetEditor::on_rowEditor_itemInserted); + this, &TableWidgetEditor::rowEditorItemInserted); connect(m_rowEditor, &ItemListEditor::itemDeleted, - this, &TableWidgetEditor::on_rowEditor_itemDeleted); + this, &TableWidgetEditor::rowEditorItemDeleted); connect(m_rowEditor, &ItemListEditor::itemMovedUp, - this, &TableWidgetEditor::on_rowEditor_itemMovedUp); + this, &TableWidgetEditor::rowEditorItemMovedUp); connect(m_rowEditor, &ItemListEditor::itemMovedDown, - this, &TableWidgetEditor::on_rowEditor_itemMovedDown); + this, &TableWidgetEditor::rowEditorItemMovedDown); } static AbstractItemEditor::PropertyDefinition tableHeaderPropList[] = { @@ -108,10 +85,10 @@ static AbstractItemEditor::PropertyDefinition tableHeaderPropList[] = { { Qt::ToolTipPropertyRole, 0, DesignerPropertyManager::designerStringTypeId, "toolTip" }, // { Qt::StatusTipPropertyRole, 0, DesignerPropertyManager::designerStringTypeId, "statusTip" }, { Qt::WhatsThisPropertyRole, 0, DesignerPropertyManager::designerStringTypeId, "whatsThis" }, - { Qt::FontRole, QVariant::Font, nullptr, "font" }, + { Qt::FontRole, QMetaType::QFont, nullptr, "font" }, { Qt::TextAlignmentRole, 0, DesignerPropertyManager::designerAlignmentTypeId, "textAlignment" }, - { Qt::BackgroundRole, QVariant::Color, nullptr, "background" }, - { Qt::ForegroundRole, QVariant::Brush, nullptr, "foreground" }, + { Qt::BackgroundRole, QMetaType::QColor, nullptr, "background" }, + { Qt::ForegroundRole, QMetaType::QBrush, nullptr, "foreground" }, { 0, 0, nullptr, nullptr } }; @@ -121,10 +98,10 @@ static AbstractItemEditor::PropertyDefinition tableItemPropList[] = { { Qt::ToolTipPropertyRole, 0, DesignerPropertyManager::designerStringTypeId, "toolTip" }, // { Qt::StatusTipPropertyRole, 0, DesignerPropertyManager::designerStringTypeId, "statusTip" }, { Qt::WhatsThisPropertyRole, 0, DesignerPropertyManager::designerStringTypeId, "whatsThis" }, - { Qt::FontRole, QVariant::Font, nullptr, "font" }, + { Qt::FontRole, QMetaType::QFont, nullptr, "font" }, { Qt::TextAlignmentRole, 0, DesignerPropertyManager::designerAlignmentTypeId, "textAlignment" }, - { Qt::BackgroundRole, QVariant::Brush, nullptr, "background" }, - { Qt::ForegroundRole, QVariant::Brush, nullptr, "foreground" }, + { Qt::BackgroundRole, QMetaType::QBrush, nullptr, "background" }, + { Qt::ForegroundRole, QMetaType::QBrush, nullptr, "foreground" }, { ItemFlagsShadowRole, 0, QtVariantPropertyManager::flagTypeId, "flags" }, { Qt::CheckStateRole, 0, QtVariantPropertyManager::enumTypeId, "checkState" }, { 0, 0, nullptr, nullptr } @@ -136,11 +113,19 @@ TableWidgetContents TableWidgetEditor::fillContentsFromTableWidget(QTableWidget tblCont.fromTableWidget(tableWidget, false); tblCont.applyToTableWidget(ui.tableWidget, iconCache(), true); - tblCont.m_verticalHeader.applyToListWidget(m_rowEditor->listWidget(), iconCache(), true); - m_rowEditor->setupEditor(tableWidget, tableHeaderPropList); + auto *header = tableWidget->verticalHeader(); + auto headerAlignment = header != nullptr + ? header->defaultAlignment() : Qt::Alignment(Qt::AlignLeading | Qt::AlignVCenter); + tblCont.m_verticalHeader.applyToListWidget(m_rowEditor->listWidget(), iconCache(), + true, headerAlignment); + m_rowEditor->setupEditor(tableWidget, tableHeaderPropList, headerAlignment); - tblCont.m_horizontalHeader.applyToListWidget(m_columnEditor->listWidget(), iconCache(), true); - m_columnEditor->setupEditor(tableWidget, tableHeaderPropList); + header = tableWidget->horizontalHeader(); + headerAlignment = header != nullptr + ? header->defaultAlignment() : Qt::Alignment(Qt::AlignCenter); + tblCont.m_horizontalHeader.applyToListWidget(m_columnEditor->listWidget(), iconCache(), + true, headerAlignment); + m_columnEditor->setupEditor(tableWidget, tableHeaderPropList, headerAlignment); setupEditor(tableWidget, tableItemPropList); if (ui.tableWidget->columnCount() > 0 && ui.tableWidget->rowCount() > 0) @@ -167,7 +152,7 @@ void TableWidgetEditor::setItemData(int role, const QVariant &v) ui.tableWidget->setItem(ui.tableWidget->currentRow(), ui.tableWidget->currentColumn(), item); } QVariant newValue = v; - if (role == Qt::FontRole && newValue.type() == QVariant::Font) { + if (role == Qt::FontRole && newValue.metaType().id() == QMetaType::QFont) { QFont oldFont = ui.tableWidget->font(); QFont newFont = qvariant_cast<QFont>(newValue).resolve(oldFont); newValue = QVariant::fromValue(newFont); @@ -190,14 +175,14 @@ int TableWidgetEditor::defaultItemFlags() const return flags; } -void TableWidgetEditor::on_tableWidget_currentCellChanged(int currentRow, int currentCol, int, int /* XXX remove me */) +void TableWidgetEditor::tableWidgetCurrentCellChanged(int currentRow, int currentCol) { m_rowEditor->setCurrentIndex(currentRow); m_columnEditor->setCurrentIndex(currentCol); updateBrowser(); } -void TableWidgetEditor::on_tableWidget_itemChanged(QTableWidgetItem *item) +void TableWidgetEditor::tableWidgetItemChanged(QTableWidgetItem *item) { if (m_updatingBrowser) return; @@ -210,22 +195,22 @@ void TableWidgetEditor::on_tableWidget_itemChanged(QTableWidgetItem *item) updateBrowser(); } -void TableWidgetEditor::on_columnEditor_indexChanged(int col) +void TableWidgetEditor::columnEditorIndexChanged(int col) { ui.tableWidget->setCurrentCell(ui.tableWidget->currentRow(), col); } -void TableWidgetEditor::on_columnEditor_itemChanged(int idx, int role, const QVariant &v) +void TableWidgetEditor::columnEditorItemChanged(int idx, int role, const QVariant &v) { ui.tableWidget->horizontalHeaderItem(idx)->setData(role, v); } -void TableWidgetEditor::on_rowEditor_indexChanged(int col) +void TableWidgetEditor::rowEditorIndexChanged(int col) { ui.tableWidget->setCurrentCell(col, ui.tableWidget->currentColumn()); } -void TableWidgetEditor::on_rowEditor_itemChanged(int idx, int role, const QVariant &v) +void TableWidgetEditor::rowEditorItemChanged(int idx, int role, const QVariant &v) { ui.tableWidget->verticalHeaderItem(idx)->setData(role, v); } @@ -333,7 +318,7 @@ void TableWidgetEditor::moveRowsUp(int fromRow, int toRow) } } -void TableWidgetEditor::on_columnEditor_itemInserted(int idx) +void TableWidgetEditor::columnEditorItemInserted(int idx) { const int columnCount = ui.tableWidget->columnCount(); ui.tableWidget->setColumnCount(columnCount + 1); @@ -351,7 +336,7 @@ void TableWidgetEditor::on_columnEditor_itemInserted(int idx) updateEditor(); } -void TableWidgetEditor::on_columnEditor_itemDeleted(int idx) +void TableWidgetEditor::columnEditorItemDeleted(int idx) { const int columnCount = ui.tableWidget->columnCount(); @@ -361,21 +346,21 @@ void TableWidgetEditor::on_columnEditor_itemDeleted(int idx) updateEditor(); } -void TableWidgetEditor::on_columnEditor_itemMovedUp(int idx) +void TableWidgetEditor::columnEditorItemMovedUp(int idx) { moveColumnsRight(idx - 1, idx); ui.tableWidget->setCurrentCell(ui.tableWidget->currentRow(), idx - 1); } -void TableWidgetEditor::on_columnEditor_itemMovedDown(int idx) +void TableWidgetEditor::columnEditorItemMovedDown(int idx) { moveColumnsLeft(idx, idx + 1); ui.tableWidget->setCurrentCell(ui.tableWidget->currentRow(), idx + 1); } -void TableWidgetEditor::on_rowEditor_itemInserted(int idx) +void TableWidgetEditor::rowEditorItemInserted(int idx) { const int rowCount = ui.tableWidget->rowCount(); ui.tableWidget->setRowCount(rowCount + 1); @@ -393,7 +378,7 @@ void TableWidgetEditor::on_rowEditor_itemInserted(int idx) updateEditor(); } -void TableWidgetEditor::on_rowEditor_itemDeleted(int idx) +void TableWidgetEditor::rowEditorItemDeleted(int idx) { const int rowCount = ui.tableWidget->rowCount(); @@ -403,14 +388,14 @@ void TableWidgetEditor::on_rowEditor_itemDeleted(int idx) updateEditor(); } -void TableWidgetEditor::on_rowEditor_itemMovedUp(int idx) +void TableWidgetEditor::rowEditorItemMovedUp(int idx) { moveRowsUp(idx - 1, idx); ui.tableWidget->setCurrentCell(idx - 1, ui.tableWidget->currentColumn()); } -void TableWidgetEditor::on_rowEditor_itemMovedDown(int idx) +void TableWidgetEditor::rowEditorItemMovedDown(int idx) { moveRowsDown(idx, idx + 1); @@ -425,7 +410,6 @@ void TableWidgetEditor::cacheReloaded() TableWidgetEditorDialog::TableWidgetEditorDialog(QDesignerFormWindowInterface *form, QWidget *parent) : QDialog(parent), m_editor(form, this) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); } TableWidgetContents TableWidgetEditorDialog::fillContentsFromTableWidget(QTableWidget *tableWidget) |