Skip to content

Commit fcdee9a

Browse files
author
Arunmozhi
committed
removed everything related to QgsSymbolV2PropertiesDialog
1 parent 0020a6a commit fcdee9a

8 files changed

+7
-962
lines changed

python/gui/symbology-ng-gui.sip

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,4 @@
11

2-
3-
class QgsSymbolV2PropertiesDialog : QDialog //, private Ui::DlgSymbolV2Properties
4-
{
5-
%TypeHeaderCode
6-
#include <qgssymbolv2propertiesdialog.h>
7-
%End
8-
9-
public:
10-
QgsSymbolV2PropertiesDialog(QgsSymbolV2* symbol, const QgsVectorLayer* vl, QWidget* parent = NULL);
11-
12-
13-
public slots:
14-
void moveLayerDown();
15-
void moveLayerUp();
16-
17-
void addLayer();
18-
void removeLayer();
19-
20-
void lockLayer();
21-
22-
void layerTypeChanged();
23-
24-
void layerChanged();
25-
26-
};
27-
28-
292
class QgsRendererV2PropertiesDialog : QDialog //, private Ui::QgsRendererV2PropsDialogBase
303
{
314
%TypeHeaderCode

src/app/qgsdecorationgriddialog.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "qgsstylev2.h"
2525
#include "qgssymbolv2.h"
2626
#include "qgssymbolv2selectordialog.h"
27-
#include "qgssymbolv2propertiesdialog.h"
2827
#include "qgisapp.h"
2928

3029
#include <QFontDialog>
@@ -212,7 +211,7 @@ void QgsDecorationGridDialog::on_mLineSymbolButton_clicked()
212211
return;
213212

214213
QgsLineSymbolV2* lineSymbol = dynamic_cast<QgsLineSymbolV2*>( mLineSymbol->clone() );
215-
QgsSymbolV2PropertiesDialog dlg( lineSymbol, 0, this );
214+
QgsSymbolV2SelectorDialog dlg( lineSymbol, QgsStyleV2::defaultStyle(), 0, this );
216215
if ( dlg.exec() == QDialog::Rejected )
217216
{
218217
delete lineSymbol;
@@ -235,7 +234,7 @@ void QgsDecorationGridDialog::on_mMarkerSymbolButton_clicked()
235234
return;
236235

237236
QgsMarkerSymbolV2* markerSymbol = dynamic_cast<QgsMarkerSymbolV2*>( mMarkerSymbol->clone() );
238-
QgsSymbolV2PropertiesDialog dlg( markerSymbol, 0, this );
237+
QgsSymbolV2SelectorDialog dlg( markerSymbol, QgsStyleV2::defaultStyle(), 0, this );
239238
if ( dlg.exec() == QDialog::Rejected )
240239
{
241240
delete markerSymbol;

src/gui/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ symbology-ng/qgscolorrampcombobox.cpp
1212
symbology-ng/qgsdashspacedialog.cpp
1313
symbology-ng/qgspenstylecombobox.cpp
1414
symbology-ng/qgssymbollayerv2widget.cpp
15-
symbology-ng/qgssymbolv2propertiesdialog.cpp
1615
symbology-ng/qgsrendererv2widget.cpp
1716
symbology-ng/qgssinglesymbolrendererv2widget.cpp
1817
symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
@@ -105,7 +104,6 @@ raster/qgssinglebandpseudocolorrendererwidget.h
105104

106105
symbology-ng/qgsdashspacedialog.h
107106
symbology-ng/qgssymbollayerv2widget.h
108-
symbology-ng/qgssymbolv2propertiesdialog.h
109107
symbology-ng/qgssinglesymbolrendererv2widget.h
110108
symbology-ng/qgscategorizedsymbolrendererv2widget.h
111109
symbology-ng/qgsgraduatedsymbolrendererv2widget.h

src/gui/symbology-ng/qgssymbollayerv2widget.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@
2222

2323
#include "characterwidget.h"
2424
#include "qgsdashspacedialog.h"
25-
#include "qgssymbolv2propertiesdialog.h"
25+
#include "qgssymbolv2selectordialog.h"
2626
#include "qgssvgcache.h"
2727

28+
#include "qgsstylev2.h" //for symbol selector dialog
29+
2830
#include "qgsapplication.h"
2931

3032
#include "qgslogger.h"
@@ -989,7 +991,7 @@ void QgsSVGFillSymbolLayerWidget::populateIcons( const QModelIndex& idx )
989991

990992
void QgsSVGFillSymbolLayerWidget::on_mChangeOutlinePushButton_clicked()
991993
{
992-
QgsSymbolV2PropertiesDialog dlg( mLayer->subSymbol(), mVectorLayer, this );
994+
QgsSymbolV2SelectorDialog dlg( mLayer->subSymbol(), QgsStyleV2::defaultStyle(), mVectorLayer, this );
993995
if ( dlg.exec() == QDialog::Rejected )
994996
{
995997
return;
@@ -1150,7 +1152,7 @@ void QgsLinePatternFillSymbolLayerWidget::on_mOutlinePushButton_clicked()
11501152
{
11511153
if ( mLayer )
11521154
{
1153-
QgsSymbolV2PropertiesDialog dlg( mLayer->subSymbol(), mVectorLayer, this );
1155+
QgsSymbolV2SelectorDialog dlg( mLayer->subSymbol(), QgsStyleV2::defaultStyle(), mVectorLayer, this );
11541156
if ( dlg.exec() == QDialog::Rejected )
11551157
{
11561158
return;

0 commit comments

Comments
 (0)