number of icon columns now also customizable through LauncherSettings

5 files changed, 19 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index fdaaa25..9b31725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,186 +1,187 @@
 2005-??-??	Opie 1.2.0
 
 	New Features
 	------------
 	* Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl)
+	* Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl)
 
 	Fixed Bugs
 	----------
 	* #1501 - Fixed bug in todo sql backend (eilers)
 	* n.a - Removed hard coded font sizes in a couple of inputmethods (mickeyl)
 
 	Internal
 	--------
 	* Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl)
 
 2004-11-26	Opie 1.1.8
 
 	New Features
 	------------
 	* PackageManager supports installation of local ipkg files (drw)
 	* PackageManager supports linking of applications to root (drw)
 	* PackageManager supports src/gz feeds (drw,wimpie)
 	* Added a syslog information tab to sysinfo (mickeyl)
 	* Added new, more consistent, PIM icons + a GIMP teplate (ar)
 
 	Fixed Bugs
 	----------
 	* #1017 - Tetrix doesn't display correctly for high resolution screens (drw)
 	* #1269 - VCards were imported into personal area if it was activated (eilers)
 	* #1464 - Packagemanager dont set active filter after install a package (drw)
 	* #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers)
 	* #1493 - Fixed one column layout bug of the launcher (hrw)
 	* n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw)
 	* n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw)
 	* n.a. - Battery Applet - fix sizing of battery info popup (drw,mickeyl)
 
 	Internal
 	--------
 	* Moved libopie1 to unsupported (mickeyl)
 	* Implemented generic queryByExample() with incremental searching. A lot of internal changes of the Pim2-library (eilers)
 	* Added fast and full featured and incremental sorted() for SQL addressbook backend (eilers)
 
 2004-11-14	Opie 1.1.7
 
 	New Features
 	------------
 	* libOpieDB now uses SQLite V3 instead V2. Remember to upgrade your database files! (eilers)
 	* Backup now uses the busy indicator when backing up and restore (ar)
 	* OpiePlayer2 gained adding of Directories to the playlist (zecke)
 	* OpiePlayer2 better error handling (zecke)
 	* OpiePlayer2 progress indication while streaming (zecke)
 	* OpiePlayer2 ported to use libxine 1.0.0-rc6a (brad,zecke)
 	* Ported brightnessapplet from Qtopia 1.7 (mickeyl)
 	* Opie-Eye got a Digital Camera File Backend (alwin,zecke)
 	* Support for Tuxpad1 of Tradesquare.NL (mickeyl,zecke)
 	* Opie-Console use Custom Font and Size in a Profile (harlekin)
 	* Opie-Console transparently log the Output and Input to a file (harlekin)
 	* Added new O-menu icon to lock the PDA immediately: opie-lockapplet (clem)
 	* Opie-Security now hides the plugin-based authentication tabs if no auth. plugin package is installed (clem)
 	* Opie-Security gained a 'test authentication' button (clem)
 	* Opie-Eye  got a more unique layout (menubar), a slideshow, user can setup some defaults
 	* Opie-Mail improve the handling of POP mail boxes (alwin)
 	* Both Opie-Eye and Opie-Mail were greatly improved due the hard work of Rajko Albrecht(alwin)
 	* Opie IRC - backports of the 'NeIRC fork' (zecke)
 
 	Fixed Bugs
 	----------
 	* #501  - Pickboard is able to show 'Umlaute' (TT,zecke)
 	* #608  - Make Opie usable for left handed users (zecke)
 	* #957  - Import of VCards/VTodos/VEvents with BASE64 encoding (ljp,zecke)
 	* #1245 - Opie-Go 'paused' (zecke)
 	* #1358 - DocTab didn't show any MimeTypes (was fixed earlier) (zecke)
 	* #1380 - QDateBookAccess::remove() doesn't remove entries (eilers, zecke)
 	* #1395 - Build VNC Backend with gcc3.4
 	* #1440 - The icon of opie-mobilemsg is missing (CoreDump)
 	* #1426 - Add missing opie-bartender Icon (CoreDump)
 	* #1445 - Opie-Sheet Has No Icon (CoreDump)
 	* #1448 - Brightness Applet added (mickeyl)
 	* #1450 - ZSame didn't clear the bonus item after winning a game (zecke)
 	* #1482 - Fix OFileSelector to be able to sort by size (zecke)
         * n.a.  - Opie-mail: fixed some crasher, some layout-problems
 	* n.a.  - Converted applications to not hardcode /opt/QtPalmtop but to use QPEApplication::qpeDir (zecke)
 	* n.a.  - Converted usage of qpeDir() not to include a '/' as first charachter of the string (zecke)
 	* n.a.  - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem)
 	* n.a.  - Build system: Fix deps in several config.in (and fix scripts/deps.pl too) to stop breaking builds, especially with make -j highNumber (clem)
 	* n.a.  - Removed hardcoded icon size in a couple of applets (mickeyl)
 
 	Internal
 	--------
 	* Opie-Qashmoney has been moved to unsupported (mickeyl)
 	* Opie-Ubrowser has been moved to unsupported (mickeyl)
 
 2004-09-17	Opie 1.1.6
 
 	New Features
 	------------
 	* Fifteen gained configurable number of items (zecke)
 	* Fifteen can have custom background images (zecke)
 	* Added daemonizing capabilities to QWS Server [via Qt/Embedded] (mickeyl)
 	* Integrated the new security framework into libopie2 (zecke,clem)
 	* Converted the launcher to use the new security framework (zecke)
 	* Backup can now handle custom locations for backup and restore (ar)
 	* Implemented right-on-hold feedback (wimpie,zecke)
 	* Lots of new features in opie-reader (tim,pohly)
 	* Build system cleanups (schurig)
 
 	Fixed Bugs
 	--------
 	* #1005 - Fixed backup to CompactFlash (ar)
 	* #1167 - Fixed Opie write crashing on more text than one page (ar)
 	* #1225 - Fixed repeated light flashing on Zaurus with keyz (mickeyl)
 	* #1359 - Fixed bookmarks in Gutenbrowser (ljp)
 	* #1361 - Fixed auto upercase in Opie-Addressbook (eilers)
 	* #1370 - Pimconverter now reacts on cancel key (eilers)
 	* #1376 - Bring back the capslock/numlock display (zecke)
 	* #1383 - Language settings now warns about losing open apps (Markus Litz)
 	* #1393 - Fixed line wrap issues in opie-console for the default profile (mickeyl)
 	* #1394 - Fixed oversized headline in opie-login (coredump)
 	* #1396 - Opie-console captures the escape key and vim is working (zecke)
 	* #1401 - Scrollbar is now only visible if necessary in DocTab (mickeyl)
 
 2004-07-06	Opie 1.1.4
 
 	New Features
 	------------
 	* Added four themes courtesy Robert Griebl (http://www.softforge.de/zstyle)
 	* Added Conversion tool for pim-data (eilers)
 	* Introduced new OPimAccessFactory and OBackendFactory which simplyfies database access (eilers)
 	* Modified the PIM API for providing generic use of OPimRecords (eilers)
 	* Clicking on the application symbol now iterates over the application's top level widgets if already raised (zecke)
 
 	Fixed Bugs
 	--------
 	* #1068 - Country Drop Down Box Off Screen
 	* #1291 - Opie tinykate does not open .desktop files (ar)
 	* #1291 - Opie sheet not saving correctly (ar)
 	* #1294 - Opie does not know about British Summer Time
 	* #1314 - Drawpad initialization (mickeyl)
 	* #1317 - Packagemanager crashes on hold-down or install (chicken)
 	* #1321 - Batteryapplet graphic glitch (harlekin)
 	* #1324 - ZSafe not starting up (mickeyl)
 	* #1328 - Personal Home Address fields is trimmed to 1char (eilers)
 	* #1327 - Opie-mail ipk does not depend on libopiedb2 (chicken)
 	* #1345 - Networksettingsplugin wlan plugin dependency on libpcap0 (mickeyl)
 	* #1348 - Datebook dependency on libopiedb2 (chicken)
 	* #1328 - Switched SQLDatabase and VCards char encoding from latin1 to unicode (eilers)
 
 2004-04-25	Opie 1.1.3
 
 	* Introduced first implementation of SQL-Support using SQLite (eilers)
 	* Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp)
 	* Added a real system graffiti character set (brad)
 	* Added Generic Keyconfig Widget (zecke)
 	* Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke)
 	* Added new Bible reader app - opie-dagger (drw)
 	* Added a new Image Viewer. Work is ongoing (zecke,alwin)
 	* Added namespace usage in libopie2 and everywhere (zecke,alwin)
 	* Enabled the possibility to pass command line arguments to applications (mickeyl)
 	* Added an about applet showing some credits and information about Opie (mickeyl)
 	* Added benchmarking functionality to sysinfo (mickeyl)
 	* Added applet and configuration application for switching hardware keyboard layouts (alwin)
 	* Ported applications from libopie1 to libopie2* (drw,ar,alwin)
 	* Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe)
 	* Clean-up of package information in control files (drw)
 	* Repaired mediummount which was broken since integrating the quicklauncher (alwin)
 	* Improved big-screen support (zecke,ar)
 	* Improved multikeyboard support, added keyboard layout switching applet (mouse)
 	* Added a new mail client based on libetpan (harlekin,alwin,jgf)
 	* Added new package manager - opie-packagemanager (drw)
 	* Improved light-n-power for C7x0 (mickeyl)
 	* Added automatic rotation support for C7x0 (treke)
 	* Split libopie1 up into a set of smaller - functionally grouped - libraries (mickeyl)
 	* Added scanning the wireless network neighbourhood to networksettings (mickeyl)
 
 2003-11-29	Opie 1.0.3
 
 	* Released as Version 1.0.3
 	* Improved i18n (various contributors)
 	* Reduced application startup time by integrating the TT quicklauncher (zecke,harlekin)
 	* Made the Documents Tab optional (mickeyl)
 	* Integrated basic support for HP iPAQ 54xx and the Jornada 5xx (chicken)
 
 2003-08-04	Opie 1.0.0
 
 	* Released as Version 1.0.0
 	* Including a PPP module for easy dial up (tille,harlekin,zecke)
diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h
index 84ba073..7844673 100644
--- a/core/settings/launcher/tabconfig.h
+++ b/core/settings/launcher/tabconfig.h
@@ -1,72 +1,73 @@
 /*
                =.            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
 	};
 
 	ViewMode       m_view;
 	BackgroundType m_bg_type;
 	QString		m_last_directory;
 	QString        m_bg_image;
 	QString        m_bg_color;
+    int            m_iconcolumns;
 	QString        m_text_color;
 	bool           m_font_use;
 	QString        m_font_family;
 	int            m_font_size;
 	int            m_font_weight;
 	bool           m_font_italic;
 	bool           m_changed;
 
 	bool operator == ( const TabConfig &tc )
 	{
 		return ( m_view == tc. m_view ) &&
 		       ( m_bg_type == tc. m_bg_type ) &&
 		       ( m_bg_image == tc. m_bg_image ) &&
 		       ( m_bg_color == tc. m_bg_color ) &&
 		       ( m_text_color == tc. m_text_color ) &&
 		       ( m_font_use == tc. m_font_use ) &&
 		       ( m_font_use ? (
 		         ( m_font_family == tc. m_font_family ) &&
 		         ( m_font_size == tc. m_font_size ) &&
 		         ( m_font_weight == tc. m_font_weight ) &&
 		         ( m_font_italic == tc. m_font_italic )
 		        ) : true );
 
 	}
 };
 
 #endif
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index cef92d9..abe310f 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -1,524 +1,534 @@
 /*
                =.            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 "tabdialog.h"
 
 /* OPIE */
 
 #include <opie2/ofontselector.h>
 #include <opie2/otabwidget.h>
 #include <opie2/ocolorbutton.h>
 #include <opie2/ofiledialog.h>
 #include <opie2/odebug.h>
 
 /* QPE */
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qtabbar.h>
 #include <qiconview.h>
 #include <qapplication.h>
 #include <qlabel.h>
 #include <qfileinfo.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 #include <qwhatsthis.h>
 #include <qcheckbox.h>
