Use a combo box for merge field selection.

2016-05-20 23:54:46 -04:00
parent 1ce647b9a9
commit 7b9f377b1a
2 changed files with 54 additions and 25 deletions
@@ -30,6 +30,8 @@
 #include "ColorPaletteButtonItem.h"
 #include "FieldMenu.h"

+class QComboBox; // Forward reference
+

 ///
 /// Color Palette Dialog
@@ -74,9 +76,11 @@ private slots:
 	void onHistoryItemActivated( int id );
 	void onCustomColorItemActivated();
 	void onColorHistoryChanged();
-	void onMergeFieldItemActivated();
-	void onFieldMenuItemActivated( QString key );
+	void onComboIndexChanged( int index );

+protected:
+	void showEvent( QShowEvent* event );
+	

 	/////////////////////////////////
 	// Private Methods
@@ -105,8 +109,8 @@ private:
 	ColorHistory* mColorHistory;
 	ColorPaletteItem* mHistoryItem[PALETTE_COLS];

-	FieldMenu* mFieldMenu;
-	ColorPaletteButtonItem* mMergeFieldButton;
+	QComboBox* mMergeFieldCombo;
+	QStringList mKeys;

 };