Added color variable type.

2019-08-03 17:16:14 -04:00
parent dd41aa3dd7
commit f41461ef26
13 changed files with 248 additions and 107 deletions
@@ -48,8 +48,9 @@ namespace glabels


 	void ColorButton::init( const QString& defaultLabel,
-	                        const QColor& defaultColor,
-	                        const QColor&  color )
+	                        const QColor&  defaultColor,
+	                        const QColor&  color,
+	                        bool           showUseFieldButton )
 	{
 		mDefaultColor = defaultColor;
 		mColorNode = model::ColorNode( color );
@@ -61,7 +62,10 @@ namespace glabels
 		setText( "" );
 		setCheckable( true );

-		mDialog = new ColorPaletteDialog( defaultLabel, defaultColor, color );
+		mDialog = new ColorPaletteDialog( defaultLabel,
+		                                  defaultColor,
+		                                  color,
+		                                  showUseFieldButton );

 		connect( this, SIGNAL(toggled(bool)), this, SLOT(onButtonToggled(bool)) );
 		connect( mDialog, SIGNAL(colorChanged(model::ColorNode,bool)),