+#include <qspinbox.h>
 
 
 using namespace Opie::Ui;
 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;
 };
 
+//FIXME: Why not derive SampleView from LauncherView ???
+
 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 );
         setSpacing ( 4 );
         setMargin ( 0 );
         setSelectionMode ( QIconView::NoSelection );
         setBackgroundMode ( PaletteBase );
         setViewMode ( TabConfig::Icon );
         calculateGrid ( Bottom );
 
 
         new SampleItem ( this, QObject::tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" ));
         new SampleItem ( this, QObject::tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" ));
         new SampleItem ( this, QObject::tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" ));
 
         setBackgroundType ( TabConfig::Ruled, QString::null );
 
         setMaximumHeight ( firstItem ( )-> height ( ) + 16 );
     }
 
     void setViewMode ( TabConfig::ViewMode m )
     {
         viewport ( )-> setUpdatesEnabled ( false );
 
         switch ( m ) {
             case TabConfig::List:
                 setItemTextPos( QIconView::Right );
                 break;
             case TabConfig::Icon:
                 setItemTextPos( QIconView::Bottom );
                 break;
         }
 //      hideOrShowItems ( false );
 
         for ( QIconViewItem *it = firstItem ( ); it; it = it-> nextItem ( ))
             ((SampleItem *) it )-> sizeChange ( );
         arrangeItemsInGrid ( true );
         viewport ( )-> setUpdatesEnabled ( true );
         update ( );
     }
 
 
     void setBackgroundType( TabConfig::BackgroundType t, const QString &val )
     {
         switch ( t ) {
             case TabConfig::Ruled: {
                 QPixmap bg ( width ( ), 9 );
                 QPainter painter ( &bg );
                 for ( int i = 0; i < 3; i++ ) {
                     painter. setPen ( white );
                     painter. drawLine ( 0, i*3, width()-1, i*3 );
                     painter. drawLine ( 0, i*3+1, width()-1, i*3+1 );
                     painter. setPen ( colorGroup().background().light(105) );
                     painter. drawLine ( 0, i*3+2, width()-1, i*3+2 );
                 }
                 painter.end ( );
                 setBackgroundPixmap ( bg );
                 break;
             }
 
             case TabConfig::SolidColor: {
                 setBackgroundPixmap ( QPixmap ( ));
                 if ( val. isEmpty ( ))
                     setBackgroundColor ( colorGroup ( ). base ( ));
                 else
                     setBackgroundColor ( val );
                 break;
             }
 
             case TabConfig::Image: {
                 odebug << "Loading image: " << val << "" << oendl;
                 QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val ));
                 if ( bg. isNull ( )) {
                     QImageIO imgio;
                     imgio. setFileName ( val );
                     QSize ds = qApp-> desktop ( )-> size ( );
                     QString param ( "Scale( %1, %2, ScaleMin )" ); // No tr
                     imgio. setParameters ( param. arg ( ds. width ( )). arg ( ds. height ( )). latin1 ( ));
                     imgio. read ( );
                     bg = imgio. image ( );
                 }
                 setBackgroundPixmap ( bg );
                 break;
             }
         }
         m_bgtype = t;
         viewport ( )-> update ( );
     }
 
     void setTextColor ( const QColor &tc )
     {
         m_textcolor = tc;
         QColorGroup cg = colorGroup ( );
         cg. setColor ( QColorGroup::Text, tc );
         setPalette ( QPalette ( cg, cg, cg ));
         viewport ( )-> update ( );
     }
 
     void setViewFont ( const QFont &f )
     {
         setFont ( f );
     }
 
     void setItemTextPos ( ItemTextPos pos )
     {
         calculateGrid ( pos );
         QIconView::setItemTextPos( pos );
     }
 
