X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fcolorbutton.h;h=d04026de0682c260dd6d3b847f3ef869a79b67d8;hb=0ba56e60f400621ddc291669dc2c03a8e461c224;hp=83758587ac23f9f453f4c307a9c97b464f71e0bf;hpb=1aef6bf0d3d2a7ef469b9a9f68ceb891cc8a896c;p=quassel.git

diff --git a/src/uisupport/colorbutton.h b/src/uisupport/colorbutton.h
index 83758587..d04026de 100644
--- a/src/uisupport/colorbutton.h
+++ b/src/uisupport/colorbutton.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,27 +15,38 @@
  *   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.         *
  ***************************************************************************/
 
-#ifndef _COLORBUTTON_H_
-#define _COLORBUTTON_H_
+#ifndef COLORBUTTON_H_
+#define COLORBUTTON_H_
 
-#include <QPushButton>
+#include <QToolButton>
 
-class ColorButton : public QPushButton {
-  Q_OBJECT
+class ColorButton : public QToolButton
+{
+    Q_OBJECT
+    Q_PROPERTY(QColor color READ color WRITE setColor USER true)
+
+public :
+        explicit ColorButton(QWidget *parent = 0);
+    explicit ColorButton(const QColor &c, QWidget *parent = 0);
 
-  public:
-    ColorButton(QWidget *parent = 0);
     void setColor(const QColor &color);
     QColor color() const;
 
-  protected:
-    void paintEvent(QPaintEvent *event);
+signals:
+    void colorChanged(const QColor &);
+
+protected:
+    //void paintEvent(QPaintEvent *event);
 
-  private:
+private slots:
+    void chooseColor();
+
+private:
     QColor _color;
 };
 
+
 #endif