Incorporated FieldButton into ColorPaletteDialog. Tweaked ColorPaletteDialog.

2019-07-21 17:08:24 -04:00
parent 8fa34325a5
commit 1e1db1fc89
9 changed files with 112 additions and 339 deletions
@@ -124,15 +124,10 @@ namespace glabels
 	}


-	void ColorButton::setKeys( const QList<QString> keyList )
+	void ColorButton::setKeys( const merge::Merge*     merge,
+	                           const model::Variables* variables )
 	{
-		mDialog->setKeys( keyList );
-	}
-
-
-	void ColorButton::clearKeys()
-	{
-		mDialog->clearKeys();
+		mDialog->setKeys( merge, variables );
 	}