Skip to content

Commit

Permalink
Move label repeat option frame to after main placement options for lines
Browse files Browse the repository at this point in the history
  • Loading branch information
dakcarto committed May 23, 2014
1 parent db328fe commit 3ad6de8
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 496 deletions.
5 changes: 3 additions & 2 deletions src/app/qgslabelinggui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
}

lyr.repeatDistance = mRepeatDistanceSpinBox->value();
lyr.repeatDistanceUnit = static_cast<QgsPalLayerSettings::SizeUnit>(1 + mRepeatDistanceUnitWidget->getUnit());
lyr.repeatDistanceUnit = static_cast<QgsPalLayerSettings::SizeUnit>( 1 + mRepeatDistanceUnitWidget->getUnit() );
lyr.repeatDistanceMapUnitScale = mRepeatDistanceUnitWidget->getMapUnitScale();

lyr.textColor = btnTextColor->color();
Expand Down Expand Up @@ -1018,7 +1018,7 @@ void QgsLabelingGui::populateDataDefinedButtons( QgsPalLayerSettings& s )
mRepeatDistanceDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::RepeatDistance ),
QgsDataDefinedButton::AnyType, QgsDataDefinedButton::doublePosDesc() );
mRepeatDistanceUnitDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::DistanceUnits ),
QgsDataDefinedButton::String, QgsDataDefinedButton::unitsMmMuDesc() );
QgsDataDefinedButton::String, QgsDataDefinedButton::unitsMmMuDesc() );

// data defined-only
QString ddPlaceInfo = tr( "In edit mode, layer's relevant labeling map tool is:<br>"
Expand Down Expand Up @@ -1293,6 +1293,7 @@ void QgsLabelingGui::updatePlacementWidgets()
mPlacementOffsetFrame->setVisible( showOffsetFrame );
mPlacementDistanceFrame->setVisible( showDistanceFrame );
mPlacementRotationFrame->setVisible( showRotationFrame );
mPlacmentRepeatDistanceFrame->setVisible( curWdgt == pageLine );
mPlacementMaxCharAngleFrame->setVisible( showMaxCharAngleFrame );

mMultiLinesFrame->setEnabled( enableMultiLinesFrame );
Expand Down

0 comments on commit 3ad6de8

Please sign in to comment.