sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-17 00:09:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Expose method as protected

Browse Source
This commit is contained in:
Nyall Dawson 2024-12-03 11:49:18 +10:00
parent b7f78e8c73
commit 1c3d2ae06a
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/PyQt6/gui/auto_generated/qgstextformatwidget.sip.in
View File

@ -156,6 +156,13 @@ when registering labels for the labeling settings currently defined by the widge
.. versionadded:: 3.16 .. versionadded:: 3.16
%End %End
void setPropertyOverrideButtonsVisible( bool visible );
%Docstring
Toggles whether data defined buttons should be shown in the widget.
.. versionadded:: 3.42
%End

7
python/gui/auto_generated/qgstextformatwidget.sip.in
View File

@ -156,6 +156,13 @@ when registering labels for the labeling settings currently defined by the widge
.. versionadded:: 3.16 .. versionadded:: 3.16
%End %End
void setPropertyOverrideButtonsVisible( bool visible );
%Docstring
Toggles whether data defined buttons should be shown in the widget.
.. versionadded:: 3.42
%End

6
src/gui/qgstextformatwidget.cpp
View File

@ -544,7 +544,7 @@ void QgsTextFormatWidget::setWidgetMode( QgsTextFormatWidget::Mode mode )
switch ( mode ) switch ( mode )
{ {
case Labeling: case Labeling:
toggleDDButtons( true ); setPropertyOverrideButtonsVisible( true );
mTextFormatsListWidget->setEntityTypes( QList<QgsStyle::StyleEntity>() << QgsStyle::TextFormatEntity << QgsStyle::LabelSettingsEntity ); mTextFormatsListWidget->setEntityTypes( QList<QgsStyle::StyleEntity>() << QgsStyle::TextFormatEntity << QgsStyle::LabelSettingsEntity );
mTextOrientationComboBox->addItem( tr( "Rotation-based" ), static_cast<int>( Qgis::TextOrientation::RotationBased ) ); mTextOrientationComboBox->addItem( tr( "Rotation-based" ), static_cast<int>( Qgis::TextOrientation::RotationBased ) );
break; break;
@ -552,7 +552,7 @@ void QgsTextFormatWidget::setWidgetMode( QgsTextFormatWidget::Mode mode )
case Text: case Text:
{ {
const int prevIndex = mOptionsTab->currentIndex(); const int prevIndex = mOptionsTab->currentIndex();
toggleDDButtons( true ); setPropertyOverrideButtonsVisible( true );
delete mLabelingOptionsListWidget->takeItem( 8 ); // rendering delete mLabelingOptionsListWidget->takeItem( 8 ); // rendering
delete mLabelingOptionsListWidget->takeItem( 7 ); // placement delete mLabelingOptionsListWidget->takeItem( 7 ); // placement
delete mLabelingOptionsListWidget->takeItem( 6 ); // callouts delete mLabelingOptionsListWidget->takeItem( 6 ); // callouts
@ -611,7 +611,7 @@ void QgsTextFormatWidget::setWidgetMode( QgsTextFormatWidget::Mode mode )
} }
} }
void QgsTextFormatWidget::toggleDDButtons( bool visible ) void QgsTextFormatWidget::setPropertyOverrideButtonsVisible( bool visible )
{ {
const auto buttons = findChildren<QgsPropertyOverrideButton *>(); const auto buttons = findChildren<QgsPropertyOverrideButton *>();
for ( QgsPropertyOverrideButton *button : buttons ) for ( QgsPropertyOverrideButton *button : buttons )

8
src/gui/qgstextformatwidget.h
View File

@ -165,6 +165,13 @@ class GUI_EXPORT QgsTextFormatWidget : public QWidget, public QgsExpressionConte
*/ */
Qgis::GeometryType labelGeometryType() const; Qgis::GeometryType labelGeometryType() const;
/**
* Toggles whether data defined buttons should be shown in the widget.
*
* \since QGIS 3.42
*/
void setPropertyOverrideButtonsVisible( bool visible );
//! Text substitution list //! Text substitution list
QgsStringReplacementCollection mSubstitutions; QgsStringReplacementCollection mSubstitutions;
//! Tab positions //! Tab positions
@ -254,7 +261,6 @@ class GUI_EXPORT QgsTextFormatWidget : public QWidget, public QgsExpressionConte
void initWidget(); void initWidget();
void setWidgetMode( Mode mode ); void setWidgetMode( Mode mode );
void toggleDDButtons( bool visible );
void blockFontChangeSignals( bool blk ); void blockFontChangeSignals( bool blk );
void populateFontCapitalsComboBox(); void populateFontCapitalsComboBox();
void populateFontStyleComboBox(); void populateFontStyleComboBox();