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
@@ -63,8 +63,9 @@ namespace glabels
 		void   setColor( QColor color );
 		void   setToDefault();
 		model::ColorNode colorNode();
-		void   setKeys( const QList<QString> keyList );
-		void   clearKeys();
+
+		void setKeys( const merge::Merge*     merge,
+		              const model::Variables* variables );


 		/////////////////////////////////