Hide color schemes from color button menu if they contain no colors

nyalldawson · nyalldawson · commit b3dbe74155f2 · 2014-08-14T17:57:22.000+10:00
diff --git a/python/gui/qgscolorswatchgrid.sip b/python/gui/qgscolorswatchgrid.sip
@@ -53,6 +53,11 @@ class QgsColorSwatchGrid: QWidget
      * @see baseColor
      */
     void setBaseColor( const QColor baseColor );
+    
+    /**Gets the list of colors shown in the grid
+     * @returns list of colors currently shown in the grid
+     */
+    QgsNamedColorList* colors();
 
   public slots:
 
diff --git a/src/gui/qgscolorswatchgrid.cpp b/src/gui/qgscolorswatchgrid.cpp
@@ -335,11 +335,15 @@ QgsColorSwatchGridAction::QgsColorSwatchGridAction( QgsColorScheme* scheme, QMen
     , mSuppressRecurse( false )
 {
   mColorSwatchGrid = new QgsColorSwatchGrid( scheme, context, parent );
+
   setDefaultWidget( mColorSwatchGrid );
   connect( mColorSwatchGrid, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
 
   connect( this, SIGNAL( hovered() ), this, SLOT( onHover() ) );
   connect( mColorSwatchGrid, SIGNAL( hovered() ), this, SLOT( onHover() ) );
+
+  //hide the action if no colors to be shown
+  setVisible( mColorSwatchGrid->colors()->count() > 0 );
 }
 
 QgsColorSwatchGridAction::~QgsColorSwatchGridAction()
@@ -370,6 +374,8 @@ void QgsColorSwatchGridAction::setContext( const QString context )
 void QgsColorSwatchGridAction::refreshColors()
 {
   mColorSwatchGrid->refreshColors();
+  //hide the action if no colors shown
+  setVisible( mColorSwatchGrid->colors()->count() > 0 );
 }
 
 void QgsColorSwatchGridAction::setColor( const QColor &color )
diff --git a/src/gui/qgscolorswatchgrid.h b/src/gui/qgscolorswatchgrid.h
@@ -71,6 +71,11 @@ class GUI_EXPORT QgsColorSwatchGrid: public QWidget
      */
     void setBaseColor( const QColor baseColor );
 
+    /**Gets the list of colors shown in the grid
+     * @returns list of colors currently shown in the grid
+     */
+    QgsNamedColorList* colors() { return &mColors; }
+
   public slots:
 
     /**Reload colors from scheme and redraws the widget

Original file line number	Diff line number	Diff line change
`@@ -335,11 +335,15 @@ QgsColorSwatchGridAction::QgsColorSwatchGridAction( QgsColorScheme* scheme, QMen`
`335`	`335`	`, mSuppressRecurse( false )`
`336`	`336`	`{`
`337`	`337`	`mColorSwatchGrid = new QgsColorSwatchGrid( scheme, context, parent );`
	`338`	`+`
`338`	`339`	`setDefaultWidget( mColorSwatchGrid );`
`339`	`340`	`connect( mColorSwatchGrid, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );`
`340`	`341`
`341`	`342`	`connect( this, SIGNAL( hovered() ), this, SLOT( onHover() ) );`
`342`	`343`	`connect( mColorSwatchGrid, SIGNAL( hovered() ), this, SLOT( onHover() ) );`
	`344`	`+`
	`345`	`+ //hide the action if no colors to be shown`
	`346`	`+ setVisible( mColorSwatchGrid->colors()->count() > 0 );`
`343`	`347`	`}`
`344`	`348`
`345`	`349`	`QgsColorSwatchGridAction::~QgsColorSwatchGridAction()`
`@@ -370,6 +374,8 @@ void QgsColorSwatchGridAction::setContext( const QString context )`
`370`	`374`	`void QgsColorSwatchGridAction::refreshColors()`
`371`	`375`	`{`
`372`	`376`	`mColorSwatchGrid->refreshColors();`
	`377`	`+ //hide the action if no colors shown`
	`378`	`+ setVisible( mColorSwatchGrid->colors()->count() > 0 );`
`373`	`379`	`}`
`374`	`380`
`375`	`381`	`void QgsColorSwatchGridAction::setColor( const QColor &color )`