removed everything related to QgsSymbolV2PropertiesDialog

qgis · Jul 13, 2012 · fcdee9a · fcdee9a
1 parent 0020a6a
commit fcdee9a
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 962 deletions.
diff --git a/python/gui/symbology-ng-gui.sip b/python/gui/symbology-ng-gui.sip
@@ -1,31 +1,4 @@
 
-
-class QgsSymbolV2PropertiesDialog : QDialog //, private Ui::DlgSymbolV2Properties
-{
-%TypeHeaderCode
-#include <qgssymbolv2propertiesdialog.h>
-%End
-
-public:
-  QgsSymbolV2PropertiesDialog(QgsSymbolV2* symbol, const QgsVectorLayer* vl, QWidget* parent = NULL);
-
-
-public slots:
-  void moveLayerDown();
-  void moveLayerUp();
-
-  void addLayer();
-  void removeLayer();
-
-  void lockLayer();
-
-  void layerTypeChanged();
-
-  void layerChanged();
-
-};
-
-
 class QgsRendererV2PropertiesDialog : QDialog //, private Ui::QgsRendererV2PropsDialogBase
 {
 %TypeHeaderCode

diff --git a/src/app/qgsdecorationgriddialog.cpp b/src/app/qgsdecorationgriddialog.cpp
@@ -24,7 +24,6 @@
 #include "qgsstylev2.h"
 #include "qgssymbolv2.h"
 #include "qgssymbolv2selectordialog.h"
-#include "qgssymbolv2propertiesdialog.h"
 #include "qgisapp.h"
 
 #include <QFontDialog>
@@ -212,7 +211,7 @@ void QgsDecorationGridDialog::on_mLineSymbolButton_clicked()
     return;
 
   QgsLineSymbolV2* lineSymbol = dynamic_cast<QgsLineSymbolV2*>( mLineSymbol->clone() );
-  QgsSymbolV2PropertiesDialog dlg( lineSymbol, 0, this );
+  QgsSymbolV2SelectorDialog dlg( lineSymbol, QgsStyleV2::defaultStyle(), 0, this );
   if ( dlg.exec() == QDialog::Rejected )
   {
     delete lineSymbol;
@@ -235,7 +234,7 @@ void QgsDecorationGridDialog::on_mMarkerSymbolButton_clicked()
     return;
 
   QgsMarkerSymbolV2* markerSymbol = dynamic_cast<QgsMarkerSymbolV2*>( mMarkerSymbol->clone() );
-  QgsSymbolV2PropertiesDialog dlg( markerSymbol, 0, this );
+  QgsSymbolV2SelectorDialog dlg( markerSymbol, QgsStyleV2::defaultStyle(), 0, this );
   if ( dlg.exec() == QDialog::Rejected )
   {
     delete markerSymbol;

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -12,7 +12,6 @@ symbology-ng/qgscolorrampcombobox.cpp
 symbology-ng/qgsdashspacedialog.cpp
 symbology-ng/qgspenstylecombobox.cpp
 symbology-ng/qgssymbollayerv2widget.cpp
-symbology-ng/qgssymbolv2propertiesdialog.cpp
 symbology-ng/qgsrendererv2widget.cpp
 symbology-ng/qgssinglesymbolrendererv2widget.cpp
 symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
@@ -105,7 +104,6 @@ raster/qgssinglebandpseudocolorrendererwidget.h
 
 symbology-ng/qgsdashspacedialog.h
 symbology-ng/qgssymbollayerv2widget.h
-symbology-ng/qgssymbolv2propertiesdialog.h
 symbology-ng/qgssinglesymbolrendererv2widget.h
 symbology-ng/qgscategorizedsymbolrendererv2widget.h
 symbology-ng/qgsgraduatedsymbolrendererv2widget.h

diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -22,9 +22,11 @@
 
 #include "characterwidget.h"
 #include "qgsdashspacedialog.h"
-#include "qgssymbolv2propertiesdialog.h"
+#include "qgssymbolv2selectordialog.h"
 #include "qgssvgcache.h"
 
+#include "qgsstylev2.h" //for symbol selector dialog
+
 #include "qgsapplication.h"
 
 #include "qgslogger.h"
@@ -989,7 +991,7 @@ void QgsSVGFillSymbolLayerWidget::populateIcons( const QModelIndex& idx )
 
 void QgsSVGFillSymbolLayerWidget::on_mChangeOutlinePushButton_clicked()
 {
-  QgsSymbolV2PropertiesDialog dlg( mLayer->subSymbol(), mVectorLayer, this );
+  QgsSymbolV2SelectorDialog dlg( mLayer->subSymbol(), QgsStyleV2::defaultStyle(), mVectorLayer, this );
   if ( dlg.exec() == QDialog::Rejected )
   {
     return;
@@ -1150,7 +1152,7 @@ void QgsLinePatternFillSymbolLayerWidget::on_mOutlinePushButton_clicked()
 {
   if ( mLayer )
   {
-    QgsSymbolV2PropertiesDialog dlg( mLayer->subSymbol(), mVectorLayer, this );
+    QgsSymbolV2SelectorDialog dlg( mLayer->subSymbol(), QgsStyleV2::defaultStyle(), mVectorLayer, this );
     if ( dlg.exec() == QDialog::Rejected )
     {
       return;