Modified OColorButton to pass color to color dialog. Impacts appearance, launcher settings and liquid settings.

2 files changed, 4 insertions, 4 deletions

diff --git a/libopie/ocolorbutton.cpp b/libopie/ocolorbutton.cpp
index 4734c0c..ddb6c4f 100644
--- a/libopie/ocolorbutton.cpp
+++ b/libopie/ocolorbutton.cpp
@@ -1,101 +1,101 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This library is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This library is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <opie/colorpopupmenu.h>
 #include <opie/ocolorbutton.h>
 #include <qcolor.h>
 #include <qpixmap.h>
 #include <qimage.h>
 	
 #include <qpe/resource.h>	
 	
 class OColorButtonPrivate {
 public:
 	QPopupMenu *m_menu;
 	QColor m_color;
 };
 
-OColorButton::OColorButton ( QWidget *parent, const char *name ) 
+OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name )
 	: QPushButton ( parent, name )
 {
 	d = new OColorButtonPrivate;
 	
-	d-> m_menu = new ColorPopupMenu ( black, 0, 0 );
+	d-> m_menu = new ColorPopupMenu ( color, 0, 0 );
 	setPopup ( d-> m_menu );
 //	setPopupDelay ( 0 );
 	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 ( )); 
 }
 
 OColorButton::~OColorButton ( )
 {
 	delete d;
 }
 
 QColor OColorButton::color ( ) const
 {
 	return d-> m_color;
 }
 
 void OColorButton::setColor ( const QColor &c )
 {
 	updateColor ( c );
 }
 
 void OColorButton::updateColor ( const QColor &c )
 {
 	d-> m_color = c;
 	
 	QImage img ( 16, 16, 32 );
 	img. fill ( 0 );
 	
 	int r, g, b;
 	c. rgb ( &r, &g, &b );
 	
 	int w = img. width ( );
 	int h = img. height ( );
 	
 	int dx = w * 20 / 100; // 15%
 	int dy = h * 20 / 100;
 	
 	for ( int y = 0; y < h; y++ ) {
 		for ( int x = 0; x < w; x++ ) {
 			double alpha = 1.0;
 
 			if ( x < dx )
 				alpha *= ( double ( x + 1 ) / dx );
 			else if ( x >= w - dx )
 				alpha *= ( double ( w - x ) / dx );
 			if ( y < dy )
 				alpha *= ( double ( y + 1 ) / dy );
 			else if ( y >= h - dy )
diff --git a/libopie/ocolorbutton.h b/libopie/ocolorbutton.h
index ec04833..fe40fae 100644
--- a/libopie/ocolorbutton.h
+++ b/libopie/ocolorbutton.h
@@ -1,59 +1,59 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This library is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This library is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef __OPIE_OCOLORBUTTON_H__
 #define __OPIE_OCOLORBUTTON_H__	
 	
 #include <qpushbutton.h>
 
 class OColorButtonPrivate;
 class QColor;
 
 class OColorButton : public QPushButton {
 	Q_OBJECT
 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 & );	
 	
 public slots:
 	virtual void setColor ( const QColor & );
 	
 protected slots:	
 	virtual void updateColor ( const QColor & );
 	
 private:
 	OColorButtonPrivate *d;
 };	
 
 #endif