Midway commit; implements symbols listing/changing in symbol selector

qgis · Jul 9, 2012 · 82dfbac · 82dfbac
1 parent 1d770bf
commit 82dfbac
Show file tree

Hide file tree

Showing 7 changed files with 582 additions and 573 deletions.
diff --git a/python/gui/symbology-ng-gui.sip b/python/gui/symbology-ng-gui.sip
@@ -71,27 +71,34 @@ class QgsSymbolV2SelectorDialog : QDialog //, private Ui::QgsSymbolV2SelectorDia
 %TypeHeaderCode
 #include <qgssymbolv2selectordialog.h>
 %End
+  public:
+    QgsSymbolV2SelectorDialog( QgsSymbolV2* symbol, QgsStyleV2* style, const QgsVectorLayer* vl, QWidget* parent = NULL, bool embedded = false );
 
-public:
+    QMenu* advancedMenu();
-  QgsSymbolV2SelectorDialog(QgsSymbolV2* symbol, QgsStyleV2* style, const QgsVectorLayer* vl, QWidget* parent = NULL, bool embedded = false);
-
-protected:
-  void populateSymbolView();
-  void updateSymbolPreview();
-  void updateSymbolColor();
-  void updateSymbolInfo();
-
 
-public slots:
+  protected:
-  void changeSymbolProperties();
+    void keyPressEvent( QKeyEvent * event );
-  void setSymbolFromStyle(const QModelIndex & index);
+
-  void setSymbolColor();
+    void loadSymbol();
-  void setMarkerAngle(double angle);
+    void updateUi();
-  void setMarkerSize(double size);
+    void updateLockButton();
-  void setLineWidth(double width);
+    QgsSymbolLayerV2* currentLayer();
-
+    void moveLayerByOffset( int offset );
-signals:
+    void setWidget( QWidget* widget );
-  void symbolModified();
+
+  signals:
+    void symbolModified();
+
+  public slots:
+    void moveLayerDown();
+    void moveLayerUp();
+    void addLayer();
+    void removeLayer();
+    void lockLayer();
+    void layerTypeChanged();
+    void layerChanged();
+    void updateLayerPreview();
+    void updatePreview();
 
 };
 

diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.cpp b/src/gui/symbology-ng/qgssymbolslistwidget.cpp
@@ -46,7 +46,7 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty
 
   QStandardItemModel* model = new QStandardItemModel( viewSymbols );
   viewSymbols->setModel( model );
-  //connect( viewSymbols, SIGNAL( clicked( const QModelIndex & ) ), this, SLOT( setSymbolFromStyle( const QModelIndex & ) ) );
+  connect( viewSymbols, SIGNAL( clicked( const QModelIndex & ) ), this, SLOT( setSymbolFromStyle( const QModelIndex & ) ) );
 
   connect( btnStyleManager, SIGNAL( clicked() ), SLOT( openStyleManager() ) );
   lblSymbolName->setText( "" );
@@ -270,7 +270,16 @@ void QgsSymbolsListWidget::setSymbolFromStyle( const QModelIndex & index )
   emit changed();
 }
 
-
+QMenu* QgsSymbolsListWidget::advancedMenu()
+{
+  if ( mAdvancedMenu == NULL )
+  {
+    mAdvancedMenu = new QMenu;
+    btnAdvanced->setMenu( mAdvancedMenu );
+    btnAdvanced->show();
+  }
+  return mAdvancedMenu;
+}
 
 
 

diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.h b/src/gui/symbology-ng/qgssymbolslistwidget.h
@@ -22,7 +22,6 @@
 
 class QgsSymbolV2;
 class QgsStyleV2;
-class QgsVectorLayer;
 
 class QMenu;
 
@@ -57,7 +56,6 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::WidgetSymbol
     QgsSymbolV2* mSymbol;
     QgsStyleV2* mStyle;
     QMenu* mAdvancedMenu;
-    const QgsVectorLayer* mVectorLayer;
 
     void populateSymbolView();
     void updateSymbolColor();