Color ramp combo box: do not show "random colors" if gradients-only i…

…s on + added option to query whether gradients-only option is enabled
qgis · Feb 14, 2014 · 8b10eb0 · 8b10eb0
1 parent 277d274
commit 8b10eb0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/python/gui/symbology-ng/qgscolorrampcombobox.sip b/python/gui/symbology-ng/qgscolorrampcombobox.sip
@@ -20,7 +20,10 @@ class QgsColorRampComboBox : QComboBox
     //! @note not available in python bindings
     // static QSize rampIconSize;
 
+    //! @note added in 2.2
     void setShowGradientOnly( bool gradientOnly );
+    //! @note added in 2.2
+    bool showGradientOnly() const;
 
   public slots:
     void colorRampChanged( int index );

diff --git a/src/gui/symbology-ng/qgscolorrampcombobox.cpp b/src/gui/symbology-ng/qgscolorrampcombobox.cpp
@@ -54,7 +54,8 @@ void QgsColorRampComboBox::populate( QgsStyleV2* style )
     delete ramp;
   }
 
-  addItem( tr( "Random colors" ) );
+  if ( !mShowGradientOnly )
+    addItem( tr( "Random colors" ) );
   addItem( tr( "New color ramp..." ) );
   connect( this, SIGNAL( activated( int ) ), SLOT( colorRampChanged( int ) ) );
 }

diff --git a/src/gui/symbology-ng/qgscolorrampcombobox.h b/src/gui/symbology-ng/qgscolorrampcombobox.h
@@ -40,7 +40,10 @@ class GUI_EXPORT QgsColorRampComboBox : public QComboBox
     //! @note not available in python bindings
     static QSize rampIconSize;
 
+    //! @note added in 2.2
     void setShowGradientOnly( bool gradientOnly ) { mShowGradientOnly = gradientOnly; }
+    //! @note added in 2.2
+    bool showGradientOnly() const { return mShowGradientOnly; }
 
   public slots:
     void colorRampChanged( int index );