Added color button class.

glabels/CMakeLists.txt

@@ -9,6 +9,7 @@ set (glabels_sources
   BarcodeMenuButton.cpp
   BarcodeMenuItem.cpp
   BarcodeStyle.cpp
+  ColorButton.cpp
   ColorHistory.cpp
   ColorNode.cpp
   ColorPaletteDialog.cpp
@@ -35,6 +36,7 @@ set (glabels_qobject_headers
   BarcodeMenu.h
   BarcodeMenuButton.h
   BarcodeMenuItem.h
+  ColorButton.h
   ColorHistory.h
   ColorPaletteDialog.h
   ColorPaletteItem.h

glabels/ColorButton.cpp

@@ -0,0 +1,138 @@
+/*  ColorButton.cpp
+ *
+ *  Copyright (C) 2014  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ColorButton.h"
+
+#include "ColorSwatch.h"
+#include <QIcon>
+
+
+namespace
+{
+	const int SWATCH_W = 100;
+	const int SWATCH_H =  24;
+}
+
+
+namespace glabels
+{
+
+	ColorButton::ColorButton( const QString& defaultLabel,
+				  const QColor&  defaultColor,
+				  const QColor&  color,
+				  QWidget*       parent )
+		: QPushButton( parent )
+	{
+		mDefaultColor = defaultColor;
+		mColorNode = ColorNode( color );
+
+		setIcon( QIcon( ColorSwatch( SWATCH_W, SWATCH_H, color ) ) );
+		setText( "" );
+
+		mDialog = new ColorPaletteDialog( defaultLabel, defaultColor, color );
+		mDialog->setModal( true );
+
+		connect( this, SIGNAL(pressed()), this, SLOT(onButtonPressed()) );
+		connect( mDialog, SIGNAL(changed(colorNode,bool)), this, SLOT(onColorPaletteDialogChanged(colorNode,bool)) );
+	}
+
+
+	void ColorButton::setColorNode( ColorNode colorNode )
+	{
+		mIsDefault = false;
+
+		mColorNode = colorNode;
+
+		if ( colorNode.fieldFlag() )
+		{
+			setIcon( QIcon() );
+			setText( colorNode.key() );
+		}
+		else
+		{
+			setIcon( QIcon( ColorSwatch( SWATCH_W, SWATCH_H, colorNode.color() ) ) );
+			setText( "" );
+		}
+	}
+
+
+	void ColorButton::setColor( QColor color )
+	{
+		mIsDefault = false;
+
+		mColorNode.setFieldFlag( false );
+		mColorNode.setColor( color );
+		mColorNode.setKey( "" );
+
+		setIcon( QIcon( ColorSwatch( SWATCH_W, SWATCH_H, color ) ) );
+		setText( "" );
+	}
+
+
+	void ColorButton::setToDefault()
+	{
+		mIsDefault = true;
+
+		mColorNode.setFieldFlag( false );
+		mColorNode.setColor( mDefaultColor );
+		mColorNode.setKey( "" );
+
+		setIcon( QIcon(ColorSwatch( SWATCH_W, SWATCH_H, mDefaultColor ) ) );
+		setText( "" );
+	}
+
+
+	ColorNode ColorButton::getColorNode( bool& isDefault )
+	{
+		isDefault = mIsDefault;
+		return mColorNode;
+	}
+
+
+	void ColorButton::setKeys( const QList<QString> keyList )
+	{
+		mDialog->setKeys( keyList );
+	}
+
+
+	void ColorButton::clearKeys()
+	{
+		mDialog->clearKeys();
+	}
+
+
+	void ColorButton::onButtonPressed()
+	{
+		setDown( true );
+		// TODO: move dialog -- see menu_position_function is VALA version
+		mDialog->show();
+	}
+
+
+	void ColorButton::onPaletteDialogChanged( ColorNode colorNode, bool isDefault )
+	{
+		mColorNode = colorNode;
+		mIsDefault = isDefault;
+
+		emit colorChanged( colorNode, isDefault );
+	}
+
+
+}

glabels/ColorButton.h

@@ -0,0 +1,98 @@
+/*  ColorButton.h
+ *
+ *  Copyright (C) 2014  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef glabels_ColorButton_h
+#define glabels_ColorButton_h
+
+#include <QPushButton>
+
+#include "ColorNode.h"
+#include "ColorPaletteDialog.h"
+
+
+namespace glabels
+{
+
+	///
+	/// Color Button
+	///
+	class ColorButton : public QPushButton
+	{
+		Q_OBJECT
+
+
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	public:
+		ColorButton( const QString& defaultLabel,
+		             const QColor&  defaultColor,
+		             const QColor&  color,
+		             QWidget*       parent = 0 );
+
+
+		/////////////////////////////////
+		// Signals
+		/////////////////////////////////
+	signals:
+		void colorChanged( ColorNode colorNode, bool isDefault );
+
+
+		/////////////////////////////////
+		// Public Methods
+		/////////////////////////////////
+	public:
+		void   setColorNode( ColorNode colorNode );
+		void   setColor( QColor color );
+		void   setToDefault();
+		ColorNode getColorNode( bool& isDefault );
+		void   setKeys( const QList<QString> keyList );
+		void   clearKeys();
+
+
+		/////////////////////////////////
+		// Slots
+		/////////////////////////////////
+	private slots:
+		void onButtonPressed();
+		void onPaletteDialogChanged( ColorNode colorNode, bool isDefault );
+
+
+		/////////////////////////////////
+		// Private Methods
+		/////////////////////////////////
+	private:
+
+
+		/////////////////////////////////
+		// Private Members
+		/////////////////////////////////
+	private:
+		QColor              mDefaultColor;
+		bool                mIsDefault;
+		ColorNode           mColorNode;
+
+		ColorPaletteDialog* mDialog;
+	};
+
+}
+
+
+#endif // glabels_ColorButton_h

glabels/ColorPaletteDialog.cpp

@@ -72,8 +72,8 @@ namespace glabels
 
 
 	ColorPaletteDialog::ColorPaletteDialog( const QString& defaultLabel,
-						QColor         defaultColor,
+						const QColor&  defaultColor,
-						QColor         color,
+						const QColor&  color,
 						QWidget*       parent )
 		: QDialog( parent )
 	{

glabels/ColorPaletteDialog.h

@@ -33,7 +33,7 @@ namespace glabels
 {
 
 	///
-	/// Barcode Backends Database
+	/// Color Palette Dialog
 	///
 	class ColorPaletteDialog : public QDialog
 	{
@@ -45,9 +45,9 @@ namespace glabels
 		/////////////////////////////////
 	public:
 		ColorPaletteDialog( const QString& defaultLabel,
-		                    QColor         defaultColor,
+		                    const QColor&  defaultColor,
-		                    QColor         color,
+		                    const QColor&  color,
-		                    QWidget*       parent );
+		                    QWidget*       parent = 0 );
 
 
 		/////////////////////////////////

glabels/ColorPaletteItem.h

@@ -29,7 +29,7 @@ namespace glabels
 {
 
 	///
-	/// Barcode Menu Item
+	/// Color Palette Item
 	///
 	class ColorPaletteItem : public QPushButton
 	{