Skip to content

Commit f583a9e

Browse files
committedSep 15, 2014
Renamed visibility "groups" to "presets" to avoid confusion with ordinary groups
If you have a project file using this functionality, you may need to run a simple replace of "visibility-group" to "visibility-preset"
1 parent 48db9a2 commit f583a9e

File tree

8 files changed

+241
-242
lines changed

8 files changed

+241
-242
lines changed
 

‎src/app/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ SET(QGIS_APP_SRCS
108108
qgstipgui.cpp
109109
qgstipfactory.cpp
110110
qgsvectorlayerproperties.cpp
111-
qgsvisibilitygroups.cpp
111+
qgsvisibilitypresets.cpp
112112
qgshandlebadlayers.cpp
113113

114114
composer/qgsattributeselectiondialog.cpp
@@ -247,7 +247,7 @@ SET (QGIS_APP_MOC_HDRS
247247
qgstipfactory.h
248248
qgsundowidget.h
249249
qgsvectorlayerproperties.h
250-
qgsvisibilitygroups.h
250+
qgsvisibilitypresets.h
251251
qgshandlebadlayers.h
252252

253253
composer/qgsattributeselectiondialog.h

‎src/app/composer/qgscomposermapwidget.cpp

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "qgsexpressionbuilderdialog.h"
3838
#include "qgsgenericprojectionselector.h"
3939
#include "qgsproject.h"
40-
#include "qgsvisibilitygroups.h"
40+
#include "qgsvisibilitypresets.h"
4141
#include <QColorDialog>
4242
#include <QFontDialog>
4343
#include <QMessageBox>
@@ -113,12 +113,11 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap ): QgsCo
113113
toggleFrameControls( false, false, false );
114114

115115
QMenu* m = new QMenu( this );
116-
m->addAction( "No groups" )->setEnabled( false );
117-
mLayerListFromGroupButton->setMenu( m );
118-
mLayerListFromGroupButton->setIcon( QgsApplication::getThemeIcon( "/mActionShowAllLayers.png" ) );
119-
mLayerListFromGroupButton->setToolTip( tr( "Set layer list from a visibility group" ) );
116+
mLayerListFromPresetButton->setMenu( m );
117+
mLayerListFromPresetButton->setIcon( QgsApplication::getThemeIcon( "/mActionShowAllLayers.png" ) );
118+
mLayerListFromPresetButton->setToolTip( tr( "Set layer list from a visibility preset" ) );
120119

121-
connect( m, SIGNAL( aboutToShow() ), this, SLOT( aboutToShowVisibilityGroupsMenu() ) );
120+
connect( m, SIGNAL( aboutToShow() ), this, SLOT( aboutToShowVisibilityPresetsMenu() ) );
122121

123122
if ( composerMap )
124123
{
@@ -259,42 +258,42 @@ void QgsComposerMapWidget::compositionAtlasToggled( bool atlasEnabled )
259258
}
260259
}
261260

262-
void QgsComposerMapWidget::aboutToShowVisibilityGroupsMenu()
261+
void QgsComposerMapWidget::aboutToShowVisibilityPresetsMenu()
263262
{
264263
QMenu* menu = qobject_cast<QMenu*>( sender() );
265264
if ( !menu )
266265
return;
267266

268-
QgsVisibilityGroups::GroupRecord rec = QgsVisibilityGroups::instance()->currentStateFromLayerList( mComposerMap->layerSet() );
267+
QgsVisibilityPresets::PresetRecord rec = QgsVisibilityPresets::instance()->currentStateFromLayerList( mComposerMap->layerSet() );
269268

270269
menu->clear();
271-
foreach ( QString groupName, QgsVisibilityGroups::instance()->groups() )
270+
foreach ( QString presetName, QgsVisibilityPresets::instance()->presets() )
272271
{
273-
QAction* a = menu->addAction( groupName, this, SLOT( visibilityGroupSelected() ) );
272+
QAction* a = menu->addAction( presetName, this, SLOT( visibilityPresetSelected() ) );
274273
a->setCheckable( true );
275-
if ( rec == QgsVisibilityGroups::instance()->groupState( groupName ) )
274+
if ( rec == QgsVisibilityPresets::instance()->presetState( presetName ) )
276275
a->setChecked( true );
277276
}
278277

279278
if ( menu->actions().isEmpty() )
280-
menu->addAction( tr( "No groups defined" ) )->setEnabled( false );
279+
menu->addAction( tr( "No presets defined" ) )->setEnabled( false );
281280
}
282281

