Avoid duplicate 'follow label placement' options in combo box

This commit is contained in:
Nyall Dawson 2016-07-08 17:35:45 +10:00
parent 6c0afcd42e
commit ea3fc65c9d

View File

@ -590,7 +590,14 @@ void QgsLabelingGui::init()
if ( mLayer->geometryType() == QGis::Point )
{
// follow placement alignment is only valid for point layers
mFontMultiLineAlignComboBox->addItem( tr( "Follow label placement" ) );
if ( mFontMultiLineAlignComboBox->findText( tr( "Follow label placement" ) ) == -1 )
mFontMultiLineAlignComboBox->addItem( tr( "Follow label placement" ) );
}
else
{
int idx = mFontMultiLineAlignComboBox->findText( tr( "Follow label placement" ) );
if ( idx >= 0 )
mFontMultiLineAlignComboBox->removeItem( idx );
}
// load labeling settings from layer