diff --git a/python/PyQt6/core/class_map.yaml b/python/PyQt6/core/class_map.yaml index 2289f48a4de..0b28d8ad24c 100644 --- a/python/PyQt6/core/class_map.yaml +++ b/python/PyQt6/core/class_map.yaml @@ -6909,6 +6909,7 @@ QgsLayoutItemLegend.wrapString: src/core/layout/qgslayoutitemlegend.h#L442 QgsLayoutItemLegend.writePropertiesToElement: src/core/layout/qgslayoutitemlegend.h#L609 QgsLayoutItemLegend: src/core/layout/qgslayoutitemlegend.h#L111 QgsLayoutItemManualTable.calculateMaxRowHeights: src/core/layout/qgslayoutitemmanualtable.h#L141 +QgsLayoutItemManualTable.columnSpan: src/core/layout/qgslayoutitemmanualtable.h#L147 QgsLayoutItemManualTable.conditionalCellStyle: src/core/layout/qgslayoutitemmanualtable.h#L55 QgsLayoutItemManualTable.create: src/core/layout/qgslayoutitemmanualtable.h#L53 QgsLayoutItemManualTable.displayName: src/core/layout/qgslayoutitemmanualtable.h#L48 @@ -6916,6 +6917,7 @@ QgsLayoutItemManualTable.horizontalAlignmentForCell: src/core/layout/qgslayoutit QgsLayoutItemManualTable.icon: src/core/layout/qgslayoutitemmanualtable.h#L47 QgsLayoutItemManualTable.includeTableHeader: src/core/layout/qgslayoutitemmanualtable.h#L116 QgsLayoutItemManualTable.readPropertiesFromElement: src/core/layout/qgslayoutitemmanualtable.h#L140 +QgsLayoutItemManualTable.rowSpan: src/core/layout/qgslayoutitemmanualtable.h#L146 QgsLayoutItemManualTable.setColumnWidths: src/core/layout/qgslayoutitemmanualtable.h#L109 QgsLayoutItemManualTable.setHeaders: src/core/layout/qgslayoutitemmanualtable.h#L135 QgsLayoutItemManualTable.setIncludeTableHeader: src/core/layout/qgslayoutitemmanualtable.h#L123 @@ -7800,19 +7802,20 @@ QgsLayoutSnapper.stringType: src/core/layout/qgslayoutsnapper.h#L45 QgsLayoutSnapper.writeXml: src/core/layout/qgslayoutsnapper.h#L247 QgsLayoutSnapper: src/core/layout/qgslayoutsnapper.h#L35 QgsLayoutTable.backgroundColor: src/core/layout/qgslayouttable.h#L456 -QgsLayoutTable.calculateMaxColumnWidths: src/core/layout/qgslayouttable.h#L641 -QgsLayoutTable.calculateMaxRowHeights: src/core/layout/qgslayouttable.h#L646 +QgsLayoutTable.calculateMaxColumnWidths: src/core/layout/qgslayouttable.h#L657 +QgsLayoutTable.calculateMaxRowHeights: src/core/layout/qgslayouttable.h#L662 QgsLayoutTable.cellMargin: src/core/layout/qgslayouttable.h#L185 QgsLayoutTable.cellStyle: src/core/layout/qgslayouttable.h#L519 +QgsLayoutTable.columnSpan: src/core/layout/qgslayouttable.h#L564 QgsLayoutTable.conditionalCellStyle: src/core/layout/qgslayouttable.h#L541 QgsLayoutTable.contentFont: src/core/layout/qgslayouttable.h#L321 QgsLayoutTable.contentFontColor: src/core/layout/qgslayouttable.h#L339 QgsLayoutTable.contentTextFormat: src/core/layout/qgslayouttable.h#L355 -QgsLayoutTable.contentsContainsRow: src/core/layout/qgslayouttable.h#L736 -QgsLayoutTable.drawHorizontalGridLines: src/core/layout/qgslayouttable.h#L706 +QgsLayoutTable.contentsContainsRow: src/core/layout/qgslayouttable.h#L752 +QgsLayoutTable.drawHorizontalGridLines: src/core/layout/qgslayouttable.h#L722 QgsLayoutTable.emptyTableBehavior: src/core/layout/qgslayouttable.h#L198 QgsLayoutTable.emptyTableMessage: src/core/layout/qgslayouttable.h#L216 -QgsLayoutTable.fixedFrameSize: src/core/layout/qgslayouttable.h#L555 +QgsLayoutTable.fixedFrameSize: src/core/layout/qgslayouttable.h#L571 QgsLayoutTable.getTableContents: src/core/layout/qgslayouttable.h#L534 QgsLayoutTable.gridColor: src/core/layout/qgslayouttable.h#L404 QgsLayoutTable.gridStrokeWidth: src/core/layout/qgslayouttable.h#L388 @@ -7821,17 +7824,18 @@ QgsLayoutTable.headerFontColor: src/core/layout/qgslayouttable.h#L263 QgsLayoutTable.headerHAlignment: src/core/layout/qgslayouttable.h#L291 QgsLayoutTable.headerMode: src/core/layout/qgslayouttable.h#L305 QgsLayoutTable.headerTextFormat: src/core/layout/qgslayouttable.h#L279 -QgsLayoutTable.horizontalAlignmentForCell: src/core/layout/qgslayouttable.h#L760 +QgsLayoutTable.horizontalAlignmentForCell: src/core/layout/qgslayouttable.h#L776 QgsLayoutTable.horizontalGrid: src/core/layout/qgslayouttable.h#L423 -QgsLayoutTable.minFrameSize: src/core/layout/qgslayouttable.h#L556 -QgsLayoutTable.readPropertiesFromElement: src/core/layout/qgslayouttable.h#L559 -QgsLayoutTable.recalculateFrameSizes: src/core/layout/qgslayouttable.h#L574 -QgsLayoutTable.recalculateTableSize: src/core/layout/qgslayouttable.h#L728 -QgsLayoutTable.refresh: src/core/layout/qgslayouttable.h#L565 -QgsLayoutTable.refreshAttributes: src/core/layout/qgslayouttable.h#L572 -QgsLayoutTable.render: src/core/layout/qgslayouttable.h#L561 -QgsLayoutTable.rowsVisible: src/core/layout/qgslayouttable.h#L675 -QgsLayoutTable.rowsVisible: src/core/layout/qgslayouttable.h#L687 +QgsLayoutTable.minFrameSize: src/core/layout/qgslayouttable.h#L572 +QgsLayoutTable.readPropertiesFromElement: src/core/layout/qgslayouttable.h#L575 +QgsLayoutTable.recalculateFrameSizes: src/core/layout/qgslayouttable.h#L590 +QgsLayoutTable.recalculateTableSize: src/core/layout/qgslayouttable.h#L744 +QgsLayoutTable.refresh: src/core/layout/qgslayouttable.h#L581 +QgsLayoutTable.refreshAttributes: src/core/layout/qgslayouttable.h#L588 +QgsLayoutTable.render: src/core/layout/qgslayouttable.h#L577 +QgsLayoutTable.rowSpan: src/core/layout/qgslayouttable.h#L556 +QgsLayoutTable.rowsVisible: src/core/layout/qgslayouttable.h#L691 +QgsLayoutTable.rowsVisible: src/core/layout/qgslayouttable.h#L703 QgsLayoutTable.scopeForCell: src/core/layout/qgslayouttable.h#L548 QgsLayoutTable.setBackgroundColor: src/core/layout/qgslayouttable.h#L449 QgsLayoutTable.setCellMargin: src/core/layout/qgslayouttable.h#L179 @@ -7857,15 +7861,15 @@ QgsLayoutTable.setVerticalGrid: src/core/layout/qgslayouttable.h#L433 QgsLayoutTable.setWrapBehavior: src/core/layout/qgslayouttable.h#L463 QgsLayoutTable.showEmptyRows: src/core/layout/qgslayouttable.h#L229 QgsLayoutTable.showGrid: src/core/layout/qgslayouttable.h#L372 -QgsLayoutTable.textFormatForCell: src/core/layout/qgslayouttable.h#L744 -QgsLayoutTable.textFormatForHeader: src/core/layout/qgslayouttable.h#L752 -QgsLayoutTable.totalHeight: src/core/layout/qgslayouttable.h#L661 -QgsLayoutTable.totalSize: src/core/layout/qgslayouttable.h#L560 -QgsLayoutTable.totalWidth: src/core/layout/qgslayouttable.h#L654 -QgsLayoutTable.verticalAlignmentForCell: src/core/layout/qgslayouttable.h#L768 +QgsLayoutTable.textFormatForCell: src/core/layout/qgslayouttable.h#L760 +QgsLayoutTable.textFormatForHeader: src/core/layout/qgslayouttable.h#L768 +QgsLayoutTable.totalHeight: src/core/layout/qgslayouttable.h#L677 +QgsLayoutTable.totalSize: src/core/layout/qgslayouttable.h#L576 +QgsLayoutTable.totalWidth: src/core/layout/qgslayouttable.h#L670 +QgsLayoutTable.verticalAlignmentForCell: src/core/layout/qgslayouttable.h#L784 QgsLayoutTable.verticalGrid: src/core/layout/qgslayouttable.h#L442 QgsLayoutTable.wrapBehavior: src/core/layout/qgslayouttable.h#L470 -QgsLayoutTable.writePropertiesToElement: src/core/layout/qgslayouttable.h#L558 +QgsLayoutTable.writePropertiesToElement: src/core/layout/qgslayouttable.h#L574 QgsLayoutTable: src/core/layout/qgslayouttable.h#L106 QgsLayoutTableColumn.__repr__: src/core/layout/qgslayouttablecolumn.h#L205 QgsLayoutTableColumn.attribute: src/core/layout/qgslayouttablecolumn.h#L126 @@ -16819,19 +16823,22 @@ QgsSymbolRenderContext.setRenderHint: src/core/symbology/qgssymbolrendercontext. QgsSymbolRenderContext.setRenderHints: src/core/symbology/qgssymbolrendercontext.h#L140 QgsSymbolRenderContext.setSelected: src/core/symbology/qgssymbolrendercontext.h#L120 QgsSymbolRenderContext: src/core/symbology/qgssymbolrendercontext.h#L33 -QgsTableCell.__repr__: src/core/qgstablecell.h#L185 +QgsTableCell.__repr__: src/core/qgstablecell.h#L215 QgsTableCell.backgroundColor: src/core/qgstablecell.h#L70 +QgsTableCell.columnSpan: src/core/qgstablecell.h#L197 QgsTableCell.content: src/core/qgstablecell.h#L56 QgsTableCell.foregroundColor: src/core/qgstablecell.h#L86 QgsTableCell.horizontalAlignment: src/core/qgstablecell.h#L140 QgsTableCell.numericFormat: src/core/qgstablecell.h#L122 -QgsTableCell.properties: src/core/qgstablecell.h#L174 +QgsTableCell.properties: src/core/qgstablecell.h#L204 +QgsTableCell.rowSpan: src/core/qgstablecell.h#L187 QgsTableCell.setBackgroundColor: src/core/qgstablecell.h#L79 QgsTableCell.setContent: src/core/qgstablecell.h#L63 QgsTableCell.setForegroundColor: src/core/qgstablecell.h#L95 QgsTableCell.setHorizontalAlignment: src/core/qgstablecell.h#L149 QgsTableCell.setNumericFormat: src/core/qgstablecell.h#L131 -QgsTableCell.setProperties: src/core/qgstablecell.h#L181 +QgsTableCell.setProperties: src/core/qgstablecell.h#L211 +QgsTableCell.setSpan: src/core/qgstablecell.h#L177 QgsTableCell.setTextFormat: src/core/qgstablecell.h#L115 QgsTableCell.setVerticalAlignment: src/core/qgstablecell.h#L167 QgsTableCell.textFormat: src/core/qgstablecell.h#L105 diff --git a/python/PyQt6/gui/class_map.yaml b/python/PyQt6/gui/class_map.yaml index 18c7cbc1d2a..6452166e041 100644 --- a/python/PyQt6/gui/class_map.yaml +++ b/python/PyQt6/gui/class_map.yaml @@ -7252,19 +7252,22 @@ QgsTableEditorDialog.tableContents: src/gui/tableeditor/qgstableeditordialog.h#L QgsTableEditorDialog.tableHeaders: src/gui/tableeditor/qgstableeditordialog.h#L129 QgsTableEditorDialog.tableRowHeight: src/gui/tableeditor/qgstableeditordialog.h#L80 QgsTableEditorDialog: src/gui/tableeditor/qgstableeditordialog.h#L41 -QgsTableEditorWidget.activeCellChanged: src/gui/tableeditor/qgstableeditorwidget.h#L455 -QgsTableEditorWidget.clearSelectedCells: src/gui/tableeditor/qgstableeditorwidget.h#L362 -QgsTableEditorWidget.deleteColumns: src/gui/tableeditor/qgstableeditorwidget.h#L343 -QgsTableEditorWidget.deleteRows: src/gui/tableeditor/qgstableeditorwidget.h#L336 -QgsTableEditorWidget.expandColumnSelection: src/gui/tableeditor/qgstableeditorwidget.h#L357 -QgsTableEditorWidget.expandRowSelection: src/gui/tableeditor/qgstableeditorwidget.h#L350 +QgsTableEditorWidget.activeCellChanged: src/gui/tableeditor/qgstableeditorwidget.h#L485 +QgsTableEditorWidget.canMergeSelection: src/gui/tableeditor/qgstableeditorwidget.h#L306 +QgsTableEditorWidget.canSplitSelection: src/gui/tableeditor/qgstableeditorwidget.h#L313 +QgsTableEditorWidget.clearSelectedCells: src/gui/tableeditor/qgstableeditorwidget.h#L376 +QgsTableEditorWidget.deleteColumns: src/gui/tableeditor/qgstableeditorwidget.h#L357 +QgsTableEditorWidget.deleteRows: src/gui/tableeditor/qgstableeditorwidget.h#L350 +QgsTableEditorWidget.expandColumnSelection: src/gui/tableeditor/qgstableeditorwidget.h#L371 +QgsTableEditorWidget.expandRowSelection: src/gui/tableeditor/qgstableeditorwidget.h#L364 QgsTableEditorWidget.hasMixedSelectionNumericFormat: src/gui/tableeditor/qgstableeditorwidget.h#L162 -QgsTableEditorWidget.insertColumnsAfter: src/gui/tableeditor/qgstableeditorwidget.h#L329 -QgsTableEditorWidget.insertColumnsBefore: src/gui/tableeditor/qgstableeditorwidget.h#L322 -QgsTableEditorWidget.insertRowsAbove: src/gui/tableeditor/qgstableeditorwidget.h#L315 -QgsTableEditorWidget.insertRowsBelow: src/gui/tableeditor/qgstableeditorwidget.h#L308 +QgsTableEditorWidget.insertColumnsAfter: src/gui/tableeditor/qgstableeditorwidget.h#L343 +QgsTableEditorWidget.insertColumnsBefore: src/gui/tableeditor/qgstableeditorwidget.h#L336 +QgsTableEditorWidget.insertRowsAbove: src/gui/tableeditor/qgstableeditorwidget.h#L329 +QgsTableEditorWidget.insertRowsBelow: src/gui/tableeditor/qgstableeditorwidget.h#L322 QgsTableEditorWidget.isHeaderCellSelected: src/gui/tableeditor/qgstableeditorwidget.h#L299 -QgsTableEditorWidget.keyPressEvent: src/gui/tableeditor/qgstableeditorwidget.h#L443 +QgsTableEditorWidget.keyPressEvent: src/gui/tableeditor/qgstableeditorwidget.h#L473 +QgsTableEditorWidget.mergeSelectedCells: src/gui/tableeditor/qgstableeditorwidget.h#L462 QgsTableEditorWidget.selectionBackgroundColor: src/gui/tableeditor/qgstableeditorwidget.h#L186 QgsTableEditorWidget.selectionCellProperty: src/gui/tableeditor/qgstableeditorwidget.h#L216 QgsTableEditorWidget.selectionColumnWidth: src/gui/tableeditor/qgstableeditorwidget.h#L241 @@ -7274,21 +7277,22 @@ QgsTableEditorWidget.selectionNumericFormat: src/gui/tableeditor/qgstableeditorw QgsTableEditorWidget.selectionRowHeight: src/gui/tableeditor/qgstableeditorwidget.h#L233 QgsTableEditorWidget.selectionTextFormat: src/gui/tableeditor/qgstableeditorwidget.h#L225 QgsTableEditorWidget.selectionVerticalAlignment: src/gui/tableeditor/qgstableeditorwidget.h#L206 -QgsTableEditorWidget.setIncludeTableHeader: src/gui/tableeditor/qgstableeditorwidget.h#L433 -QgsTableEditorWidget.setSelectionBackgroundColor: src/gui/tableeditor/qgstableeditorwidget.h#L380 -QgsTableEditorWidget.setSelectionCellProperty: src/gui/tableeditor/qgstableeditorwidget.h#L407 -QgsTableEditorWidget.setSelectionColumnWidth: src/gui/tableeditor/qgstableeditorwidget.h#L428 -QgsTableEditorWidget.setSelectionForegroundColor: src/gui/tableeditor/qgstableeditorwidget.h#L372 -QgsTableEditorWidget.setSelectionHorizontalAlignment: src/gui/tableeditor/qgstableeditorwidget.h#L390 +QgsTableEditorWidget.setIncludeTableHeader: src/gui/tableeditor/qgstableeditorwidget.h#L447 +QgsTableEditorWidget.setSelectionBackgroundColor: src/gui/tableeditor/qgstableeditorwidget.h#L394 +QgsTableEditorWidget.setSelectionCellProperty: src/gui/tableeditor/qgstableeditorwidget.h#L421 +QgsTableEditorWidget.setSelectionColumnWidth: src/gui/tableeditor/qgstableeditorwidget.h#L442 +QgsTableEditorWidget.setSelectionForegroundColor: src/gui/tableeditor/qgstableeditorwidget.h#L386 +QgsTableEditorWidget.setSelectionHorizontalAlignment: src/gui/tableeditor/qgstableeditorwidget.h#L404 QgsTableEditorWidget.setSelectionNumericFormat: src/gui/tableeditor/qgstableeditorwidget.h#L143 -QgsTableEditorWidget.setSelectionRowHeight: src/gui/tableeditor/qgstableeditorwidget.h#L421 -QgsTableEditorWidget.setSelectionTextFormat: src/gui/tableeditor/qgstableeditorwidget.h#L414 -QgsTableEditorWidget.setSelectionVerticalAlignment: src/gui/tableeditor/qgstableeditorwidget.h#L400 +QgsTableEditorWidget.setSelectionRowHeight: src/gui/tableeditor/qgstableeditorwidget.h#L435 +QgsTableEditorWidget.setSelectionTextFormat: src/gui/tableeditor/qgstableeditorwidget.h#L428 +QgsTableEditorWidget.setSelectionVerticalAlignment: src/gui/tableeditor/qgstableeditorwidget.h#L414 QgsTableEditorWidget.setTableColumnWidth: src/gui/tableeditor/qgstableeditorwidget.h#L273 QgsTableEditorWidget.setTableContents: src/gui/tableeditor/qgstableeditorwidget.h#L127 -QgsTableEditorWidget.setTableHeaders: src/gui/tableeditor/qgstableeditorwidget.h#L440 +QgsTableEditorWidget.setTableHeaders: src/gui/tableeditor/qgstableeditorwidget.h#L454 QgsTableEditorWidget.setTableRowHeight: src/gui/tableeditor/qgstableeditorwidget.h#L263 -QgsTableEditorWidget.tableChanged: src/gui/tableeditor/qgstableeditorwidget.h#L450 +QgsTableEditorWidget.splitSelectedCells: src/gui/tableeditor/qgstableeditorwidget.h#L470 +QgsTableEditorWidget.tableChanged: src/gui/tableeditor/qgstableeditorwidget.h#L480 QgsTableEditorWidget.tableColumnWidth: src/gui/tableeditor/qgstableeditorwidget.h#L253 QgsTableEditorWidget.tableContents: src/gui/tableeditor/qgstableeditorwidget.h#L134 QgsTableEditorWidget.tableHeaders: src/gui/tableeditor/qgstableeditorwidget.h#L294 diff --git a/python/core/class_map.yaml b/python/core/class_map.yaml index aad3cfd84bd..36623f3bae2 100644 --- a/python/core/class_map.yaml +++ b/python/core/class_map.yaml @@ -6909,6 +6909,7 @@ QgsLayoutItemLegend.wrapString: src/core/layout/qgslayoutitemlegend.h#L442 QgsLayoutItemLegend.writePropertiesToElement: src/core/layout/qgslayoutitemlegend.h#L609 QgsLayoutItemLegend: src/core/layout/qgslayoutitemlegend.h#L111 QgsLayoutItemManualTable.calculateMaxRowHeights: src/core/layout/qgslayoutitemmanualtable.h#L141 +QgsLayoutItemManualTable.columnSpan: src/core/layout/qgslayoutitemmanualtable.h#L147 QgsLayoutItemManualTable.conditionalCellStyle: src/core/layout/qgslayoutitemmanualtable.h#L55 QgsLayoutItemManualTable.create: src/core/layout/qgslayoutitemmanualtable.h#L53 QgsLayoutItemManualTable.displayName: src/core/layout/qgslayoutitemmanualtable.h#L48 @@ -6916,6 +6917,7 @@ QgsLayoutItemManualTable.horizontalAlignmentForCell: src/core/layout/qgslayoutit QgsLayoutItemManualTable.icon: src/core/layout/qgslayoutitemmanualtable.h#L47 QgsLayoutItemManualTable.includeTableHeader: src/core/layout/qgslayoutitemmanualtable.h#L116 QgsLayoutItemManualTable.readPropertiesFromElement: src/core/layout/qgslayoutitemmanualtable.h#L140 +QgsLayoutItemManualTable.rowSpan: src/core/layout/qgslayoutitemmanualtable.h#L146 QgsLayoutItemManualTable.setColumnWidths: src/core/layout/qgslayoutitemmanualtable.h#L109 QgsLayoutItemManualTable.setHeaders: src/core/layout/qgslayoutitemmanualtable.h#L135 QgsLayoutItemManualTable.setIncludeTableHeader: src/core/layout/qgslayoutitemmanualtable.h#L123 @@ -7800,19 +7802,20 @@ QgsLayoutSnapper.stringType: src/core/layout/qgslayoutsnapper.h#L45 QgsLayoutSnapper.writeXml: src/core/layout/qgslayoutsnapper.h#L247 QgsLayoutSnapper: src/core/layout/qgslayoutsnapper.h#L35 QgsLayoutTable.backgroundColor: src/core/layout/qgslayouttable.h#L456 -QgsLayoutTable.calculateMaxColumnWidths: src/core/layout/qgslayouttable.h#L641 -QgsLayoutTable.calculateMaxRowHeights: src/core/layout/qgslayouttable.h#L646 +QgsLayoutTable.calculateMaxColumnWidths: src/core/layout/qgslayouttable.h#L657 +QgsLayoutTable.calculateMaxRowHeights: src/core/layout/qgslayouttable.h#L662 QgsLayoutTable.cellMargin: src/core/layout/qgslayouttable.h#L185 QgsLayoutTable.cellStyle: src/core/layout/qgslayouttable.h#L519 +QgsLayoutTable.columnSpan: src/core/layout/qgslayouttable.h#L564 QgsLayoutTable.conditionalCellStyle: src/core/layout/qgslayouttable.h#L541 QgsLayoutTable.contentFont: src/core/layout/qgslayouttable.h#L321 QgsLayoutTable.contentFontColor: src/core/layout/qgslayouttable.h#L339 QgsLayoutTable.contentTextFormat: src/core/layout/qgslayouttable.h#L355 -QgsLayoutTable.contentsContainsRow: src/core/layout/qgslayouttable.h#L736 -QgsLayoutTable.drawHorizontalGridLines: src/core/layout/qgslayouttable.h#L706 +QgsLayoutTable.contentsContainsRow: src/core/layout/qgslayouttable.h#L752 +QgsLayoutTable.drawHorizontalGridLines: src/core/layout/qgslayouttable.h#L722 QgsLayoutTable.emptyTableBehavior: src/core/layout/qgslayouttable.h#L198 QgsLayoutTable.emptyTableMessage: src/core/layout/qgslayouttable.h#L216 -QgsLayoutTable.fixedFrameSize: src/core/layout/qgslayouttable.h#L555 +QgsLayoutTable.fixedFrameSize: src/core/layout/qgslayouttable.h#L571 QgsLayoutTable.getTableContents: src/core/layout/qgslayouttable.h#L534 QgsLayoutTable.gridColor: src/core/layout/qgslayouttable.h#L404 QgsLayoutTable.gridStrokeWidth: src/core/layout/qgslayouttable.h#L388 @@ -7821,17 +7824,18 @@ QgsLayoutTable.headerFontColor: src/core/layout/qgslayouttable.h#L263 QgsLayoutTable.headerHAlignment: src/core/layout/qgslayouttable.h#L291 QgsLayoutTable.headerMode: src/core/layout/qgslayouttable.h#L305 QgsLayoutTable.headerTextFormat: src/core/layout/qgslayouttable.h#L279 -QgsLayoutTable.horizontalAlignmentForCell: src/core/layout/qgslayouttable.h#L760 +QgsLayoutTable.horizontalAlignmentForCell: src/core/layout/qgslayouttable.h#L776 QgsLayoutTable.horizontalGrid: src/core/layout/qgslayouttable.h#L423 -QgsLayoutTable.minFrameSize: src/core/layout/qgslayouttable.h#L556 -QgsLayoutTable.readPropertiesFromElement: src/core/layout/qgslayouttable.h#L559 -QgsLayoutTable.recalculateFrameSizes: src/core/layout/qgslayouttable.h#L574 -QgsLayoutTable.recalculateTableSize: src/core/layout/qgslayouttable.h#L728 -QgsLayoutTable.refresh: src/core/layout/qgslayouttable.h#L565 -QgsLayoutTable.refreshAttributes: src/core/layout/qgslayouttable.h#L572 -QgsLayoutTable.render: src/core/layout/qgslayouttable.h#L561 -QgsLayoutTable.rowsVisible: src/core/layout/qgslayouttable.h#L675 -QgsLayoutTable.rowsVisible: src/core/layout/qgslayouttable.h#L687 +QgsLayoutTable.minFrameSize: src/core/layout/qgslayouttable.h#L572 +QgsLayoutTable.readPropertiesFromElement: src/core/layout/qgslayouttable.h#L575 +QgsLayoutTable.recalculateFrameSizes: src/core/layout/qgslayouttable.h#L590 +QgsLayoutTable.recalculateTableSize: src/core/layout/qgslayouttable.h#L744 +QgsLayoutTable.refresh: src/core/layout/qgslayouttable.h#L581 +QgsLayoutTable.refreshAttributes: src/core/layout/qgslayouttable.h#L588 +QgsLayoutTable.render: src/core/layout/qgslayouttable.h#L577 +QgsLayoutTable.rowSpan: src/core/layout/qgslayouttable.h#L556 +QgsLayoutTable.rowsVisible: src/core/layout/qgslayouttable.h#L691 +QgsLayoutTable.rowsVisible: src/core/layout/qgslayouttable.h#L703 QgsLayoutTable.scopeForCell: src/core/layout/qgslayouttable.h#L548 QgsLayoutTable.setBackgroundColor: src/core/layout/qgslayouttable.h#L449 QgsLayoutTable.setCellMargin: src/core/layout/qgslayouttable.h#L179 @@ -7857,15 +7861,15 @@ QgsLayoutTable.setVerticalGrid: src/core/layout/qgslayouttable.h#L433 QgsLayoutTable.setWrapBehavior: src/core/layout/qgslayouttable.h#L463 QgsLayoutTable.showEmptyRows: src/core/layout/qgslayouttable.h#L229 QgsLayoutTable.showGrid: src/core/layout/qgslayouttable.h#L372 -QgsLayoutTable.textFormatForCell: src/core/layout/qgslayouttable.h#L744 -QgsLayoutTable.textFormatForHeader: src/core/layout/qgslayouttable.h#L752 -QgsLayoutTable.totalHeight: src/core/layout/qgslayouttable.h#L661 -QgsLayoutTable.totalSize: src/core/layout/qgslayouttable.h#L560 -QgsLayoutTable.totalWidth: src/core/layout/qgslayouttable.h#L654 -QgsLayoutTable.verticalAlignmentForCell: src/core/layout/qgslayouttable.h#L768 +QgsLayoutTable.textFormatForCell: src/core/layout/qgslayouttable.h#L760 +QgsLayoutTable.textFormatForHeader: src/core/layout/qgslayouttable.h#L768 +QgsLayoutTable.totalHeight: src/core/layout/qgslayouttable.h#L677 +QgsLayoutTable.totalSize: src/core/layout/qgslayouttable.h#L576 +QgsLayoutTable.totalWidth: src/core/layout/qgslayouttable.h#L670 +QgsLayoutTable.verticalAlignmentForCell: src/core/layout/qgslayouttable.h#L784 QgsLayoutTable.verticalGrid: src/core/layout/qgslayouttable.h#L442 QgsLayoutTable.wrapBehavior: src/core/layout/qgslayouttable.h#L470 -QgsLayoutTable.writePropertiesToElement: src/core/layout/qgslayouttable.h#L558 +QgsLayoutTable.writePropertiesToElement: src/core/layout/qgslayouttable.h#L574 QgsLayoutTable: src/core/layout/qgslayouttable.h#L106 QgsLayoutTableColumn.__repr__: src/core/layout/qgslayouttablecolumn.h#L205 QgsLayoutTableColumn.attribute: src/core/layout/qgslayouttablecolumn.h#L126 @@ -16819,19 +16823,22 @@ QgsSymbolRenderContext.setRenderHint: src/core/symbology/qgssymbolrendercontext. QgsSymbolRenderContext.setRenderHints: src/core/symbology/qgssymbolrendercontext.h#L140 QgsSymbolRenderContext.setSelected: src/core/symbology/qgssymbolrendercontext.h#L120 QgsSymbolRenderContext: src/core/symbology/qgssymbolrendercontext.h#L33 -QgsTableCell.__repr__: src/core/qgstablecell.h#L185 +QgsTableCell.__repr__: src/core/qgstablecell.h#L215 QgsTableCell.backgroundColor: src/core/qgstablecell.h#L70 +QgsTableCell.columnSpan: src/core/qgstablecell.h#L197 QgsTableCell.content: src/core/qgstablecell.h#L56 QgsTableCell.foregroundColor: src/core/qgstablecell.h#L86 QgsTableCell.horizontalAlignment: src/core/qgstablecell.h#L140 QgsTableCell.numericFormat: src/core/qgstablecell.h#L122 -QgsTableCell.properties: src/core/qgstablecell.h#L174 +QgsTableCell.properties: src/core/qgstablecell.h#L204 +QgsTableCell.rowSpan: src/core/qgstablecell.h#L187 QgsTableCell.setBackgroundColor: src/core/qgstablecell.h#L79 QgsTableCell.setContent: src/core/qgstablecell.h#L63 QgsTableCell.setForegroundColor: src/core/qgstablecell.h#L95 QgsTableCell.setHorizontalAlignment: src/core/qgstablecell.h#L149 QgsTableCell.setNumericFormat: src/core/qgstablecell.h#L131 -QgsTableCell.setProperties: src/core/qgstablecell.h#L181 +QgsTableCell.setProperties: src/core/qgstablecell.h#L211 +QgsTableCell.setSpan: src/core/qgstablecell.h#L177 QgsTableCell.setTextFormat: src/core/qgstablecell.h#L115 QgsTableCell.setVerticalAlignment: src/core/qgstablecell.h#L167 QgsTableCell.textFormat: src/core/qgstablecell.h#L105 diff --git a/python/gui/class_map.yaml b/python/gui/class_map.yaml index 18c7cbc1d2a..6452166e041 100644 --- a/python/gui/class_map.yaml +++ b/python/gui/class_map.yaml @@ -7252,19 +7252,22 @@ QgsTableEditorDialog.tableContents: src/gui/tableeditor/qgstableeditordialog.h#L QgsTableEditorDialog.tableHeaders: src/gui/tableeditor/qgstableeditordialog.h#L129 QgsTableEditorDialog.tableRowHeight: src/gui/tableeditor/qgstableeditordialog.h#L80 QgsTableEditorDialog: src/gui/tableeditor/qgstableeditordialog.h#L41 -QgsTableEditorWidget.activeCellChanged: src/gui/tableeditor/qgstableeditorwidget.h#L455 -QgsTableEditorWidget.clearSelectedCells: src/gui/tableeditor/qgstableeditorwidget.h#L362 -QgsTableEditorWidget.deleteColumns: src/gui/tableeditor/qgstableeditorwidget.h#L343 -QgsTableEditorWidget.deleteRows: src/gui/tableeditor/qgstableeditorwidget.h#L336 -QgsTableEditorWidget.expandColumnSelection: src/gui/tableeditor/qgstableeditorwidget.h#L357 -QgsTableEditorWidget.expandRowSelection: src/gui/tableeditor/qgstableeditorwidget.h#L350 +QgsTableEditorWidget.activeCellChanged: src/gui/tableeditor/qgstableeditorwidget.h#L485 +QgsTableEditorWidget.canMergeSelection: src/gui/tableeditor/qgstableeditorwidget.h#L306 +QgsTableEditorWidget.canSplitSelection: src/gui/tableeditor/qgstableeditorwidget.h#L313 +QgsTableEditorWidget.clearSelectedCells: src/gui/tableeditor/qgstableeditorwidget.h#L376 +QgsTableEditorWidget.deleteColumns: src/gui/tableeditor/qgstableeditorwidget.h#L357 +QgsTableEditorWidget.deleteRows: src/gui/tableeditor/qgstableeditorwidget.h#L350 +QgsTableEditorWidget.expandColumnSelection: src/gui/tableeditor/qgstableeditorwidget.h#L371 +QgsTableEditorWidget.expandRowSelection: src/gui/tableeditor/qgstableeditorwidget.h#L364 QgsTableEditorWidget.hasMixedSelectionNumericFormat: src/gui/tableeditor/qgstableeditorwidget.h#L162 -QgsTableEditorWidget.insertColumnsAfter: src/gui/tableeditor/qgstableeditorwidget.h#L329 -QgsTableEditorWidget.insertColumnsBefore: src/gui/tableeditor/qgstableeditorwidget.h#L322 -QgsTableEditorWidget.insertRowsAbove: src/gui/tableeditor/qgstableeditorwidget.h#L315 -QgsTableEditorWidget.insertRowsBelow: src/gui/tableeditor/qgstableeditorwidget.h#L308 +QgsTableEditorWidget.insertColumnsAfter: src/gui/tableeditor/qgstableeditorwidget.h#L343 +QgsTableEditorWidget.insertColumnsBefore: src/gui/tableeditor/qgstableeditorwidget.h#L336 +QgsTableEditorWidget.insertRowsAbove: src/gui/tableeditor/qgstableeditorwidget.h#L329 +QgsTableEditorWidget.insertRowsBelow: src/gui/tableeditor/qgstableeditorwidget.h#L322 QgsTableEditorWidget.isHeaderCellSelected: src/gui/tableeditor/qgstableeditorwidget.h#L299 -QgsTableEditorWidget.keyPressEvent: src/gui/tableeditor/qgstableeditorwidget.h#L443 +QgsTableEditorWidget.keyPressEvent: src/gui/tableeditor/qgstableeditorwidget.h#L473 +QgsTableEditorWidget.mergeSelectedCells: src/gui/tableeditor/qgstableeditorwidget.h#L462 QgsTableEditorWidget.selectionBackgroundColor: src/gui/tableeditor/qgstableeditorwidget.h#L186 QgsTableEditorWidget.selectionCellProperty: src/gui/tableeditor/qgstableeditorwidget.h#L216 QgsTableEditorWidget.selectionColumnWidth: src/gui/tableeditor/qgstableeditorwidget.h#L241 @@ -7274,21 +7277,22 @@ QgsTableEditorWidget.selectionNumericFormat: src/gui/tableeditor/qgstableeditorw QgsTableEditorWidget.selectionRowHeight: src/gui/tableeditor/qgstableeditorwidget.h#L233 QgsTableEditorWidget.selectionTextFormat: src/gui/tableeditor/qgstableeditorwidget.h#L225 QgsTableEditorWidget.selectionVerticalAlignment: src/gui/tableeditor/qgstableeditorwidget.h#L206 -QgsTableEditorWidget.setIncludeTableHeader: src/gui/tableeditor/qgstableeditorwidget.h#L433 -QgsTableEditorWidget.setSelectionBackgroundColor: src/gui/tableeditor/qgstableeditorwidget.h#L380 -QgsTableEditorWidget.setSelectionCellProperty: src/gui/tableeditor/qgstableeditorwidget.h#L407 -QgsTableEditorWidget.setSelectionColumnWidth: src/gui/tableeditor/qgstableeditorwidget.h#L428 -QgsTableEditorWidget.setSelectionForegroundColor: src/gui/tableeditor/qgstableeditorwidget.h#L372 -QgsTableEditorWidget.setSelectionHorizontalAlignment: src/gui/tableeditor/qgstableeditorwidget.h#L390 +QgsTableEditorWidget.setIncludeTableHeader: src/gui/tableeditor/qgstableeditorwidget.h#L447 +QgsTableEditorWidget.setSelectionBackgroundColor: src/gui/tableeditor/qgstableeditorwidget.h#L394 +QgsTableEditorWidget.setSelectionCellProperty: src/gui/tableeditor/qgstableeditorwidget.h#L421 +QgsTableEditorWidget.setSelectionColumnWidth: src/gui/tableeditor/qgstableeditorwidget.h#L442 +QgsTableEditorWidget.setSelectionForegroundColor: src/gui/tableeditor/qgstableeditorwidget.h#L386 +QgsTableEditorWidget.setSelectionHorizontalAlignment: src/gui/tableeditor/qgstableeditorwidget.h#L404 QgsTableEditorWidget.setSelectionNumericFormat: src/gui/tableeditor/qgstableeditorwidget.h#L143 -QgsTableEditorWidget.setSelectionRowHeight: src/gui/tableeditor/qgstableeditorwidget.h#L421 -QgsTableEditorWidget.setSelectionTextFormat: src/gui/tableeditor/qgstableeditorwidget.h#L414 -QgsTableEditorWidget.setSelectionVerticalAlignment: src/gui/tableeditor/qgstableeditorwidget.h#L400 +QgsTableEditorWidget.setSelectionRowHeight: src/gui/tableeditor/qgstableeditorwidget.h#L435 +QgsTableEditorWidget.setSelectionTextFormat: src/gui/tableeditor/qgstableeditorwidget.h#L428 +QgsTableEditorWidget.setSelectionVerticalAlignment: src/gui/tableeditor/qgstableeditorwidget.h#L414 QgsTableEditorWidget.setTableColumnWidth: src/gui/tableeditor/qgstableeditorwidget.h#L273 QgsTableEditorWidget.setTableContents: src/gui/tableeditor/qgstableeditorwidget.h#L127 -QgsTableEditorWidget.setTableHeaders: src/gui/tableeditor/qgstableeditorwidget.h#L440 +QgsTableEditorWidget.setTableHeaders: src/gui/tableeditor/qgstableeditorwidget.h#L454 QgsTableEditorWidget.setTableRowHeight: src/gui/tableeditor/qgstableeditorwidget.h#L263 -QgsTableEditorWidget.tableChanged: src/gui/tableeditor/qgstableeditorwidget.h#L450 +QgsTableEditorWidget.splitSelectedCells: src/gui/tableeditor/qgstableeditorwidget.h#L470 +QgsTableEditorWidget.tableChanged: src/gui/tableeditor/qgstableeditorwidget.h#L480 QgsTableEditorWidget.tableColumnWidth: src/gui/tableeditor/qgstableeditorwidget.h#L253 QgsTableEditorWidget.tableContents: src/gui/tableeditor/qgstableeditorwidget.h#L134 QgsTableEditorWidget.tableHeaders: src/gui/tableeditor/qgstableeditorwidget.h#L294