10 files changed, 360 insertions, 71 deletions
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp
index bcb9913..7a020a0 100644
--- a/core/settings/launcher/launchersettings.cpp
+++ b/core/settings/launcher/launchersettings.cpp
@@ -1,12 +1,38 @@
+/*
+               =.            This file is part of the OPIE Project
+             .=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 <qlayout.h>
 #include <opie/otabwidget.h>
 #include "launchersettings.h"
 #include "tabssettings.h"
 #include "taskbarsettings.h"
 LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false )
 {
diff --git a/core/settings/launcher/launchersettings.h b/core/settings/launcher/launchersettings.h
index c91c765..09ea933 100644
--- a/core/settings/launcher/launchersettings.h
+++ b/core/settings/launcher/launchersettings.h
@@ -1,12 +1,39 @@
+/*
+               =.            This file is part of the OPIE Project
+             .=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.
+*/
 #ifndef __LAUNCHER_SETTINGS_H__
 #define __LAUNCHER_SETTINGS_H__
 #include <qdialog.h>
 class TabsSettings;
 class TaskbarSettings;
 class LauncherSettings : public QDialog {
        Q_OBJECT
 public:
diff --git a/core/settings/launcher/main.cpp b/core/settings/launcher/main.cpp
index ca7102d..dbcd624 100644
--- a/core/settings/launcher/main.cpp
+++ b/core/settings/launcher/main.cpp
@@ -1,31 +1,38 @@
-/**********************************************************************
+/*
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+               =.            This file is part of the OPIE Project
-**
+             .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
-** This file is part of the Qtopia Environment.
+           .>+-=
-**
+ _;:,     .>    :=|.         This file is free software; you can
-** This file may be distributed and/or modified under the terms of the
+.> <`_,   >  .   <=          redistribute it and/or modify it under
-** GNU General Public License version 2 as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-** Foundation and appearing in the file LICENSE.GPL included in the
+.="- .-=="i,     .._         License as published by the Free Software
-** packaging of this file.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-**
+     ._= =}       :          or (at your option) any later version.
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+    .%`+i>       _;_.
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+    .i_,=:_.      -<s.       This file is distributed in the hope that
-**
+     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
+    : ..    .:,     . . .    without even the implied warranty of
-**
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-** Contact info@trolltech.com if any conditions of this licensing are
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
-** not clear to you.
+..}^=.=       =       ;      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 "launchersettings.h"
 #include <qpe/qpeapplication.h>
 int main ( int argc, char** argv )
 {
        QPEApplication a ( argc,argv );
        LauncherSettings dlg;
        a. showMainWidget ( &dlg );
diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h
index 8f21eb4..1c2e94d 100644
--- a/core/settings/launcher/tabconfig.h
+++ b/core/settings/launcher/tabconfig.h
@@ -1,12 +1,38 @@
+/*
+               =.            This file is part of the OPIE Project
+             .=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.
+*/
 #ifndef __TABCONFIG_H__
 #define __TABCONFIG_H__
 struct TabConfig {
                enum ViewMode {
                Icon,
                List
        };
        enum BackgroundType {
                Ruled,
                SolidColor,
                Image
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index ca48e66..86202f0 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -1,53 +1,83 @@
+/*
+               =.            This file is part of the OPIE Project
+             .=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 <qpe/resource.h>
 #include <qpe/config.h>
+#include <qpe/applnk.h>
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qtabbar.h>
 #include <qiconview.h>
 #include <qapplication.h>
 #include <qlabel.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
+#include <qpushbutton.h>
 #include <opie/ofontselector.h>
 #include <opie/otabwidget.h>
 #include <opie/ocolorbutton.h>
+#include <opie/ofiledialog.h>
 #include "tabdialog.h"
 class SampleItem : public QIconViewItem {
 public:
        SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text )
                {
                m_large = pix;
                m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 ));
        }
        
        void sizeChange ( )
        {
                calcRect ( );
                repaint ( );
        }
        
        QPixmap *pixmap ( ) const 
        {
                if ( iconView ( )-> itemTextPos ( ) == QIconView::Right ) 
                        return (QPixmap *) &m_small;
                else
                        return (QPixmap *) &m_large;
-                }
+        }
+        
 private:
        QPixmap m_large, m_small;
 };
 class SampleView : public QIconView {
 public:
        SampleView ( QWidget *parent = 0, const char *name = 0 ) : QIconView ( parent, name )
        {
                setItemsMovable ( false );
                setAutoArrange ( true );
                setSorting ( true );
                setFrameStyle ( QFrame::NoFrame );
@@ -176,52 +206,60 @@ public:
                        if ( viewerWidth < 150 )
                                cols = 1;
                        else if ( viewerWidth >= 400 )
                                cols = viewerWidth / 150;
                        setSpacing ( 2 );
                        setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols );
                        setGridY ( fontMetrics ( ). height ( ) + 2 );
                }
        }
                                                                                                                                                                  
        void paletteChange( const QPalette &p )
        {
+                static bool excllock = false;
+                
+                if ( excllock )
+                        return;
+                excllock = true;
+        
                unsetPalette ( );
                QIconView::paletteChange ( p );
                if ( m_bgtype == TabConfig::Ruled )
                        setBackgroundType ( TabConfig::Ruled, QString::null );
                QColorGroup cg = colorGroup ( );
                cg.setColor ( QColorGroup::Text, m_textcolor );
                setPalette ( QPalette ( cg, cg, cg ));
+                
+                excllock = false;
        }
                            
        void setBackgroundPixmap ( const QPixmap &pm ) 
        {
                m_bgpix = pm;
        }
        
        void setBackgroundColor ( const QColor &c ) 
        {
                m_bgcolor = c;
        }
        
        void drawBackground ( QPainter *p, const QRect &r )
        {
                if ( !m_bgpix. isNull ( )) {
                        p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), 
                                                                  ( r. y ( ) + contentsY ( )) % m_bgpix. height ( )));
                } 
                else
                        p-> fillRect ( r, m_bgcolor );
-        }                                                                                                                
+        }
        
 private:
        QColor m_textcolor;
        QColor m_bgcolor;
        QPixmap m_bgpix;
        TabConfig::BackgroundType m_bgtype;
 };
 TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) 
        : QDialog ( parent, name, modal, fl ), m_tc ( tc )
@@ -243,26 +281,29 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
        QTabBar *tb = new QTabBar ( sample );
        QString name ( tr( "Previewing %1" ). arg ( tabname ));
        
        tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name ));
        
        m_sample = new SampleView ( sample );
                        
        lay-> addWidget ( tw, 10 );
        lay-> addWidget ( sample, 1 );
        
        m_iconsize-> setButton ( tc. m_view );
        iconSizeClicked ( tc. m_view );
+        m_iconcolor-> setColor ( QColor ( m_tc. m_text_color ));
+        iconColorClicked ( m_iconcolor-> color ( ));
        m_bgtype-> setButton ( tc. m_bg_type );
        m_solidcolor-> setColor ( QColor ( tc. m_bg_color ));
+        m_bgimage = tc. m_bg_image;
        bgTypeClicked ( tc. m_bg_type );
        m_fontselect-> setSelectedFont ( tc. m_font_family, tc. m_font_style, tc. m_font_size );
        fontClicked ( m_fontselect-> selectedFont ( ));
 }
 TabDialog::~TabDialog ( )
 {
 }
 QWidget *TabDialog::createFontTab ( QWidget *parent )
 {
@@ -293,34 +334,48 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
    m_bgtype-> insert ( rb, TabConfig::Ruled );
    gridLayout-> addWidget( rb, 0, 1 );
        QHBoxLayout *hb = new QHBoxLayout ( );
        hb-> setSpacing ( 4 );
    rb = new QRadioButton( tr( "Solid color" ), tab, "solid" );
    m_bgtype-> insert ( rb, TabConfig::SolidColor ); 
    hb-> addWidget ( rb );
        hb-> addSpacing ( 10 );
    
        m_solidcolor = new OColorButton ( tab );
-        connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( colorClicked ( const QColor & )));
+        connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & )));
        hb-> addWidget ( m_solidcolor );
+        hb-> addStretch ( 10 );
    gridLayout-> addLayout ( hb, 1, 1 );
-    rb = new QRadioButton( tr( "Image" ), tab, "image" );
+        hb = new QHBoxLayout ( );
+        hb-> setSpacing ( 4 );
+        
+        rb = new QRadioButton( tr( "Image" ), tab, "image" );
    m_bgtype-> insert ( rb, TabConfig::Image );
-    gridLayout-> addWidget( rb, 3, 1 );
+    hb-> addWidget( rb );
+    hb-> addSpacing ( 10 );
+    
+        m_imagebrowse = new QPushButton ( tr( "Select..." ), tab );
+        connect ( m_imagebrowse, SIGNAL( clicked ( )), this, SLOT( bgImageClicked ( )));
+        hb-> addWidget ( m_imagebrowse );
+        hb-> addStretch ( 10 );
+        
+    gridLayout-> addLayout ( hb, 2, 1 );
-        //QPushButton *p;
+                QPushButton *p = new QPushButton ( tr( "Default" ), tab );
+        connect ( p, SIGNAL( clicked ( )), this, SLOT( bgDefaultClicked ( )));
+        gridLayout-> addWidget ( p, 3, 1 );
        connect ( m_bgtype, SIGNAL( clicked ( int )), this, SLOT( bgTypeClicked ( int )));
        vertLayout-> addStretch ( 10 );
        return tab;
 }
 QWidget *TabDialog::createIconTab ( QWidget *parent )
 {
    QWidget *tab = new QWidget( parent, "AdvancedTab" );
    QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 );
@@ -336,58 +391,104 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
        QRadioButton *rb;
    rb = new QRadioButton( tr( "Small" ), tab, "iconsmall" );
    m_iconsize-> insert ( rb, TabConfig::List );
    gridLayout-> addWidget( rb, 0, 1 );
    
    rb = new QRadioButton( tr( "Large" ), tab, "iconlarge" );
    m_iconsize-> insert ( rb, TabConfig::Icon );
    gridLayout-> addWidget( rb, 1, 1 );
        connect ( m_iconsize, SIGNAL( clicked ( int )), this, SLOT( iconSizeClicked ( int )));
+        //vertLayout-> addSpacing ( 8 );
+        //gridLayout = new QGridLayout ( vertLayout );
+        gridLayout-> addRowSpacing ( 2, 8 );
+        
+        label = new QLabel ( tr( "Color:" ), tab );
+        gridLayout-> addWidget ( label, 3, 0 );
+        
+        m_iconcolor = new OColorButton ( tab );
+        connect ( m_iconcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( iconColorClicked ( const QColor & )));
+                gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft );        
        vertLayout-> addStretch ( 10 );
        return tab;
 }
 void TabDialog::iconSizeClicked ( int s )
 {
        m_sample-> setViewMode ((TabConfig::ViewMode) s );
 }
 void TabDialog::fontClicked ( const QFont &f )
 {
        m_sample-> setViewFont ( f );
 }
 void TabDialog::bgTypeClicked ( int t )
 {
        QString s;
+        if ( m_bgtype-> id ( m_bgtype-> selected ( )) != t )
+                m_bgtype-> setButton ( t );
+                
        m_solidcolor-> setEnabled ( t == TabConfig::SolidColor );
-        //m_imagebrowse-> setEnabled ( t == TabConfig::Image );
+        m_imagebrowse-> setEnabled ( t == TabConfig::Image );
-        //m_imagedefault-> setEnabled ( t == TabConfig::Image );
        if ( t == TabConfig::SolidColor )
                s = m_solidcolor-> color ( ). name ( );
+        else if ( t == TabConfig::Image )
+                s = m_bgimage;
                
        m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s );
 }
-void TabDialog::colorClicked ( const QColor &col )
+void TabDialog::bgColorClicked ( const QColor & )
+{
+        bgTypeClicked ( TabConfig::SolidColor );
+}
+void TabDialog::iconColorClicked ( const QColor &col )
+{
+        m_sample-> setTextColor ( col );
+}
+void TabDialog::bgImageClicked ( )
+{
+        // ### use OFileSelector here ###
+        // this is just a quick c&p from the old appearance app
+        MimeTypes types;
+        QStringList list;
+                list << "image/*";
+        types. insert ( "Images", list );
+        
+        QString file = OFileDialog::getOpenFileName ( 1, "/", QString::null, types );
+        if ( !file. isEmpty ( )) {
+                m_bgimage = DocLnk ( file ). file ( );
+                bgTypeClicked ( TabConfig::Image );
+        }                                                                    
+}
+void TabDialog::bgDefaultClicked ( )
 {
-        m_sample-> setBackgroundType ( TabConfig::SolidColor, col. name ( ));
+        m_bgimage = Resource::findPixmap ( "launcher/opie-background.jpg" );
+        bgTypeClicked ( TabConfig::Image );
 }
 void TabDialog::accept ( )
 {
        m_tc. m_view = (TabConfig::ViewMode) m_iconsize-> id ( m_iconsize-> selected ( ));
        m_tc. m_bg_type = (TabConfig::BackgroundType) m_bgtype-> id ( m_bgtype-> selected ( ));
        m_tc. m_bg_color = m_solidcolor-> color ( ). name ( );
+        m_tc. m_bg_image = m_bgimage;
+        m_tc. m_text_color = m_iconcolor-> color ( ). name ( );
        m_tc. m_font_family = m_fontselect-> fontFamily ( );
        m_tc. m_font_size = m_fontselect-> fontSize ( );
        m_tc. m_font_style = m_fontselect-> fontStyle ( );
        
        QDialog::accept ( );
 }
diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h
index e1935fd..b0afd47 100644
--- a/core/settings/launcher/tabdialog.h
+++ b/core/settings/launcher/tabdialog.h
@@ -1,45 +1,79 @@
+/*
+               =.            This file is part of the OPIE Project
+             .=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.
+*/
 #ifndef __TABDIALOG_H__
 #define __TABDIALOG_H__
 #include <qdialog.h>
 #include "tabconfig.h"
 class QButtonGroup;
 class OFontSelector;
 class SampleView;
 class OColorButton;
+class QPushButton;
 class TabDialog : public QDialog {
        Q_OBJECT
 public:
        TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags = 0 );
                virtual ~TabDialog ( );
 public slots:
        virtual void accept ( );
 protected slots:
        void iconSizeClicked ( int );
        void fontClicked ( const QFont & );
        void bgTypeClicked ( int );
-        void colorClicked ( const QColor & );
+        void bgColorClicked ( const QColor & );
+        void iconColorClicked ( const QColor & );
+        void bgImageClicked ( );
+        void bgDefaultClicked ( );
 private:
        QWidget *createBgTab ( QWidget *parent );
        QWidget *createFontTab ( QWidget *parent );
        QWidget *createIconTab ( QWidget *parent );
        
        
 private:
        SampleView *m_sample;
        QButtonGroup *m_iconsize;
        OFontSelector *m_fontselect;
        OColorButton *m_solidcolor;
-        
+        OColorButton *m_iconcolor;
+        QPushButton *m_imagebrowse;
+                QString m_bgimage;
        QButtonGroup *m_bgtype;
        
        TabConfig &m_tc;
 };
 #endif
 \ No newline at end of file
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index ae78733..0faaea3 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -1,31 +1,38 @@
-/**********************************************************************
+/*
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+               =.            This file is part of the OPIE Project
-**
+             .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
-** This file is part of the Qtopia Environment.
+           .>+-=
-**
+ _;:,     .>    :=|.         This file is free software; you can
-** This file may be distributed and/or modified under the terms of the
+.> <`_,   >  .   <=          redistribute it and/or modify it under
-** GNU General Public License version 2 as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-** Foundation and appearing in the file LICENSE.GPL included in the
+.="- .-=="i,     .._         License as published by the Free Software
-** packaging of this file.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-**
+     ._= =}       :          or (at your option) any later version.
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+    .%`+i>       _;_.
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+    .i_,=:_.      -<s.       This file is distributed in the hope that
-**
+     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
+    : ..    .:,     . . .    without even the implied warranty of
-**
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-** Contact info@trolltech.com if any conditions of this licensing are
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
-** not clear to you.
+..}^=.=       =       ;      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 "tabssettings.h"
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/mimetype.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
@@ -105,26 +112,26 @@ void TabsSettings::readTabSettings ( )
                QString view = cfg. readEntry ( "View", "Icon" );
                if ( view == "List" ) // No tr
                        tc. m_view = TabConfig::List;
                QString bgType = cfg. readEntry ( "BackgroundType", "Ruled" );
                if ( bgType == "SolidColor" )
                        tc. m_bg_type = TabConfig::SolidColor;
                else if ( bgType == "Image" ) // No tr
                        tc. m_bg_type = TabConfig::Image;
                tc. m_bg_image = cfg. readEntry ( "BackgroundImage", "wallpaper/opie" );
-                tc. m_bg_color = cfg. readEntry ( "BackgroundColor" );
+                tc. m_bg_color = cfg. readEntry ( "BackgroundColor", colorGroup ( ). color ( QColorGroup::Base ). name ( ));
-                tc. m_text_color = cfg. readEntry ( "TextColor" );
+                tc. m_text_color = cfg. readEntry ( "TextColor", colorGroup ( ). color ( QColorGroup::Text ). name ( ));
                QStringList f = cfg. readListEntry ( "Font", ',' );
                if ( f. count ( ) == 4 ) {
                        tc. m_font_family = f [0];
                        tc. m_font_size = f [1]. toInt ( );
                        tc. m_font_style = f [2];
                } else {
                        tc. m_font_family = font ( ). family ( );
                        tc. m_font_size = font ( ). pointSize ( );
                        tc. m_font_style = "Regular";
                }
                m_tabs [*it] = tc;
        }
diff --git a/core/settings/launcher/tabssettings.h b/core/settings/launcher/tabssettings.h
index 76cae68..b17b523 100644
--- a/core/settings/launcher/tabssettings.h
+++ b/core/settings/launcher/tabssettings.h
@@ -1,12 +1,38 @@
+/*
+               =.            This file is part of the OPIE Project
+             .=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.
+*/
 #ifndef __TABS_SETTINGS_H__
 #define __TABS_SETTINGS_H__
 #include <qwidget.h>
 #include <qmap.h>
 #include "tabconfig.h"
 class QListBox;
 class TabsSettings : public QWidget {
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index 7df9a68..6921ee8 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -1,31 +1,39 @@
-/**********************************************************************
+/*
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+                             This file is part of the OPIE Project
-**
+               =.            Copyright (c)  2002 Trolltech AS <info@trolltech.com>
-** This file is part of the Qtopia Environment.
+             .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
-**
+           .>+-=
-** This file may be distributed and/or modified under the terms of the
+ _;:,     .>    :=|.         This file is free software; you can
-** GNU General Public License version 2 as published by the Free Software
+.> <`_,   >  .   <=          redistribute it and/or modify it under
-** Foundation and appearing in the file LICENSE.GPL included in the
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-** packaging of this file.
+.="- .-=="i,     .._         License as published by the Free Software
-**
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+     ._= =}       :          or (at your option) any later version.
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+    .%`+i>       _;_.
-**
+    .i_,=:_.      -<s.       This file is distributed in the hope that
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
+     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
-**
+    : ..    .:,     . . .    without even the implied warranty of
-** Contact info@trolltech.com if any conditions of this licensing are
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-** not clear to you.
+  _.=:.       :    :=>`:     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 "taskbarsettings.h"
 #include <qpe/config.h>
 #include <qpe/qlibrary.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/taskbarappletinterface.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qdir.h>
 #include <qlistview.h>
 #include <qcheckbox.h>
diff --git a/core/settings/launcher/taskbarsettings.h b/core/settings/launcher/taskbarsettings.h
index b8c6fbb..2f5242f 100644
--- a/core/settings/launcher/taskbarsettings.h
+++ b/core/settings/launcher/taskbarsettings.h
@@ -1,12 +1,39 @@
+/*
+               =.            This file is part of the OPIE Project
+             .=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.
+*/
 #ifndef __TASKBAR_SETTINGS_H__
 #define __TASKBAR_SETTINGS_H__
 #include <qwidget.h>
 #include <qmap.h>
 class QListView;
 class QCheckListItem;
 class QCheckBox;
 class TaskbarSettings : public QWidget {