283-
void QgsComposerMapWidget::visibilityGroupSelected()
282+
void QgsComposerMapWidget::visibilityPresetSelected()
284283
{
285284
QAction* action = qobject_cast<QAction*>( sender() );
286285
if ( !action )
287286
return;
288287

289-
QStringList lst = QgsVisibilityGroups::instance()->groupVisibleLayers( action->text() );
288+
QStringList lst = QgsVisibilityPresets::instance()->presetVisibleLayers( action->text() );
290289
if ( mComposerMap )
291290
{
292291
mKeepLayerListCheckBox->setChecked( true );
293292
mComposerMap->setLayerSet( lst );
294293

295294
// also apply legend node check states
296295
foreach ( QString layerID, lst )
297-
QgsVisibilityGroups::instance()->applyGroupCheckedLegendNodesToLayer( action->text(), layerID );
296+
QgsVisibilityPresets::instance()->applyPresetCheckedLegendNodesToLayer( action->text(), layerID );
298297

299298
mComposerMap->cache();
300299
mComposerMap->update();

‎src/app/composer/qgscomposermapwidget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
155155
/**Enables or disables the atlas controls when composer atlas is toggled on/off*/
156156
void compositionAtlasToggled( bool atlasEnabled );
157157

158-
void aboutToShowVisibilityGroupsMenu();
158+
void aboutToShowVisibilityPresetsMenu();
159159

160-
void visibilityGroupSelected();
160+
void visibilityPresetSelected();
161161

162162
private:
163163
QgsComposerMap* mComposerMap;

‎src/app/qgisapp.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
#include "qgsvectorfilewriter.h"
196196
#include "qgsvectorlayer.h"
197197
#include "qgsvectorlayerproperties.h"
198-
#include "qgsvisibilitygroups.h"
198+
#include "qgsvisibilitypresets.h"
199199
#include "qgsmessagelogviewer.h"
200200
#include "qgsdataitem.h"
201201
#include "qgsmaplayeractionregistry.h"
@@ -2326,12 +2326,12 @@ void QgisApp::initLayerTreeView()
23262326
connect( btnAddGroup, SIGNAL( clicked() ), mLayerTreeView->defaultActions(), SLOT( addGroup() ) );
23272327

23282328
// visibility groups tool button
2329-
QToolButton* btnVisibilityGroups = new QToolButton;
2330-
btnVisibilityGroups->setAutoRaise( true );
2331-
btnVisibilityGroups->setToolTip( tr( "Manage Layer Visibility" ) );
2332-
btnVisibilityGroups->setIcon( QgsApplication::getThemeIcon( "/mActionShowAllLayers.png" ) );
2333-
btnVisibilityGroups->setPopupMode( QToolButton::InstantPopup );
2334-
btnVisibilityGroups->setMenu( QgsVisibilityGroups::instance()->menu() );
2329+
QToolButton* btnVisibilityPresets = new QToolButton;
2330+
btnVisibilityPresets->setAutoRaise( true );
2331+
btnVisibilityPresets->setToolTip( tr( "Manage Layer Visibility" ) );
2332+
btnVisibilityPresets->setIcon( QgsApplication::getThemeIcon( "/mActionShowAllLayers.png" ) );
2333+
btnVisibilityPresets->setPopupMode( QToolButton::InstantPopup );
2334+
btnVisibilityPresets->setMenu( QgsVisibilityPresets::instance()->menu() );
23352335

23362336
// expand / collapse tool buttons
23372337
QToolButton* btnExpandAll = new QToolButton;
@@ -2352,7 +2352,7 @@ void QgisApp::initLayerTreeView()
23522352
QHBoxLayout* toolbarLayout = new QHBoxLayout;
23532353
toolbarLayout->setContentsMargins( QMargins( 5, 0, 5, 0 ) );
23542354
toolbarLayout->addWidget( btnAddGroup );
2355-
toolbarLayout->addWidget( btnVisibilityGroups );
2355+
toolbarLayout->addWidget( btnVisibilityPresets );
23562356
toolbarLayout->addWidget( btnExpandAll );
23572357
toolbarLayout->addWidget( btnCollapseAll );
23582358
toolbarLayout->addWidget( btnRemoveItem );
@@ -3496,7 +3496,7 @@ void QgisApp::fileNew( bool thePromptToSaveFlag, bool forceBlank )
34963496
fileNewFromDefaultTemplate();
34973497
}
34983498

3499-
QgsVisibilityGroups::instance()->clear();
3499+
QgsVisibilityPresets::instance()->clear();
35003500

35013501
// set the initial map tool
35023502
#ifndef HAVE_TOUCH

‎src/app/qgsvisibilitygroups.h

Lines changed: 0 additions & 125 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.