sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-06 00:05:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3677 from nirvn/map_themes_signal_fix

Browse Source 
[map themes] fix composer signal name
This commit is contained in:
Nyall Dawson 2016-10-27 15:20:03 +10:00 committed by GitHub
commit 11e5283591
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/composer/qgscomposermapwidget.cpp
View File

@ -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, 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() ) )
{

2
src/app/composer/qgscomposermapwidget.h
View File

@ -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 );