Skip to content
Permalink
Browse files

Remame mustPopulate and shorten warning message

  • Loading branch information
troopa81 authored and nyalldawson committed May 13, 2020
1 parent bff6095 commit f857c5001dc00050a3d4f911c5d558c081b21a74
Showing with 5 additions and 5 deletions.
  1. +4 −4 src/gui/qgsmaskingwidget.cpp
  2. +1 −1 src/gui/qgsmaskingwidget.h
@@ -51,7 +51,7 @@ void QgsMaskingWidget::onSelectionChanged()
}
else if ( !mMessageBarItem && printMessage )
{
mMessageBarItem = new QgsMessageBarItem( tr( "You need to select both mask sources and masked symbol layers. If not, all configuration will be lost" ), Qgis::Warning, 0, this );
mMessageBarItem = new QgsMessageBarItem( tr( "Select both sources and symbol layers or your configuration will be lost" ), Qgis::Warning, 0, this );
mMessageBar->pushItem( mMessageBarItem );
}

@@ -63,12 +63,12 @@ void QgsMaskingWidget::showEvent( QShowEvent *event )
Q_UNUSED( event );

// populate is quite long, so we delay it when the widget is first shown
if ( _mustPopulate )
if ( mMustPopulate )
{
disconnect( mMaskTargetsWidget, &QgsSymbolLayerSelectionWidget::changed, this, &QgsMaskingWidget::onSelectionChanged );
disconnect( mMaskSourcesWidget, &QgsMaskSourceSelectionWidget::changed, this, &QgsMaskingWidget::onSelectionChanged );

_mustPopulate = false;
mMustPopulate = false;
populate();

connect( mMaskTargetsWidget, &QgsSymbolLayerSelectionWidget::changed, this, &QgsMaskingWidget::onSelectionChanged );
@@ -169,7 +169,7 @@ void QgsMaskingWidget::setLayer( QgsVectorLayer *layer )
if ( mLayer != layer )
{
mLayer = layer;
_mustPopulate = true;
mMustPopulate = true;
}
}

@@ -63,7 +63,7 @@ class GUI_EXPORT QgsMaskingWidget: public QgsPanelWidget, private Ui::QgsMasking
void populate();

QgsMessageBarItem *mMessageBarItem = nullptr;
bool _mustPopulate = false;
bool mMustPopulate = false;
};

#endif

0 comments on commit f857c50

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