Skip to content
Permalink
Browse files

Followup to b383c69. Keep labeling dialog from calling init() twice f…

…rom vector props dialog
  • Loading branch information
dakcarto committed Jun 10, 2013
1 parent 112ad3c commit b9d0bc87c01204d644fde03afab610bccb86e901
Showing with 1 addition and 3 deletions.
  1. +1 −0 src/app/qgisapp.cpp
  2. +0 −3 src/app/qgslabelinggui.cpp
@@ -4295,6 +4295,7 @@ void QgisApp::labeling()
QDialog *dlg = new QDialog( this );
dlg->setWindowTitle( tr( "Layer labeling settings" ) );
QgsLabelingGui *labelingGui = new QgsLabelingGui( mLBL, vlayer, mMapCanvas, dlg );
labelingGui->init(); // load QgsPalLayerSettings for layer
labelingGui->layout()->setContentsMargins( 0, 0, 0, 0 );
QVBoxLayout *layout = new QVBoxLayout( dlg );
layout->addWidget( labelingGui );
@@ -184,9 +184,6 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
// TODO: is this necessary? maybe just use the data defined-only rotation?
mPointAngleDDBtn->setVisible( false );

// load layer's current QgsPalLayerSettings
init();

// Global settings group for groupboxes' saved/retored collapsed state
// maintains state across different dialogs
foreach ( QgsCollapsibleGroupBox *grpbox, findChildren<QgsCollapsibleGroupBox*>() )

0 comments on commit b9d0bc8

Please sign in to comment.
You can’t perform that action at this time.