Skip to content

Commit 0914b74

Browse files
NathanW2NathanW2
committedJun 20, 2016
Rename Map Styling Dock to Layer Styling Dock
1 parent 1cd7808 commit 0914b74

27 files changed

+130
-182
lines changed
 

‎python/gui/qgisinterface.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,10 @@ class QgisInterface : QObject
293293
virtual void unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory ) = 0;
294294

295295
/** Register a new tab in the layer properties dialog */
296-
virtual void registerMapStylePanelFactory( QgsMapStylingPanelFactory* factory ) = 0;
296+
virtual void registerMapStylePanelFactory( QgsLayerStylingPanelFactory* factory ) = 0;
297297

298298
/** Unregister a previously registered tab in the layer properties dialog */
299-
virtual void unregisterMapStylePanelFactory( QgsMapStylingPanelFactory* factory ) = 0;
299+
virtual void unregisterMapStylePanelFactory( QgsLayerStylingPanelFactory* factory ) = 0;
300300

301301
// @todo is this deprecated in favour of QgsContextHelp?
302302
/** Open a url in the users browser. By default the QGIS doc directory is used

‎python/gui/qgsmaplayerstylemanagerwidget.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @brief The QgsMapLayerStyleManagerWidget class which is used to visually manage
33
* the layer styles.
44
*/
5-
class QgsMapLayerStyleManagerWidget : QgsMapStylingPanel
5+
class QgsMapLayerStyleManagerWidget : QgsLayerStylingPanel
66
{
77
%TypeHeaderCode
88
#include "qgsmaplayerstylemanagerwidget.h"

‎python/gui/qgsmapstylepanel.sip

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* \class A panel widget that can be shown in the map style dock
33
* \note added in QGIS 2.16
44
*/
5-
class QgsMapStylingPanel : public QgsPanelWidget
5+
class QgsLayerStylingPanel : public QgsPanelWidget
66
{
77
%TypeHeaderCode
88
#include <qgsmapstylepanel.h>
@@ -16,7 +16,7 @@ public:
1616
* @note The widget is created each time the panel is selected in the dock.
1717
* Keep the loading light as possible for speed in the UI.
1818
*/
19-
QgsMapStylingPanel(QgsMapLayer* layer, QgsMapCanvas *canvas, QWidget *parent = 0);
19+
QgsLayerStylingPanel(QgsMapLayer* layer, QgsMapCanvas *canvas, QWidget *parent = 0);
2020

2121
signals:
2222
/**
@@ -38,10 +38,10 @@ public slots:
3838

3939

4040
/** \ingroup gui
41-
* \class QgsMapStylePanelFactory
41+
* \class QgsLayerStylingPanelFactory
4242
* \note added in QGIS 2.16
4343
*/
44-
class QgsMapStylingPanelFactory
44+
class QgsLayerStylingPanelFactory
4545
{
4646
%TypeHeaderCode
4747
#include <qgsmapstylepanel.h>
@@ -50,10 +50,10 @@ class QgsMapStylingPanelFactory
5050
typedef QFlags<QgsMapLayer::LayerType> LayerTypesFlags;
5151

5252
/** Constructor */
53-
QgsMapStylingPanelFactory();
53+
QgsLayerStylingPanelFactory();
5454

5555
/** Destructor */
56-
virtual ~QgsMapStylingPanelFactory();
56+
virtual ~QgsLayerStylingPanelFactory();
5757

5858
/**
5959
* @brief The icon that will be shown in the UI for the panel.
@@ -80,7 +80,7 @@ class QgsMapStylingPanelFactory
8080
* @param layer The active layer in the dock.
8181
* @param canvas The map canvas.
8282
* @param parent The parent of the widget.
83-
* @return A new QgsMapStylePanel which is shown in the map style dock.
83+
* @return A new QgsLayerStylingPanel which is shown in the map style dock.
8484
*/
85-
virtual QgsMapStylingPanel* createPanel( QgsMapLayer* layer, QgsMapCanvas *canvas, QWidget* parent /TransferThis/ ) = 0 /Factory/;
85+
virtual QgsLayerStylingPanel* createPanel( QgsMapLayer* layer, QgsMapCanvas *canvas, QWidget* parent /TransferThis/ ) = 0 /Factory/;
8686
};

‎python/gui/raster/qgsrendererrasterpropertieswidget.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class QgsRendererRasterPropertiesWidget : QgsMapStylingPanel
1+
class QgsRendererRasterPropertiesWidget : QgsLayerStylingPanel
22
{
33
%TypeHeaderCode
44
#include <qgsrendererrasterpropertieswidget.h>

‎src/app/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ SET(QGIS_APP_SRCS
9898
nodetool/qgsvertexentry.cpp
9999
nodetool/qgsnodeeditor.cpp
100100

101-
qgsmapstylingwidget.cpp
101+
qgslayerstylingwidget.cpp
102102
qgsmeasuredialog.cpp
103103
qgsmeasuretool.cpp
104104
qgsmergeattributesdialog.cpp
@@ -277,7 +277,7 @@ SET (QGIS_APP_MOC_HDRS
277277
nodetool/qgsselectedfeature.h
278278
nodetool/qgsnodeeditor.h
279279

280-
qgsmapstylingwidget.h
280+
qgslayerstylingwidget.h
281281
qgsmeasuredialog.h
282282
qgsmeasuretool.h
283283
qgsmergeattributesdialog.h

‎src/app/qgisapp.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
#include <qgsnetworkaccessmanager.h>
7676
#include <qgsapplication.h>
7777
#include <qgscomposition.h>
78-
#include <qgsmapstylingwidget.h>
78+
#include <qgslayerstylingwidget.h>
7979

8080
#include <QNetworkReply>
8181
#include <QNetworkProxy>
@@ -772,11 +772,11 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
772772
addDockWidget( Qt::LeftDockWidgetArea, mUndoDock );
773773
mUndoDock->hide();
774774

775-
startProfile( "Map Style dock" );
775+
startProfile( "Layer Style dock" );
776776
mMapStylingDock = new QgsDockWidget( this );
777-
mMapStylingDock->setWindowTitle( tr( "Map Styling" ) );
778-
mMapStylingDock->setObjectName( "MapStyling" );
779-
mMapStyleWidget = new QgsMapStylingWidget( mMapCanvas, mMapStylePanelFactories );
777+
mMapStylingDock->setWindowTitle( tr( "Layer Styling" ) );
778+
mMapStylingDock->setObjectName( "LayerStyling" );
779+
mMapStyleWidget = new QgsLayerStylingWidget( mMapCanvas, mMapStylePanelFactories );
780780
mMapStylingDock->setWidget( mMapStyleWidget );
781781
connect( mMapStyleWidget, SIGNAL( styleChanged( QgsMapLayer* ) ), this, SLOT( updateLabelToolButtons() ) );
782782
connect( mMapStylingDock, SIGNAL( visibilityChanged( bool ) ), mActionStyleDock, SLOT( setChecked( bool ) ) );
@@ -3006,9 +3006,9 @@ void QgisApp::initLayerTreeView()
30063006
mLegendExpressionFilterButton->setToolTip( tr( "Filter legend by expression" ) );
30073007
connect( mLegendExpressionFilterButton, SIGNAL( toggled( bool ) ), this, SLOT( toggleFilterLegendByExpression( bool ) ) );
30083008

3009-
mActionStyleDock = new QAction( tr( "Map Styling" ), this );
3009+
mActionStyleDock = new QAction( tr( "Layer Styling" ), this );
30103010
mActionStyleDock->setCheckable( true );
3011-
mActionStyleDock->setToolTip( tr( "Open the map styling dock" ) );
3011+
mActionStyleDock->setToolTip( tr( "Open the layer styling dock" ) );
30123012
mActionStyleDock->setShortcut( QString( "F7" ) );
30133013
mActionStyleDock->setIcon( QgsApplication::getThemeIcon( "propertyicons/symbology.svg" ) );
30143014
connect( mActionStyleDock, SIGNAL( toggled( bool ) ), this, SLOT( mapStyleDock( bool ) ) );
@@ -9094,12 +9094,12 @@ void QgisApp::unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory*
90949094
mMapLayerPropertiesFactories.removeAll( factory );
90959095
}
90969096

9097-
void QgisApp::registerMapStylePanelFactory( QgsMapStylingPanelFactory *factory )
9097+
void QgisApp::registerMapStylePanelFactory( QgsLayerStylingPanelFactory *factory )
90989098
{
90999099
mMapStylePanelFactories << factory;
91009100
}
91019101

9102-
void QgisApp::unregisterMapStylePanelFactory( QgsMapStylingPanelFactory *factory )
9102+
void QgisApp::unregisterMapStylePanelFactory( QgsLayerStylingPanelFactory *factory )
91039103
{
91049104
mMapStylePanelFactories.removeAll( factory );
91059105
}

‎src/app/qgisapp.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class QgsLayerTreeView;
5858
class QgsMapCanvas;
5959
class QgsMapLayer;
6060
class QgsMapLayerPropertiesFactory;
61-
class QgsMapStylingPanelFactory;
61+
class QgsLayerStylingPanelFactory;
6262
class QgsMapTip;
6363
class QgsMapTool;
6464
class QgsMapToolAdvancedDigitizing;
@@ -98,7 +98,7 @@ class QgsDataItem;
9898
class QgsTileScaleWidget;
9999

100100
class QgsLabelingWidget;
101-
class QgsMapStylingWidget;
101+
class QgsLayerStylingWidget;
102102
class QgsDiagramProperties;
103103

104104
#include <QMainWindow>
@@ -514,10 +514,10 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
514514
void unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory );
515515

516516
/** Register a new tab in the layer properties dialog */
517-
void registerMapStylePanelFactory( QgsMapStylingPanelFactory* factory );
517+
void registerMapStylePanelFactory( QgsLayerStylingPanelFactory* factory );
518518

519519
/** Unregister a previously registered tab in the layer properties dialog */
520-
void unregisterMapStylePanelFactory( QgsMapStylingPanelFactory* factory );
520+
void unregisterMapStylePanelFactory( QgsLayerStylingPanelFactory* factory );
521521

522522
public slots:
523523
void layerTreeViewDoubleClicked( const QModelIndex& index );
@@ -1735,7 +1735,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
17351735

17361736
QgsPluginManager *mPluginManager;
17371737
QgsDockWidget *mMapStylingDock;
1738-
QgsMapStylingWidget* mMapStyleWidget;
1738+
QgsLayerStylingWidget* mMapStyleWidget;
17391739

17401740
QgsComposerManager *mComposerManager;
17411741

@@ -1781,7 +1781,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
17811781
QgsSnappingUtils* mSnappingUtils;
17821782

17831783
QList<QgsMapLayerPropertiesFactory*> mMapLayerPropertiesFactories;
1784-
QList<QgsMapStylingPanelFactory*> mMapStylePanelFactories;
1784+
QList<QgsLayerStylingPanelFactory*> mMapStylePanelFactories;
17851785

17861786
QDateTime mProjectLastModified;
17871787

‎src/app/qgisappinterface.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,12 +485,12 @@ void QgisAppInterface::unregisterMapLayerPropertiesFactory( QgsMapLayerPropertie
485485
qgis->unregisterMapLayerPropertiesFactory( factory );
486486
}
487487

488-
void QgisAppInterface::registerMapStylePanelFactory( QgsMapStylingPanelFactory *factory )
488+
void QgisAppInterface::registerMapStylePanelFactory( QgsLayerStylingPanelFactory *factory )
489489
{
490490
qgis->registerMapStylePanelFactory( factory );
491491
}
492492

493-
void QgisAppInterface::unregisterMapStylePanelFactory( QgsMapStylingPanelFactory *factory )
493+
void QgisAppInterface::unregisterMapStylePanelFactory( QgsLayerStylingPanelFactory *factory )
494494
{
495495
qgis->unregisterMapStylePanelFactory( factory );
496496
}

‎src/app/qgisappinterface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,10 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
302302
virtual void unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory ) override;
303303

304304
/** Register a new tab in the layer properties dialog */
305-
virtual void registerMapStylePanelFactory( QgsMapStylingPanelFactory* factory ) override;
305+
virtual void registerMapStylePanelFactory( QgsLayerStylingPanelFactory* factory ) override;
306306

307307
/** Unregister a previously registered tab in the layer properties dialog */
308-
virtual void unregisterMapStylePanelFactory( QgsMapStylingPanelFactory* factory ) override;
308+
virtual void unregisterMapStylePanelFactory( QgsLayerStylingPanelFactory* factory ) override;
309309

310310
/** Accessors for inserting items into menus and toolbars.
311311
* An item can be inserted before any existing action.

‎src/app/qgslabelingwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "qgisapp.h"
2626

2727
QgsLabelingWidget::QgsLabelingWidget( QgsVectorLayer* layer, QgsMapCanvas* canvas, QWidget* parent )
28-
: QgsMapStylingPanel( layer, canvas, parent )
28+
: QgsLayerStylingPanel( layer, canvas, parent )
2929
, mLayer( layer )
3030
, mCanvas( canvas )
3131
, mWidget( nullptr )

‎src/app/qgslabelingwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class QgsMapLayer;
3232
/**
3333
* Master widget for configuration of labeling of a vector layer
3434
*/
35-
class QgsLabelingWidget : public QgsMapStylingPanel, private Ui::QgsLabelingWidget
35+
class QgsLabelingWidget : public QgsLayerStylingPanel, private Ui::QgsLabelingWidget
3636
{
3737
Q_OBJECT
3838
public:

0 commit comments

Comments
 (0)
Please sign in to comment.