X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcolorbutton.cpp;h=22e03836e2f3bf7f10e5a9c68099fffdf3ff3b20;hp=61e6c14db5d304c461a8418be11b9b7f851c23dd;hb=1a45f16a9734820fba42fe1db3f38dd1eee49df6;hpb=1aef6bf0d3d2a7ef469b9a9f68ceb891cc8a896c

diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp
index 61e6c14d..22e03836 100644
--- a/src/uisupport/colorbutton.cpp
+++ b/src/uisupport/colorbutton.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,49 +15,45 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "colorbutton.h"
 
+#include <QColorDialog>
 #include <QPainter>
-#include <QDebug>
-#include <QPaintEvent>
-#include <QApplication>
 #include <QStyle>
 #include <QStyleOptionFrame>
 
-ColorButton::ColorButton(QWidget *parent) :
-    QPushButton(parent),
-    _color(QColor()) //default is white; 
-    {
 
+ColorButton::ColorButton(QWidget *parent) : QToolButton(parent)
+{
+    setText("");
+    connect(this, SIGNAL(clicked()), SLOT(chooseColor()));
 }
 
-void ColorButton::setColor(const QColor &color) {
-  _color = color;
-  update();
+
+void ColorButton::setColor(const QColor &color)
+{
+    _color = color;
+    QPixmap pixmap(QSize(32, 32));
+    pixmap.fill(color);
+    setIcon(pixmap);
+
+    emit colorChanged(color);
 }
 
-QColor ColorButton::color() const {
-  return _color;
+
+QColor ColorButton::color() const
+{
+    return _color;
 }
 
-void ColorButton::paintEvent(QPaintEvent *event) {
-  QPushButton::paintEvent(event);
-  QPainter painter(this);
-  int border = QApplication::style()->pixelMetric(QStyle::PM_ButtonMargin);
-  painter.fillRect(rect().adjusted(border+1, border+1, -border-1, -border-1), QBrush(_color));
-  QStyleOptionFrame option;
-  option.state = QStyle::State_Sunken;
-  option.rect = rect().adjusted(border, border, -border, -border);
-  //TODO: setBackground instead of the fillRect()
-  //painter.setBackground(_color);
-  //painter.setBackgroundMode(Qt::OpaqueMode);
-  //painter.fillRect(QApplication::style()->subElementRect(QStyle::SE_FrameContents, &option), QBrush(_color));
-  //qDebug() << option << QApplication::style()->subElementRect(QStyle::SE_PushButtonContents, &option);
-  QApplication::style()->drawPrimitive(QStyle::PE_Frame, &option, &painter);
-  //painter.fillRect(QApplication::style()->subElementRect(QStyle::SE_FrameContents, &option), QBrush(_color));
-  //border += QStyle::PM_DefaultFrameWidth;
-  //painter.fillRect(rect().adjusted(border, border, -border, -border), QBrush(_color));
+
+void ColorButton::chooseColor()
+{
+    QColor c = QColorDialog::getColor(color(), this);
+    if (c.isValid()) {
+        setColor(c);
+    }
 }