summaryrefslogtreecommitdiff
path: root/libopie
authordrw <drw>2002-12-05 17:13:45 (UTC)
committer drw <drw>2002-12-05 17:13:45 (UTC)
commit675ab68194cc25793a18fd9e495958a90aaf0173 (patch) (side-by-side diff)
treee2599a7dbef3184f015593f0b7ffe533c45a5ba5 /libopie
parent1eb333726ccf7c608b9f987aac1a04d37d35936c (diff)
downloadopie-675ab68194cc25793a18fd9e495958a90aaf0173.zip
opie-675ab68194cc25793a18fd9e495958a90aaf0173.tar.gz
opie-675ab68194cc25793a18fd9e495958a90aaf0173.tar.bz2
Modified OColorButton to pass color to color dialog. Impacts appearance, launcher settings and liquid settings.
Diffstat (limited to 'libopie') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/ocolorbutton.cpp20
-rw-r--r--libopie/ocolorbutton.h14
2 files changed, 17 insertions, 17 deletions
diff --git a/libopie/ocolorbutton.cpp b/libopie/ocolorbutton.cpp
index 4734c0c..ddb6c4f 100644
--- a/libopie/ocolorbutton.cpp
+++ b/libopie/ocolorbutton.cpp
@@ -33,5 +33,5 @@
#include <qimage.h>
-
-#include <qpe/resource.h>
-
+
+#include <qpe/resource.h>
+
class OColorButtonPrivate {
@@ -42,3 +42,3 @@ public:
-OColorButton::OColorButton ( QWidget *parent, const char *name )
+OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name )
: QPushButton ( parent, name )
@@ -46,4 +46,4 @@ OColorButton::OColorButton ( QWidget *parent, const char *name )
d = new OColorButtonPrivate;
-
- d-> m_menu = new ColorPopupMenu ( black, 0, 0 );
+
+ d-> m_menu = new ColorPopupMenu ( color, 0, 0 );
setPopup ( d-> m_menu );
@@ -51,8 +51,8 @@ OColorButton::OColorButton ( QWidget *parent, const char *name )
connect ( d-> m_menu, SIGNAL( colorSelected ( const QColor & )), this, SLOT( updateColor ( const QColor & )));
-
- updateColor ( black );
-
+
+ updateColor ( color );
+
QSize s = sizeHint ( ) + QSize ( 12, 0 );
setMinimumSize ( s );
- setMaximumSize ( s. width ( ) * 2, s. height ( ));
+ setMaximumSize ( s. width ( ) * 2, s. height ( ));
}
diff --git a/libopie/ocolorbutton.h b/libopie/ocolorbutton.h
index ec04833..fe40fae 100644
--- a/libopie/ocolorbutton.h
+++ b/libopie/ocolorbutton.h
@@ -29,4 +29,4 @@
#ifndef __OPIE_OCOLORBUTTON_H__
-#define __OPIE_OCOLORBUTTON_H__
-
+#define __OPIE_OCOLORBUTTON_H__
+
#include <qpushbutton.h>
@@ -39,10 +39,10 @@ class OColorButton : public QPushButton {
public:
- OColorButton ( QWidget *parent = 0, const char *name = 0 );
+ OColorButton ( QWidget *parent = 0, const QColor & = black, const char *name = 0 );
virtual ~OColorButton ( );
-
+
QColor color ( ) const;
-
+
signals:
- void colorSelected ( const QColor & );
-
+ void colorSelected ( const QColor & );
+
public slots: