X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcolorbutton.cpp;h=c42f15257499ed10297fb108207ff5d16009a4d9;hp=4a833d06dd06ab2b793b5c19d12012a558f4c505;hb=f84e68f556579cbe861f50b94b19ae83704fc17f;hpb=68efe6df6d72f1ac498d0594866455418552665d

diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp
index 4a833d06..c42f1525 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-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,48 +21,42 @@
 #include "colorbutton.h"
 
 #include <QPainter>
-#include <QDebug>
-#include <QPaintEvent>
-#include <QApplication>
 #include <QStyle>
 #include <QStyleOptionFrame>
 
-ColorButton::ColorButton(QWidget *parent) :
-    QPushButton(parent),
-    _color(QColor()) //default is white; 
-    {
+#ifdef HAVE_KDE
+#  include <KColorDialog>
+#else
+#  include <QColorDialog>
+#endif
 
+ColorButton::ColorButton(QWidget *parent) : QToolButton(parent) {
+  setText("");
+  connect(this, SIGNAL(clicked()), SLOT(chooseColor()));
 }
 
 void ColorButton::setColor(const QColor &color) {
   _color = color;
-  update();
+  QPixmap pixmap(QSize(32,32));
+  pixmap.fill(color);
+  setIcon(pixmap);
+
+  emit colorChanged(color);
 }
 
 QColor ColorButton::color() const {
   return _color;
 }
 
-void ColorButton::paintEvent(QPaintEvent *event) {
-  //TODO: work on a good button style solution
-  QPushButton::paintEvent(event);
-  QPainter painter(this);
-  int border = QApplication::style()->pixelMetric(QStyle::PM_ButtonMargin);
-
-  // if twice buttonMargin (+2 px from the adjust) is greater than the button height
-  // then set the border to a third of the button height.
-  if(2*border+2 >= event->rect().height()) border = event->rect().height()/3;
+void ColorButton::chooseColor() {
+#ifdef HAVE_KDE
+  QColor c = color();
+  KColorDialog::getColor(c, this);
+#else
+  QColor c = QColorDialog::getColor(color(), this);
+#endif
 
-  QBrush brush;
-  if(isEnabled()) {
-    brush = QBrush(_color);
-  } else {
-    brush = QBrush(_color, Qt::Dense4Pattern);
+  if(c.isValid()) {
+    setColor(c);
   }
-  painter.fillRect(rect().adjusted(border+1, border+1, -border-1, -border-1), brush);
-  QStyleOptionFrame option;
-  option.state = QStyle::State_Sunken;
-  option.rect = rect().adjusted(border, border, -border, -border);
-
-  QApplication::style()->drawPrimitive(QStyle::PE_Frame, &option, &painter);
 }