+    //FIXME: Add per-tab column handling from launcherview.cpp
     void calculateGrid ( ItemTextPos pos )
     {
         int dw = QApplication::desktop ( )-> width ( );
         int viewerWidth = dw - style ( ).scrollBarExtent ( ). width ( );
         if ( pos == Bottom ) {
             int cols = 3;
             if ( viewerWidth <= 200 )
                 cols = 2;
             else if ( viewerWidth >= 400 )
                 cols = viewerWidth/96;
             setSpacing ( 4 );
             setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols );
             setGridY ( fontMetrics ( ). height ( ) * 2 + 24 );
         }
         else {
             int cols = 2;
             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 *dname, bool modal, WFlags fl )
     : QDialog ( parent, dname, modal, fl | WStyle_ContextHelp ), m_tc ( tc )
 {
     setCaption ( tr( "Edit Tab" ));
 
     QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 );
 
     OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
     QWidget *bgtab;
 
     tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/color", tr( "Background" ));
     tw-> addTab ( createFontTab ( tw ), "font", tr( "Font" ));
     tw-> addTab ( createIconTab ( tw ), "pixmap", tr( "Icons" ) );
 
     tw-> setCurrentTab ( bgtab );
 
     QWidget *sample = new QVBox ( this );
     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_fontuse-> setChecked ( tc. m_font_use );
     m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic ));
     m_fontselect-> setEnabled ( m_fontuse-> isChecked ( ));
     fontClicked ( m_fontselect-> selectedFont ( ));
 
     QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." ));
 }
 
 
 TabDialog::~TabDialog ( )
 {
 }
 
 QWidget *TabDialog::createFontTab ( QWidget *parent )
 {
     QWidget *tab = new QWidget ( parent, "FontTab" );
     QVBoxLayout *vertLayout = new QVBoxLayout ( tab, 3, 3 );
 
     m_fontuse = new QCheckBox ( tr( "Use a custom font" ), tab );
     vertLayout-> addWidget ( m_fontuse );
 
     m_fontselect = new OFontSelector ( false, tab, "fontsel" );
     vertLayout-> addWidget ( m_fontselect );
 
     connect ( m_fontuse, SIGNAL( toggled(bool)), m_fontselect, SLOT( setEnabled(bool)));
     connect( m_fontselect, SIGNAL( fontSelected(const QFont&)),
              this, SLOT( fontClicked(const QFont&)));
 
     return tab;
 }
 
 QWidget *TabDialog::createBgTab ( QWidget *parent )
 {
     QWidget *tab = new QWidget( parent, "BgTab" );
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
 
     QGridLayout* gridLayout = new QGridLayout ( vertLayout );
     gridLayout-> setColStretch ( 1, 10 );
 
     QLabel* label = new QLabel( tr( "Type:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
     m_bgtype = new QButtonGroup( tab, "buttongroup" );
     m_bgtype-> hide ( );
     m_bgtype-> setExclusive ( true );
 
     QRadioButton *rb;
     rb = new QRadioButton( tr( "Ruled" ), tab, "ruled" );
     m_bgtype-> insert ( rb, TabConfig::Ruled );
     gridLayout-> addWidget( rb, 0, 1 );
 
     QHBoxLayout *hb = new QHBoxLayout ( );
     hb-> setSpacing ( 3 );
 
     rb = new QRadioButton( tr( "Solid color" ), tab, "solid" );
     m_bgtype-> insert ( rb, TabConfig::SolidColor );
     hb-> addWidget ( rb );
     hb-> addSpacing ( 10 );
 
     m_solidcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_bg_color ) );
     connect ( m_solidcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( bgColorClicked(const QColor&)));
     hb-> addWidget ( m_solidcolor );
     hb-> addStretch ( 10 );
 
     gridLayout-> addLayout ( hb, 1, 1 );
 
     hb = new QHBoxLayout ( );
     hb-> setSpacing ( 3 );
 
     rb = new QRadioButton( tr( "Image" ), tab, "image" );
     m_bgtype-> insert ( rb, TabConfig::Image );
     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 = 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, "IconTab" );
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
 
     QGridLayout* gridLayout = new QGridLayout ( vertLayout );
     gridLayout-> setColStretch ( 1, 10 );
 
     QLabel* label = new QLabel( tr( "Size:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
     m_iconsize = new QButtonGroup( tab, "buttongroup" );
     m_iconsize-> hide ( );
     m_iconsize-> setExclusive ( true );
 
     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)));
-
     gridLayout-> addRowSpacing ( 2, 8 );
 
     label = new QLabel ( tr( "Color:" ), tab );
     gridLayout-> addWidget ( label, 3, 0 );
+    gridLayout-> addRowSpacing ( 3, 8 );
 
     m_iconcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_text_color ) );
     connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&)));
     gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft );
 
+    label = new QLabel( tr( "Columns:" ), tab );
+    gridLayout->addWidget( label, 4, 0 );
+    m_iconcolumns = new QSpinBox( 0, 10, 1, tab, "iconspinbox" );
+    m_iconcolumns->setSpecialValueText( tr( "Automatic" ) );
+    gridLayout->addWidget( m_iconcolumns, 4, 1, AlignLeft );
+
     vertLayout-> addStretch ( 10 );
 
     if ( m_tc.m_last_directory == QString::null ) {
     	m_tc.m_last_directory = QPEApplication::documentDir();
     }
 
     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 );
 
     if ( t == TabConfig::SolidColor )
         s = m_solidcolor-> color ( ). name ( );
     else if ( t == TabConfig::Image )
         s = Resource::findPixmap ( m_bgimage );
 
     m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s );
 }
 
 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, m_tc.m_last_directory, QString::null, types );
 
     if ( !file. isEmpty ( )) {
     	m_tc.m_last_directory = QFileInfo( file ).dirPath();
         m_bgimage = DocLnk ( file ). file ( );
         bgTypeClicked ( TabConfig::Image );
     }
 }
 
 void TabDialog::bgDefaultClicked ( )
 {
     m_bgimage = "launcher/opie-background";
     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_iconcolumns = m_iconcolumns-> value( );
     m_tc. m_bg_image = m_bgimage;
     m_tc. m_text_color = m_iconcolor-> color ( ). name ( );
 
     m_tc. m_font_use = m_fontuse-> isChecked ( );
 
     if ( m_tc. m_font_use ) {
         QFont f = m_fontselect-> selectedFont ( );
 
         m_tc. m_font_family = f. family ( );
         m_tc. m_font_size = f. pointSize ( );
         m_tc. m_font_weight = f. weight ( );
         m_tc. m_font_italic = f. italic ( );
     }
 
     QDialog::accept ( );
 }
diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h
index 46b7ae9..9381237 100644
--- a/core/settings/launcher/tabdialog.h
+++ b/core/settings/launcher/tabdialog.h
@@ -1,81 +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.
 
 */
 
 #ifndef __TABDIALOG_H__
 #define __TABDIALOG_H__
 
 #include <qdialog.h>
 #include "tabconfig.h"
 
 class QButtonGroup;
 namespace Opie {namespace Ui {class OFontSelector;}}
 class SampleView;
 namespace Opie {class OColorButton;}
 class QPushButton;
 class QCheckBox;
+class QSpinBox;
 
 
 class TabDialog : public QDialog {
 	Q_OBJECT
 public:
 	TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *dname = 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 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;
 	Opie::Ui::OFontSelector *m_fontselect;
 	Opie::OColorButton *m_solidcolor;
 	Opie::OColorButton *m_iconcolor;
+	QSpinBox *m_iconcolumns;
 	QPushButton *m_imagebrowse;
 	QString m_bgimage;	
 	QButtonGroup *m_bgtype;
 	QCheckBox *m_fontuse;
 	
 	TabConfig &m_tc;
 };
 
 
 #endif
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index 5ac625b..ab64331 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -1,323 +1,326 @@
 /*
                =.            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 "tabssettings.h"
 
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/mimetype.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 
 #include <qlistbox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qwhatsthis.h>
 #include <qcheckbox.h>
 
 #include "tabdialog.h"
 
 #include <stdlib.h>
 #include <qmessagebox.h>
 
 
 #define GLOBALID 	".global."
 
 
 TabsSettings::TabsSettings ( QWidget *parent, const char *name )
 	: QWidget ( parent, name )
 {
 	QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 );
 
 	QLabel *l = new QLabel ( tr( "Launcher Tabs:" ), this );
 	lay-> addMultiCellWidget ( l, 0, 0, 0, 1 );
 
 	m_list = new QListBox ( this );
 	lay-> addMultiCellWidget ( m_list, 1, 4, 0, 0 );
 
 	QWhatsThis::add ( m_list, tr( "foobar" ));
 
 	QPushButton *p1, *p2, *p3;
 	p1 = new QPushButton ( tr( "New" ), this );
 	lay-> addWidget ( p1, 1, 1 );
 	connect ( p1, SIGNAL( clicked()), this, SLOT( newClicked()));
 
 	p2 = new QPushButton ( tr( "Edit" ), this );
 	lay-> addWidget ( p2, 2, 1 );
 	connect ( p2, SIGNAL( clicked()), this, SLOT( editClicked()));
 
 	p3 = new QPushButton ( tr( "Delete" ), this );
 	lay-> addWidget ( p3, 3, 1 );
 	connect ( p3, SIGNAL( clicked()), this, SLOT( deleteClicked()));
 
 	lay-> setRowStretch ( 4, 10 );
 
                 m_bigbusy = new QCheckBox( tr( "Enable big busy indicator" ),  this );
                 lay-> addMultiCellWidget ( m_bigbusy, 5, 5, 0, 1 );
 
 	m_busyani = new QCheckBox ( tr( "Enable animated busy indicator" ), this );
 	lay-> addMultiCellWidget ( m_busyani, 6, 6, 0, 1 );
 
 	p1-> setEnabled ( false );
 	p3-> setEnabled ( false );
 
 	init ( );
 
 	QWhatsThis::add ( m_list, tr( "Select the Launcher Tab you want to edit or delete." ));
 	QWhatsThis::add ( p1, tr( "Adds a new Tab to the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." ));
 	QWhatsThis::add ( p2, tr( "Opens a new dialog to customize the select Tab." ));
 	QWhatsThis::add ( p3, tr( "Deletes a Tab from the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." ));
         	QWhatsThis::add ( m_bigbusy, tr( "Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar." ));
 	QWhatsThis::add ( m_busyani, tr( "Activate this, if you want an animatedbusy indicator for starting applications in the Launcher." ));
 }
 
 void TabsSettings::init ( )
 {
 	AppLnkSet rootFolder( MimeType::appsFolderName ( ));
 	QStringList types = rootFolder. types ( );
 
 	m_list-> insertItem ( tr( "All Tabs" ));
 	m_ids << GLOBALID;
 
 	for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) {
 		m_list-> insertItem ( rootFolder. typePixmap ( *it ), rootFolder. typeName ( *it ));
 		m_ids << *it;
 	}
 	QImage img ( Resource::loadImage ( "DocsIcon" ));
 	QPixmap pix;
 	pix = img. smoothScale ( AppLnk::smallIconSize ( ), AppLnk::smallIconSize ( ));
 	m_list-> insertItem ( pix, tr( "Documents" ));
 	m_ids += "Documents"; // No tr
 
 	Config cfg ( "Launcher" );
 
 	readTabSettings ( cfg );
 
 	cfg. setGroup ( "GUI" );
 	m_busyani-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "animated" );
                 m_bigbusy->setChecked(  cfg. readBoolEntry ( "BigBusy" )  );
 }
 
 
 void TabsSettings::readTabSettings ( Config &cfg )
 {
 	QString grp ( "Tab %1" ); // No tr
 	m_tabs. clear ( );
 
 	TabConfig global_def;
 	global_def. m_view        = TabConfig::Icon;
 	global_def. m_bg_type     = TabConfig::Ruled;
 	global_def. m_bg_image    = "launcher/opie-background";
 	global_def. m_bg_color    = colorGroup ( ). color ( QColorGroup::Base ). name ( );
+	global_def. m_iconcolumns = 0; // automatic
 	global_def. m_text_color  = colorGroup ( ). color ( QColorGroup::Text ). name ( );
 	global_def. m_font_use    = false;
 	global_def. m_font_family = font ( ). family ( );
 	global_def. m_font_size   = font ( ). pointSize ( );
 	global_def. m_font_weight = 50;
 	global_def. m_font_italic = false;
 	global_def. m_changed     = false;
 
 	Config cfg2 = Config( "Launchersettings" );
 
 	for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
 		TabConfig tc = ( it != m_ids. begin ( )) ? m_tabs [GLOBALID] : global_def;
 
 		cfg. setGroup ( grp. arg ( *it ));
 		cfg2. setGroup( grp. arg ( *it ));
 
 		QString view = cfg. readEntry ( "View" );
 		if ( view == "Icon" ) // No tr
 			tc. m_view = TabConfig::Icon;
 		if ( view == "List" ) // No tr
 			tc. m_view = TabConfig::List;
 
 		QString bgType = cfg. readEntry ( "BackgroundType" );
 		if ( bgType == "Image" )
 			tc. m_bg_type = TabConfig::Image;
 		else 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", tc. m_bg_image );
 		tc. m_last_directory = cfg2.readEntry( "DefaultDir", "" );
 		tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color );
+		tc. m_iconcolumns = cfg. readNumEntry ( "Columns", tc. m_iconcolumns );
 		tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color );
 		QStringList f = cfg. readListEntry ( "Font", ',' );
 		if ( f. count ( ) == 4 ) {
 			tc. m_font_use = true;
 			tc. m_font_family = f [0];
 			tc. m_font_size = f [1]. toInt ( );
 			tc. m_font_weight = f [2]. toInt ( );
 			tc. m_font_italic = ( f [3]. toInt ( ));
 		}
 		m_tabs [*it] = tc;
 	}
 
 	// if all tabs have the same config, then initialize the GLOBALID tab to these values
 
 	TabConfig *first = 0;
 	bool same = true;
 
 	for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
 		if ( *it == GLOBALID )
 			continue;
 		else if ( !first )
 			first = &m_tabs [*it];
 		else
 			same &= ( *first == m_tabs [*it] );
 	}
 	if ( same ) {
 		m_tabs [GLOBALID] = *first;
 		m_tabs [GLOBALID]. m_changed = true;
 	}
 }
 
 
 void TabsSettings::accept ( )
 {
 	Config cfg ( "Launcher" );
 	Config cfg2 ( "Launchersettings" );
 
 	// Launcher Tab
 	QString grp ( "Tab %1" ); // No tr
 
 	for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
 		TabConfig &tc = m_tabs [*it];
 
 		if ( !tc. m_changed )
 			continue;
 
 		cfg. setGroup ( grp. arg ( *it ));
 		cfg2. setGroup ( grp. arg ( *it ));
 		switch ( tc. m_view ) {
 			case TabConfig::Icon:
 				cfg.writeEntry ( "View", "Icon" );
 				break;
 			case TabConfig::List:
 				cfg.writeEntry ( "View", "List" );
 				break;
 		}
 
 		QCopEnvelope e ( "QPE/Launcher", "setTabView(QString,int)" );
 		e << *it << tc. m_view;
 
 		cfg. writeEntry ( "BackgroundImage", tc. m_bg_image );
 		cfg. writeEntry ( "BackgroundColor", tc. m_bg_color );
+		cfg. writeEntry ( "Columns", tc. m_iconcolumns );
 		cfg. writeEntry ( "TextColor", tc. m_text_color );
 		cfg2. writeEntry ( "DefaultDir", tc.m_last_directory );
 
 		if ( tc. m_font_use ) {
 			QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" );
 			cfg. writeEntry ( "Font", f );
 		}
 		else
 			cfg. removeEntry ( "Font" );
 
 		QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" );
 
 		switch ( tc. m_bg_type ) {
 			case TabConfig::Ruled:
 				cfg.writeEntry( "BackgroundType", "Ruled" );
 				be << *it << tc. m_bg_type << QString("");
 				break;
 			case TabConfig::SolidColor:
 				cfg.writeEntry( "BackgroundType", "SolidColor" );
 				be << *it << tc. m_bg_type << tc. m_bg_color;
 				break;
 			case TabConfig::Image:
 				cfg.writeEntry( "BackgroundType", "Image" );
 				be << *it << tc. m_bg_type << tc. m_bg_image;
 				break;
 		}
 
 		QCopEnvelope te( "QPE/Launcher", "setTextColor(QString,QString)" );
 		te << *it << tc. m_text_color;
 
 		QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" );
 		fe << *it;
 		fe << ( tc. m_font_use ? tc. m_font_family : QString::null );
 		fe << tc. m_font_size;
 		fe << tc. m_font_weight;
 		fe << ( tc. m_font_italic ? 1 : 0 );
 
 		tc. m_changed = false;
 	}
 	cfg. setGroup ( "GUI" );
 	QString busytype = QString ( m_busyani-> isChecked ( ) ? "Animated" : "" );
 	cfg. writeEntry ( "BusyType", busytype );
 
         	cfg. writeEntry ( "BigBusy", m_bigbusy->isChecked( ) );
 
 	{
 		QCopEnvelope e ( "QPE/Launcher", "setBusyIndicatorType(QString)" );
 		e << busytype;
 	}
 }
 
 void TabsSettings::newClicked ( )
 {
 	QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" ));
 }
 
 void TabsSettings::deleteClicked ( )
 {
 	int ind = m_list-> currentItem ( );
 
 	if ( ind < 0 )
 		return;
 
 	QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" ));
 }
 
 void TabsSettings::editClicked ( )
 {
 	int ind = m_list-> currentItem ( );
 
 	if ( ind < 0 )
 		return;
 
 	TabConfig tc = m_tabs [m_ids [ind]];
 
 	TabDialog *d = new TabDialog ( m_list-> pixmap ( ind ), m_list-> text ( ind ), tc, this, "TabDialog", true );
 
 	if ( QPEApplication::execDialog( d ) == QDialog::Accepted ) {
 		tc. m_changed = true;
 		m_tabs [m_ids [ind]] = tc;
 
 		if ( m_ids [ind] == GLOBALID ) {
 			for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
 				if ( *it != GLOBALID )
 					m_tabs [*it] = tc;
 			}
 		}
 	}
 
 	delete d;
 }