Changeset 6081 for trunk/qt4-gui/src/widgets

Timestamp:

03/03/08 03:39:24 (9 months ago)

Author:

flynd

Message:

Changed widget/colorbutton to use KColorButton when building for kde.

Location:

trunk/qt4-gui/src/widgets

Files:

• colorbutton.cpp (modified) (2 diffs)
• colorbutton.h (modified) (3 diffs)

trunk/qt4-gui/src/widgets/colorbutton.cpp

@@ -20 +20 @@
 #include "colorbutton.h"
 
+#ifndef USE_KDE
 #include <QColorDialog>
+#endif
 
 using namespace LicqQtGui;
 
-
 ColorButton::ColorButton(QWidget* parent)
-  : QPushButton(parent)
+  : COLORBUTTON_BASE(parent)
 {
+#ifndef USE_KDE
   setFixedSize(40, 20);
   connect(this, SIGNAL(clicked()), SLOT(selectColor()));
-}
-
-QColor ColorButton::getColor() const
-{
-  return palette().color(backgroundRole());
+#endif
 }
 
 QString ColorButton::colorName() const
 {
-  return palette().color(backgroundRole()).name();
+  return color().name();
+}
+
+#ifndef USE_KDE
+QColor ColorButton::color() const
+{
+  return palette().color(backgroundRole());
 }
 
@@ -54 +58 @@
   pal.setColor(backgroundRole(), color);
   setPalette(pal);
-  emit changed();
+  emit changed(color);
 }
+#endif

trunk/qt4-gui/src/widgets/colorbutton.h

@@ -21 +21 @@
 #define COLORBUTTON_H
 
+#include "config.h"
+
+#ifdef USE_KDE
+#include <KDE/KColorButton>
+#define COLORBUTTON_BASE KColorButton
+#else
 #include <QPushButton>
+#define COLORBUTTON_BASE QPushButton
+#endif
 
 namespace LicqQtGui
 {
-class ColorButton : public QPushButton
+class ColorButton : public COLORBUTTON_BASE
 {
   Q_OBJECT
@@ -31 +39 @@
 public:
   ColorButton(QWidget* parent = NULL);
-  QColor getColor() const;
   QString colorName() const;
+#ifndef USE_KDE
+  QColor color() const;
 
 public slots:
@@ -39 +48 @@
 
 signals:
-   void changed();
+   void changed(const QColor& color);
+#endif
 };