Skip to content

Commit

Permalink
Disable labels in layout scale bar properties
Browse files Browse the repository at this point in the history 
when the referred feature is disabled
  • Loading branch information
@DelazJ @nyalldawson
DelazJ authored and nyalldawson committed May 10, 2020
1 parent 09c62f1 commit cd46c99
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
9 changes: 9 additions & 0 deletions src/gui/layout/qgslayoutscalebarwidget.cpp
View file
Expand Up @@ -535,14 +535,23 @@ void QgsLayoutScaleBarWidget::toggleStyleSpecificControls( const QString &style
if ( !mGroupBoxUnits->isEnabled() )
mGroupBoxSegments->setCollapsed( true );
mLabelBarSpaceSpinBox->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesLabelBarSpace : true );
mLabelBarSpaceLabel->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesLabelBarSpace : true );
mLabelVerticalPlacementComboBox->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesLabelVerticalPlacement : true );
mLabelVerticalPlacementLabel->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesLabelVerticalPlacement : true );
mLabelHorizontalPlacementComboBox->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesLabelHorizontalPlacement : true );
mLabelHorizontalPlacementLabel->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesLabelHorizontalPlacement : true );
mAlignmentComboBox->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesAlignment : true );
mAlignmentLabel->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesAlignment : true );
mFillSymbol1Button->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesFillSymbol : true );
mFillSymbol1Label->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesFillSymbol : true );
mFillSymbol2Button->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesAlternateFillSymbol : true );
mFillSymbol2Label->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesAlternateFillSymbol : true );
mLineStyleButton->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesLineSymbol : true );
mLineStyleLabel->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesLineSymbol : true );
mDivisionStyleButton->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesDivisionSymbol : true );
mDivisionStyleLabel->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesDivisionSymbol : true );
mSubdivisionStyleButton->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesSubdivisionSymbol : true );
mSubdivisionStyleLabel->setEnabled( renderer ? renderer->flags() & QgsScaleBarRenderer::Flag::FlagUsesSubdivisionSymbol : true );
}

void QgsLayoutScaleBarWidget::mLabelBarSpaceSpinBox_valueChanged( double d )
Expand Down
20 changes: 10 additions & 10 deletions src/ui/layout/qgslayoutscalebarwidgetbase.ui
View file
Expand Up @@ -400,7 +400,7 @@
</property>
<layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0">
<item row="7" column="0">
<widget class="QLabel" name="label_9">
<widget class="QLabel" name="mFillSymbol1Label">
<property name="text">
<string>Primary fill</string>
</property>
Expand All @@ -423,7 +423,7 @@
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="mAlignmentLabel_2">
<widget class="QLabel" name="mFontLabel">
<property name="text">
<string>Font</string>
</property>
Expand Down Expand Up @@ -460,7 +460,7 @@
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_21">
<widget class="QLabel" name="mLabelBarSpaceLabel">
<property name="text">
<string>Label margin</string>
</property>
Expand All @@ -480,35 +480,35 @@
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_11">
<widget class="QLabel" name="mFillSymbol2Label">
<property name="text">
<string>Secondary fill</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_10">
<widget class="QLabel" name="mDivisionStyleLabel">
<property name="text">
<string>Division style</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_8">
<widget class="QLabel" name="mLineStyleLabel">
<property name="text">
<string>Line style</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<widget class="QLabel" name="label_22">
<widget class="QLabel" name="mLabelVerticalPlacementLabel">
<property name="text">
<string>Vertical label placement</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="3">
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="mLabelHorizontalPlacementLabel">
<property name="text">
<string>Horizontal label placement</string>
</property>
Expand All @@ -534,7 +534,7 @@
<widget class="QComboBox" name="mLabelHorizontalPlacementComboBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<widget class="QLabel" name="mBoxSizeLabel">
<property name="text">
<string>Box margin</string>
</property>
Expand All @@ -551,7 +551,7 @@
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="label_12">
<widget class="QLabel" name="mSubdivisionStyleLabel">
<property name="text">
<string>Subdivision style</string>
</property>
Expand Down

0 comments on commit cd46c99

Please sign in to comment.