Added color pallette item class.

glabels/CMakeLists.txt

@@ -10,6 +10,7 @@ set (glabels_sources
   BarcodeMenuItem.cpp
   BarcodeStyle.cpp
   ColorNode.cpp
+  ColorPalletteItem.cpp
   ColorSwatch.cpp
   File.cpp
   Help.cpp
@@ -32,6 +33,7 @@ set (glabels_qobject_headers
   BarcodeMenu.h
   BarcodeMenuButton.h
   BarcodeMenuItem.h
+  ColorPalletteItem.h
   LabelModel.h
   LabelModelObject.h
   LabelModelBoxObject.h

glabels/ColorPalletteItem.cpp

@@ -0,0 +1,80 @@
+/*  ColorPalletteItem.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 "ColorPalletteItem.h"
+
+#include "ColorSwatch.h"
+
+
+//
+// Private Configuration Data
+//
+namespace
+{
+	const double  wSwatch = 20;
+	const double  hSwatch = 20;
+}
+
+
+namespace glabels
+{
+
+	///
+	/// Constructor From Data
+	///
+	ColorPalletteItem::ColorPalletteItem( int            id,
+					      const QColor&  color,
+					      const QString& tip,
+					      QWidget*       parent )
+		: QPushButton(parent), mId(id), mColor(color), mTip(tip)
+	{
+		setIcon( QIcon( ColorSwatch( wSwatch, hSwatch, color ) ) );
+		setToolTip( tip );
+
+		connect( this, SIGNAL(clicked()), this, SLOT(onClicked()) );
+	}
+
+
+	///
+	/// Color Property Setter
+	///
+	void ColorPalletteItem::setColor( int            id,
+					  const QColor&  color,
+					  const QString& tip )
+	{
+		mId    = id;
+		mColor = color;
+		mTip   = tip;
+
+		setIcon( QIcon( ColorSwatch( wSwatch, hSwatch, color ) ) );
+		setToolTip( tip );
+	}
+
+
+	///
+	/// onClicked slot
+	///
+	void ColorPalletteItem::onClicked()
+	{
+		emit activated( mId );
+	}
+
+}
+

glabels/ColorPalletteItem.h

@@ -0,0 +1,84 @@
+/*  ColorPalletteItem.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_ColorPalletteItem_h
+#define glabels_ColorPalletteItem_h
+
+#include <QPushButton>
+#include <QColor>
+
+
+namespace glabels
+{
+
+	///
+	/// Barcode Menu Item
+	///
+	class ColorPalletteItem : public QPushButton
+	{
+		Q_OBJECT
+
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	public:
+		ColorPalletteItem( int            id,
+		                   const QColor&  color,
+		                   const QString& tip,
+		                   QWidget*       parent = 0 );
+
+
+		/////////////////////////////////
+		// Signals
+		/////////////////////////////////
+	signals:
+		void activated( int id );
+
+
+		/////////////////////////////////
+		// Properties
+		/////////////////////////////////
+	public:
+		void setColor( int            id,
+		               const QColor&  color,
+		               const QString& tip );
+
+
+		/////////////////////////////////
+		// Slots
+		/////////////////////////////////
+	private slots:
+		void onClicked();
+
+
+		/////////////////////////////////
+		// Private Data
+		/////////////////////////////////
+	private:
+		int     mId;
+		QColor  mColor;
+		QString mTip;
+		
+	};
+
+
+}
+
+#endif // glabels_ColorPalletteItem_h

glabels/ColorSwatch.cpp

@@ -20,9 +20,7 @@
 
 #include "ColorSwatch.h"
 
-#include <QGraphicsRectItem>
+#include <QPainter>
-#include <QGraphicsDropShadowEffect>
-#include <iostream>
 
 
 //
@@ -41,43 +39,21 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	ColorSwatch::ColorSwatch( int w, int h, QColor& color, QWidget *parent )
+	ColorSwatch::ColorSwatch( int w, int h, const QColor& color )
-		: mW(w), mH(h), mColor(color), QGraphicsView(parent)
 	{
-		setAttribute(Qt::WA_TranslucentBackground);
+		fill( Qt::transparent );
-		viewport()->setAutoFillBackground(false);
-		setFrameStyle( QFrame::NoFrame );
-		setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
-		resize( mW, mH );
-		fitInView( 0, 0, mW, mH, Qt::KeepAspectRatio );
 
-		mScene = new QGraphicsScene();
+		QPainter painter(this );
-		setScene( mScene );
 
-		mScene->setSceneRect( 0, 0, mW, mH );
+		painter.setBackgroundMode( Qt::TransparentMode );
 
-		QBrush brush( mColor );
+		QBrush brush( color );
 		QPen pen( outlineColor );
-		pen.setWidthF( outlineWidthPixels );
+		pen.setWidth( outlineWidthPixels );
 
-		mSwatchItem = new QGraphicsRectItem( 1, 1, mW-2, mH-2 );
+		painter.setBrush( brush );
-		mSwatchItem->setBrush( brush );
+		painter.setPen( pen );
-		mSwatchItem->setPen( pen );
+		painter.drawRect( 1, 1, w-2, h-2 );
-				
-		mScene->addItem( mSwatchItem );
 	}
 
-
-	///
-	/// Color Property Setter
-	///
-	void ColorSwatch::setColor( QColor& color )
-	{
-		mColor = color;
-
-		QBrush brush( mColor );
-		mSwatchItem->setBrush( brush );
-	}
-
-
 }

glabels/ColorSwatch.h

@@ -21,10 +21,7 @@
 #ifndef glabels_ColorSwatch_h
 #define glabels_ColorSwatch_h
 
-#include <QGraphicsView>
+#include <QPixmap>
-#include <QGraphicsScene>
-#include <QGraphicsRectItem>
-#include <QColor>
 
 
 namespace glabels
@@ -33,33 +30,14 @@ namespace glabels
 	///
 	/// Simple Preview Widget
 	///
-	class ColorSwatch : public QGraphicsView
+	class ColorSwatch : public QPixmap
 	{
 
 		/////////////////////////////////
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		ColorSwatch( int w, int h, QColor& color, QWidget *parent = 0 );
+		ColorSwatch( int w, int h, const QColor& color );
-
-
-		/////////////////////////////////
-		// Properties
-		/////////////////////////////////
-	public:
-		void setColor( QColor& color );
-
-
-		/////////////////////////////////
-		// Private Data
-		/////////////////////////////////
-	private:
-		int                mW;
-		int                mH;
-		QColor             mColor;
-
-		QGraphicsScene*    mScene;
-		QGraphicsRectItem* mSwatchItem;
 
 	};