[QGIS Commit] r12771 - in trunk/qgis: python/gui src/gui src/gui/symbology-ng

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-01-15 18:55:23 -0500 (Fri, 15 Jan 2010)
New Revision: 12771

Added:
   trunk/qgis/python/gui/qgscolorbutton.sip
Modified:
   trunk/qgis/python/gui/gui.sip
   trunk/qgis/src/gui/qgscolorbutton.cpp
   trunk/qgis/src/gui/qgscolorbutton.h
   trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
Log:
PyQGIS: added QgsColorButton and QgsColorButtonV2


Modified: trunk/qgis/python/gui/gui.sip
===================================================================
--- trunk/qgis/python/gui/gui.sip	2010-01-15 21:39:08 UTC (rev 12770)
+++ trunk/qgis/python/gui/gui.sip	2010-01-15 23:55:23 UTC (rev 12771)
@@ -7,6 +7,7 @@
 
 %Import core/core.sip
 
+%Include qgscolorbutton.sip
 %Include qgslegendinterface.sip
 %Include qgisinterface.sip
 %Include qgscomposerview.sip

Added: trunk/qgis/python/gui/qgscolorbutton.sip
===================================================================
--- trunk/qgis/python/gui/qgscolorbutton.sip	                        (rev 0)
+++ trunk/qgis/python/gui/qgscolorbutton.sip	2010-01-15 23:55:23 UTC (rev 12771)
@@ -0,0 +1,34 @@
+
+
+class QgsColorButton : QToolButton
+{
+%TypeHeaderCode
+#include <qgscolorbutton.h>
+%End
+
+  public:
+    QgsColorButton( QWidget *parent = 0 );
+    ~QgsColorButton();
+
+    void setColor( const QColor &color );
+    QColor color() const;
+
+  protected:
+    void paintEvent( QPaintEvent *e );
+
+};
+
+
+class QgsColorButtonV2 : QPushButton
+{
+%TypeHeaderCode
+#include <qgscolorbutton.h>
+%End
+
+  public:
+    QgsColorButtonV2( QWidget* parent = 0 );
+    QgsColorButtonV2( QString text, QWidget* parent = 0 );
+
+    void setColor( const QColor &color );
+    QColor color() const;
+};

Modified: trunk/qgis/src/gui/qgscolorbutton.cpp
===================================================================
--- trunk/qgis/src/gui/qgscolorbutton.cpp	2010-01-15 21:39:08 UTC (rev 12770)
+++ trunk/qgis/src/gui/qgscolorbutton.cpp	2010-01-15 23:55:23 UTC (rev 12771)
@@ -75,6 +75,11 @@
 {
 }
 
+QgsColorButtonV2::QgsColorButtonV2( QString text, QWidget* parent )
+  : QPushButton( text, parent )
+{
+}
+
 void QgsColorButtonV2::setColor( const QColor &color )
 {
   mColor = color;

Modified: trunk/qgis/src/gui/qgscolorbutton.h
===================================================================
--- trunk/qgis/src/gui/qgscolorbutton.h	2010-01-15 21:39:08 UTC (rev 12770)
+++ trunk/qgis/src/gui/qgscolorbutton.h	2010-01-15 23:55:23 UTC (rev 12771)
@@ -39,10 +39,11 @@
 };
 
 
-class QgsColorButtonV2 : public QPushButton
+class GUI_EXPORT QgsColorButtonV2 : public QPushButton
 {
   public:
     QgsColorButtonV2( QWidget* parent = 0 );
+    QgsColorButtonV2( QString text, QWidget* parent = 0 );
 
     void setColor( const QColor &color );
     QColor color() const { return mColor; }

Modified: trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp	2010-01-15 21:39:08 UTC (rev 12770)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp	2010-01-15 23:55:23 UTC (rev 12771)
@@ -330,6 +330,8 @@
 
   // change layer to a new (with different type)
   QgsSymbolLayerV2* newLayer = am->createSymbolLayer( QgsStringMap() );
+  if ( newLayer == NULL )
+    return;
   mSymbol->changeSymbolLayer( currentLayerIndex(), newLayer );
 
   updateSymbolLayerWidget( newLayer );