Incorporated FieldButton into ColorPaletteDialog. Tweaked ColorPaletteDialog.

glabels/ColorPaletteDialog.h

@@ -24,11 +24,10 @@
 
 #include "ColorHistory.h"
 #include "ColorPaletteItem.h"
-#include "ColorPaletteButtonItem.h"
+#include "FieldButton.h"
 
 #include "model/ColorNode.h"
 
-#include <QComboBox>
 #include <QDialog>
 
 
@@ -64,25 +63,23 @@ namespace glabels
 		// Public Methods
 		/////////////////////////////////
 	public:
-		void   setColorNode( const model::ColorNode& colorNode );
-		void   setKeys( const QStringList& keyList );
-		void   clearKeys();
+		void setColorNode( const model::ColorNode& colorNode );
+		
+		void setKeys( const merge::Merge*     merge,
+		              const model::Variables* variables );
 
 
 		/////////////////////////////////
 		// Slots
 		/////////////////////////////////
 	private slots:
-		void onDefaultItemActivated();
 		void onPaletteItemActivated( int id );
 		void onHistoryItemActivated( int id );
-		void onCustomColorItemActivated();
+		void onDefaultButtonClicked();
+		void onCustomColorButtonClicked();
+		void onKeySelected( QString key );
 		void onColorHistoryChanged();
-		void onComboIndexChanged( int index );
 
-	protected:
-		void showEvent( QShowEvent* event ) override;
-	
 
 		/////////////////////////////////
 		// Private Methods
@@ -111,8 +108,7 @@ namespace glabels
 		ColorHistory* mColorHistory;
 		ColorPaletteItem* mHistoryItem[PALETTE_COLS];
 
-		QComboBox* mMergeFieldCombo;
-		QStringList mKeys;
+		FieldButton* mFieldButton;
 
 	};