- updated all copyright headers

- use new OColorButton
- rearranged editScheme a bit

1 files changed, 33 insertions, 29 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 23630c5..66cf2c3 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -1,26 +1,30 @@
-/**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the 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.
-**
-***********************************************************************
-**
-**  Enhancements by: Dan Williams, <williamsdr@acm.org>
-**
-**********************************************************************/
+/*
+               =.            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 "appearance.h"
 #include "editScheme.h"
@@ -490,21 +494,21 @@ void Appearance::editSchemeClicked ( )
 	ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
 
 	int cnt = 0;
-	QString controlLabel [QColorGroup::NColorRoles];
-	QString controlColor [QColorGroup::NColorRoles];
+	QString labels [QColorGroup::NColorRoles];
+	QColor colors [QColorGroup::NColorRoles];
 	
 	for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) {
 		QColor col = item-> color ( role );
 		
 		if ( col. isValid ( )) {
-			controlLabel [cnt] = item-> label ( role );
-			controlColor [cnt] = col. name ( );
+			labels [cnt] = item-> label ( role );
+			colors [cnt] = col;
 		
 			cnt++;
 		}
 	}
 
-    EditScheme* editdlg = new EditScheme( this, "editScheme", true, 0,  cnt, controlLabel, controlColor );
+    EditScheme* editdlg = new EditScheme( cnt, labels, colors, this, "editScheme", true );
     editdlg-> showMaximized ( );
     if ( editdlg-> exec ( ) == QDialog::Accepted ) {
     	ColorListItem *citem = (ColorListItem *) m_color_list-> item ( 0 );
@@ -512,7 +516,7 @@ void Appearance::editSchemeClicked ( )
 		    
 		for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) {
 			if ( item-> color ( role ). isValid ( )) {
-        		citem-> setColor ( role, QColor ( controlColor [cnt] ));	
+        		citem-> setColor ( role, colors [cnt] );
         		cnt++;
         	}
         }