Fleshing out of using merge for colors.

2016-05-17 23:31:52 -04:00
parent d7480f9bb8
commit 669c1d02e7
16 changed files with 87 additions and 25 deletions
@@ -27,6 +27,8 @@
 #include "ColorNode.h"
 #include "ColorHistory.h"
 #include "ColorPaletteItem.h"
+#include "ColorPaletteButtonItem.h"
+#include "FieldMenu.h"


 ///
@@ -59,7 +61,7 @@ signals:
 	/////////////////////////////////
 public:
 	void   setColorNode( const ColorNode& colorNode );
-	void   setKeys( const QList<QString> keyList );
+	void   setKeys( const QStringList& keyList );
 	void   clearKeys();


@@ -72,6 +74,8 @@ private slots:
 	void onHistoryItemActivated( int id );
 	void onCustomColorItemActivated();
 	void onColorHistoryChanged();
+	void onMergeFieldItemActivated();
+	void onFieldMenuItemActivated( QString key );


 	/////////////////////////////////
@@ -101,6 +105,9 @@ private:
 	ColorHistory* mColorHistory;
 	ColorPaletteItem* mHistoryItem[PALETTE_COLS];

+	FieldMenu* mFieldMenu;
+	ColorPaletteButtonItem* mMergeFieldButton;
+
 };