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

2 files changed, 12 insertions, 15 deletions

diff --git a/noncore/settings/appearance2/editScheme.cpp b/noncore/settings/appearance2/editScheme.cpp
index c2e5355..eefeccc 100644
--- a/noncore/settings/appearance2/editScheme.cpp
+++ b/noncore/settings/appearance2/editScheme.cpp
@@ -1,73 +1,72 @@
 /*
                              This file is part of the OPIE Project
                =.            Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU 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 file 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 General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:       
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "editScheme.h"
 
 #include <opie/ocolorbutton.h>
 
 #include <qaction.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpopupmenu.h>
 #include <qscrollview.h>
 #include <qtoolbutton.h>
 
 EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent,  const char* name, bool modal, WFlags fl )
 	: QDialog ( parent, name, modal, fl )
 {
 	setCaption ( tr( "Edit scheme" ) );
 	QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 );
 
     m_count = cnt;
     m_buttons = new OColorButton * [cnt];
     m_colors = colors;
-        
+
     for ( int i = 0; i < cnt; i++ )
     {
         QLabel *l = new QLabel ( labels [i], this );
         layout-> addWidget ( l, i, 0 );
-        
-        m_buttons [i] = new OColorButton ( this );
-        m_buttons [i]-> setColor ( colors [i] );
+
+        m_buttons [i] = new OColorButton ( this, colors [i] );
         layout-> addWidget ( m_buttons [i], i, 1 );
     }
 }
 
 EditScheme::~EditScheme ( )
 {
 	delete [] m_buttons;
 }
 
 void EditScheme::accept ( )
 {
 	for ( int i = 0; i < m_count; i++ ) 
 		m_colors [i] = m_buttons [i]-> color ( );
 		
 	QDialog::accept ( );
 }
 
diff --git a/noncore/styles/liquid/liquidset.cpp b/noncore/styles/liquid/liquidset.cpp
index 255456c..7747da7 100644
--- a/noncore/styles/liquid/liquidset.cpp
+++ b/noncore/styles/liquid/liquidset.cpp
@@ -1,145 +1,143 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 
 
 #include "liquidset.h"
 #include "liquid.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
 
 #include <qslider.h>
 #include <qcombobox.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 
 #include <qpe/config.h>
 
 #include <opie/ocolorbutton.h>
 
 
 LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
 		: QWidget ( parent, name, fl )
 {
 	setCaption ( tr( "Liquid Style" ) );
-	
+
 	Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
 
 	m_type       = config. readNumEntry ( "Type", TransStippleBg );
 	QColor mcol  = QColor ( config. readEntry ( "Color",  QApplication::palette ( ). active ( ). button ( ). name ( )));
 	QColor tcol  = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( )));
 	int opacity  = config. readNumEntry ( "Opacity", 10 );
 	m_shadow     = config. readBoolEntry ( "ShadowText", true );
 	int contrast = config. readNumEntry ( "StippleContrast", 5 );
 	m_flat       = config. readBoolEntry ( "FlatToolButtons", false );
 
 	QVBoxLayout *vbox = new QVBoxLayout ( this );
 	vbox-> setSpacing ( 3 );
 	vbox-> setMargin ( 4 );
 
 	QComboBox *cb = new QComboBox ( this );
 	cb-> insertItem ( tr( "No translucency" ), None );
 	cb-> insertItem ( tr( "Stippled, background color" ), StippledBg );
 	cb-> insertItem ( tr( "Stippled, button color" ), StippledBtn );
 	cb-> insertItem ( tr( "Translucent stippled, background color" ), TransStippleBg );
 	cb-> insertItem ( tr( "Translucent stippled, button color" ), TransStippleBtn );
 	cb-> insertItem ( tr( "Custom translucency" ), Custom );
-	
+
 	cb-> setCurrentItem ( m_type );
 	vbox-> addWidget ( cb );
-	
-	
+
+
 	QGridLayout *grid = new QGridLayout ( vbox );
 	grid-> addColSpacing ( 0, 16 );
 	grid-> addColSpacing ( 3, 8 );
-	
+
 	grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 );
 	grid-> addWidget ( m_textlbl = new QLabel ( tr( "Text color" ), this ), 0, 4 );
 	grid-> addWidget ( m_opaclbl = new QLabel ( tr( "Opacity" ), this ), 1, 1 );
 
-	m_menubtn = new OColorButton ( this );
-	m_menubtn-> setColor ( mcol );
+	m_menubtn = new OColorButton ( this, mcol );
 	grid-> addWidget ( m_menubtn, 0, 2 );
 
-	m_textbtn = new OColorButton ( this );
-	m_textbtn-> setColor ( tcol );
+	m_textbtn = new OColorButton ( this, tcol );
 	grid-> addWidget ( m_textbtn, 0, 5 );
 
 	m_opacsld = new QSlider ( Horizontal, this );
 	m_opacsld-> setRange ( -20, 20 );
 	m_opacsld-> setSteps ( 1, 1 );
 	m_opacsld-> setValue ( opacity );
 	m_opacsld-> setTickmarks ( QSlider::Below );
 	grid-> addMultiCellWidget ( m_opacsld, 1, 1, 2, 5 );
-	
+
 	vbox-> addSpacing ( 4 );
-	
+
 	QCheckBox *shadow = new QCheckBox ( tr( "Use shadowed menu text" ), this );
 	shadow-> setChecked ( m_shadow );
 	vbox-> addWidget ( shadow );
 	
 	vbox-> addSpacing ( 4 );
 	
 	QCheckBox *flattb = new QCheckBox ( tr( "Make toolbar buttons appear flat" ), this );
 	flattb-> setChecked ( m_flat );
 	vbox-> addWidget ( flattb );
 
 	vbox-> addSpacing ( 4 );
 	
 	QHBoxLayout *hbox = new QHBoxLayout ( vbox );
 	
 	hbox-> addWidget ( new QLabel ( tr( "Stipple contrast" ), this )); 
 	
 	m_contsld = new QSlider ( Horizontal, this );
 	m_contsld-> setRange ( 0, 10 );
 	m_contsld-> setSteps ( 1, 1 );
 	m_contsld-> setValue ( contrast );
 	m_contsld-> setTickmarks ( QSlider::Below );
 	hbox-> addWidget ( m_contsld, 10 );
 	
 	vbox-> addStretch ( 10 );
 
 	changeType ( m_type );
 	
 	connect ( cb, SIGNAL( highlighted ( int ) ), this, SLOT( changeType ( int ) ) );
 	connect ( shadow, SIGNAL( toggled ( bool ) ), this, SLOT( changeShadow ( bool ) ) );
 	connect ( flattb, SIGNAL( toggled ( bool ) ), this, SLOT( changeFlat ( bool ) ) );
 }
 
 void LiquidSettings::changeType ( int t )
 {
 	bool custom = ( t == Custom );
 	
 	m_menulbl-> setEnabled ( custom );	
 	m_textlbl-> setEnabled ( custom );	
 	m_opaclbl-> setEnabled ( custom );	
 	m_menubtn-> setEnabled ( custom );	
 	m_textbtn-> setEnabled ( custom );	
 	m_opacsld-> setEnabled ( custom );	
 	
 	m_type = t;
 }
 
 void LiquidSettings::changeShadow ( bool b )
 {