Skip to content
Permalink
Browse files

Merge pull request #3677 from nirvn/map_themes_signal_fix

[map themes] fix composer signal name
  • Loading branch information
nyalldawson committed Oct 27, 2016
2 parents 1d09538 + 8a809b8 commit 11e528359181cfe10b1b55aa97f069defe3a9776
Showing with 5 additions and 5 deletions.
  1. +4 −4 src/app/composer/qgscomposermapwidget.cpp
  2. +1 −1 src/app/composer/qgscomposermapwidget.h
@@ -67,9 +67,9 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap )
// follow preset combo
mFollowVisibilityPresetCombo->setModel( new QStringListModel( mFollowVisibilityPresetCombo ) );
connect( mFollowVisibilityPresetCombo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( followVisibilityPresetSelected( int ) ) );
connect( QgsProject::instance()->mapThemeCollection(), SIGNAL( presetsChanged() ),
this, SLOT( onPresetsChanged() ) );
onPresetsChanged();
connect( QgsProject::instance()->mapThemeCollection(), SIGNAL( mapThemesChanged() ),

This comment has been minimized.

Copy link
@m-kuhn

m-kuhn Oct 27, 2016

Member

So... any reason not to use the new style?

this, SLOT( onMapThemesChanged() ) );
onMapThemesChanged();

// keep layers from preset button
QMenu* menuKeepLayers = new QMenu( this );
@@ -213,7 +213,7 @@ void QgsComposerMapWidget::keepLayersVisibilityPresetSelected()
}
}

void QgsComposerMapWidget::onPresetsChanged()
void QgsComposerMapWidget::onMapThemesChanged()
{
if ( QStringListModel* model = qobject_cast<QStringListModel*>( mFollowVisibilityPresetCombo->model() ) )
{
@@ -116,7 +116,7 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
void followVisibilityPresetSelected( int currentIndex );
void keepLayersVisibilityPresetSelected();

void onPresetsChanged();
void onMapThemesChanged();

void updateOverviewFrameStyleFromWidget();
void cleanUpOverviewFrameStyleSelector( QgsPanelWidget* container );

0 comments on commit 11e5283

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