finish per-tab column setting. it now works on the fly and is persistent

5 files changed, 15 insertions, 2 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 4f81076..4255b44 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -226,384 +226,391 @@ LauncherView* LauncherTabWidget::newView( const QString& id, const QPixmap& pm,
     if ( id == "Documents" ) {
         docview = view;
         m_DocumentTabId = n;
     }
 
     odebug << "inserting " << id << " at " << n-1 << "" << oendl;
 
     Config cfg("Launcher");
     setTabAppearance( tab, cfg );
 
     cfg.setGroup( "GUI" );
     view->setBusyIndicatorType( cfg.readEntry( "BusyType", QString::null ) );
 
     return view;
 }
 
 LauncherView *LauncherTabWidget::view( const QString &id )
 {
     LauncherTab *t = categoryBar->launcherTab(id);
     if ( !t )
         return 0;
     return t->view;
 }
 
 LauncherView *LauncherTabWidget::docView()
 {
     return docview;
 }
 
 void LauncherTabWidget::setLoadingWidgetEnabled( bool v )
 {
     if ( v != docLoadingWidgetEnabled && docLoadingWidget ) {
         docLoadingWidgetEnabled = v;
         raiseTabWidget();
     }
 }
 
 void LauncherTabWidget::setLoadingProgress( int percent )
 {
     docLoadingWidgetProgress->setProgress( (percent / 4) * 4 );
 }
 
 // ### this function could more to LauncherView
 void LauncherTabWidget::setTabViewAppearance( LauncherView *v, Config &cfg )
 {
     // View
     QString view = cfg.readEntry( "View", "Icon" );
     if ( view == "List" ) // No tr
     v->setViewMode( LauncherView::List );
     QString bgType = cfg.readEntry( "BackgroundType", "Image" );
     if ( bgType == "Image" ) { // No tr
     QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" );
     v->setBackgroundType( LauncherView::Image, pm );
     } else if ( bgType == "SolidColor" ) {
     QString c = cfg.readEntry( "BackgroundColor" );
     v->setBackgroundType( LauncherView::SolidColor, c );
     } else {
     v->setBackgroundType( LauncherView::Ruled, QString::null );
     }
     QString textCol = cfg.readEntry( "TextColor" );
     if ( textCol.isEmpty() )
     v->setTextColor( QColor() );
     else
     v->setTextColor( QColor(textCol) );
 //    bool customFont = cfg.readBoolEntry( "CustomFont", FALSE );
 
     v->setColNumber( cfg.readNumEntry( "Columns", 0 ) );
 
     QStringList font = cfg.readListEntry( "Font", ',' );
     if ( font.count() == 4 )
         v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) );
 
     // ### FIXME TabColor TabTextColor
 
 }
 
 // ### Could move to LauncherTab
 void LauncherTabWidget::setTabAppearance( LauncherTab *tab, Config &cfg )
 {
     cfg.setGroup( QString( "Tab %1" ).arg(tab->type) ); // No tr
 
     setTabViewAppearance( tab->view, cfg );
 
     // Tabs
     QString tabCol = cfg.readEntry( "TabColor" );
     if ( tabCol.isEmpty() )
     tab->bgColor = QColor();
     else
     tab->bgColor = QColor(tabCol);
     QString tabTextCol = cfg.readEntry( "TabTextColor" );
     if ( tabTextCol.isEmpty() )
     tab->fgColor = QColor();
     else
     tab->fgColor = QColor(tabTextCol);
 }
 
 void LauncherTabWidget::paletteChange( const QPalette &p )
 {
     QVBox::paletteChange( p );
     QPalette pal = palette();
     pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) );
     pal.setColor( QColorGroup::Background, pal.active().background().light(110) );
     categoryBar->setPalette( pal );
     categoryBar->update();
 }
 
 void LauncherTabWidget::styleChange( QStyle & )
 {
     QTimer::singleShot( 0, this, SLOT(setProgressStyle()) );
 }
 
 void LauncherTabWidget::setProgressStyle()
 {
     if (docLoadingWidgetProgress) {
     docLoadingWidgetProgress->setFrameShape( QProgressBar::Box );
     docLoadingWidgetProgress->setFrameShadow( QProgressBar::Plain );
     docLoadingWidgetProgress->setMargin( 1 );
     docLoadingWidgetProgress->setLineWidth( 1 );
     }
 }
 
 /*
  * FIXME
  * The following NULL check is triggered by inserting, then removing a tab on the fly
  * as you would if you had removable media (which I do). Without this check
  * the first app launched after a tab removal causes qpe to Segfault.
  * This obviously has a more sinister cause, but this works around it with no
  * obvious adverse effects. Please FIXME
  * bkc - 17/6/2004
  *
  */
 
 void LauncherTabWidget::setBusy(bool on)
 {
     if ( on )
     currentView()->setBusy(TRUE);
     else {
     for ( int i = 0; i < categoryBar->count(); i++ ) {
     if (categoryBar->tab(i)) {
         LauncherView *view = ((LauncherTab *)categoryBar->tab(i))->view;
         view->setBusy( FALSE );
     } else {
         odebug << "Averting Disaster with tab " << i << " == NULL! " << oendl;
     }
     }
     }
 }
 
 void LauncherTabWidget::setBusyIndicatorType( const QString& str ) {
     for (int i = 0; i < categoryBar->count(); i++ ) {
         LauncherView* view = static_cast<LauncherTab*>( categoryBar->tab(i) )->view;
         view->setBusyIndicatorType( str );
     }
 }
 
 LauncherView *LauncherTabWidget::currentView(void)
 {
     return (LauncherView*)stack->visibleWidget();
 }
 
 
 
 void LauncherTabWidget::launcherMessage( const QCString &msg, const QByteArray &data)
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "setTabView(QString,int)" ) {
         QString id;
         stream >> id;
         int mode;
         stream >> mode;
         if ( view(id) )
             view(id)->setViewMode( (LauncherView::ViewMode)mode );
     } else if ( msg == "setTabBackground(QString,int,QString)" ) {
         QString id;
         stream >> id;
         int mode;
         stream >> mode;
         QString pixmapOrColor;
         stream >> pixmapOrColor;
         if ( view(id) )
             view(id)->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor );
         if ( id == "Documents" )
             docLoadingWidget->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor );
     } else if ( msg == "setTextColor(QString,QString)" ) {
         QString id;
         stream >> id;
         QString color;
         stream >> color;
         if ( view(id) )
             view(id)->setTextColor( QColor(color) );
         if ( id == "Documents" )
             docLoadingWidget->setTextColor( QColor(color) );
+    } else if ( msg == "setIconColumns(QString,int)" ) {
+        QString id;
+        stream >> id;
+        int number;
+        stream >> number;
+        if ( view(id ) )
+            view(id)->setColNumber( number );
     } else if ( msg == "setFont(QString,QString,int,int,int)" ) {
         QString id;
         stream >> id;
         QString fam;
         stream >> fam;
         int size;
         stream >> size;
         int weight;
         stream >> weight;
         int italic;
         stream >> italic;
         if ( view(id) ) {
             if ( !fam.isEmpty() ) {
                 view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
                 odebug << "setFont: " << fam << ", " << size << ", " << weight << ", " << italic << "" << oendl;
             } else {
                 view(id)->clearViewFont();
             }
         }
     }else if ( msg == "setBusyIndicatorType(QString)" ) {
         QString type;
         stream >> type;
         setBusyIndicatorType( type );
     }else if ( msg == "home()" ) {
         if ( isVisibleWindow( static_cast<QWidget*>(parent())->winId() ) ) {
             if (categoryBar)
                 categoryBar->nextTab();
         }else {
             static_cast<QWidget*>(parent())->raise();
         }
     } else if (msg=="doctabEnabled(int)") {
         int id; stream >> id;
         odebug << "Doctab enabled " << id << oendl;
         reCheckDoctab(id);
     }
 }
 
 void LauncherTabWidget::reCheckDoctab(int how)
 {
     if ((bool)how == docTabEnabled) {
         /* nothing to do */
         return;
     }
     if (docLoadingWidget) {
         stack->removeWidget(docLoadingWidget);
         delete docLoadingWidget;
         docLoadingWidget = 0;
     }
     createDocLoadingWidget();
     {
         QCopEnvelope( "QPE/System", "reforceDocuments()" );
         odebug << "Sending doc rescan" << oendl;
     }
 }
 
 //---------------------------------------------------------------------------
 
 Launcher::Launcher()
     : QMainWindow( 0, "PDA User Interface", QWidget::WStyle_Customize | QWidget::WGroupLeader )
 {
     tabs = 0;
     tb = 0;
     Config cfg( "Launcher" );
     cfg.setGroup( "DocTab" );
     docTabEnabled = cfg.readBoolEntry( "Enable", true );
 }
 
 void Launcher::createGUI()
 {
     setCaption( tr("Launcher") );
 
     // we have a pretty good idea how big we'll be
     setGeometry( 0, 0, qApp->desktop()->width(), qApp->desktop()->height() );
 
     tb = new TaskBar;
     tabs = new LauncherTabWidget( this );
     setCentralWidget( tabs );
 
     ServerInterface::dockWidget( tb, ServerInterface::Bottom );
     tb->show();
 
     qApp->installEventFilter( this );
 
     connect( tb, SIGNAL(tabSelected(const QString&)),
     this, SLOT(showTab(const QString&)) );
     connect( tabs, SIGNAL(selected(const QString&)),
     this, SLOT(viewSelected(const QString&)) );
     connect( tabs, SIGNAL(clicked(const AppLnk*)),
     this, SLOT(select(const AppLnk*)));
     connect( tabs, SIGNAL(rightPressed(AppLnk*)),
     this, SLOT(properties(AppLnk*)));
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel* sysChannel = new QCopChannel( "QPE/System", this );
     connect( sysChannel, SIGNAL(received(const QCString&,const QByteArray&)),
              this, SLOT(systemMessage(const QCString&,const QByteArray&)) );
 #endif
 
     // all documents
     QImage img( Resource::loadImage( "DocsIcon" ) );
     QPixmap pm;
     pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
     // It could add this itself if it handles docs
 
     tabs->newView("Documents", pm, tr("Documents") )->setToolsEnabled( TRUE );
 
     QTimer::singleShot( 0, tabs, SLOT( initLayout() ) );
     qApp->setMainWidget( this );
     QTimer::singleShot( 500, this, SLOT( makeVisible() ) );
 }
 
 Launcher::~Launcher()
 {
     if ( tb )
     destroyGUI();
 }
 
  bool Launcher::requiresDocuments() const
  {
     Config cfg( "Launcher" );
     cfg.setGroup( "DocTab" );
     return cfg.readBoolEntry( "Enable", true );
 }
 
 void Launcher::makeVisible()
 {
     showMaximized();
 }
 
 void Launcher::destroyGUI()
 {
     delete tb;
     tb = 0;
     delete tabs;
     tabs =0;
 }
 
 bool Launcher::eventFilter( QObject*, QEvent *ev )
 {
 #ifdef QT_QWS_CUSTOM
     if ( ev->type() == QEvent::KeyPress ) {
     QKeyEvent *ke = (QKeyEvent *)ev;
     if ( ke->key() == Qt::Key_F11 ) { // menu key
         QWidget *active = qApp->activeWindow();
         if ( active && active->isPopup() )
         active->close();
         else {
         Global::terminateBuiltin("calibrate"); // No tr
         tb->launchStartMenu();
         }
         return TRUE;
     }
     }
 #else
     Q_UNUSED(ev);
 #endif
     return FALSE;
 }
 
 static bool isVisibleWindow(int wid)
 {
 #ifdef Q_WS_QWS
     const QList<QWSWindow> &list = qwsServer->clientWindows();
     QWSWindow* w;
     for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
     if ( w->winId() == wid )
         return !w->isFullyObscured();
     }
 #endif
     return FALSE;
 }
 
 void Launcher::viewSelected(const QString& s)
 {
     setCaption( s + tr(" - Launcher") );
 }
 
 void Launcher::showTab(const QString& id)
 {
     tabs->categoryBar->showTab(id);
     raise();
 }
 
 void Launcher::select( const AppLnk *appLnk )
 {
     if ( appLnk->type() == "Folder" ) { // No tr
     // Not supported: flat is simpler for the user
     } else {
     if ( appLnk->exec().isNull() ) {
         int i = QMessageBox::information(this,tr("No application"),
         tr("<p>No application is defined for this document."
         "<p>Type is %1.").arg(appLnk->type()), tr("OK"), tr("View as text"), 0, 0, 1);
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 9d78c0d..2b34cc5 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -450,385 +450,385 @@ void LauncherIconView::setEyePixmap(const QPixmap&aPixmap,const QString&aFile,in
     LauncherItem*item = findDocItem(aFile);
     if (!item||!item->isEyeImage()) return;
     (*sm_EyeCache)[aFile]=aPixmap;
     item->setEyePixmap(aPixmap);
 }
 
 void LauncherIconView::checkCallback()
 {
     if (!m_EyeCallBack) {
         m_EyeCallBack = new LauncherThumbReceiver();
         connect(m_EyeCallBack,SIGNAL(sig_Thumbnail(const QPixmap&,const QString&,int)),
             this,SLOT(setEyePixmap(const QPixmap&,const QString&,int)));
     }
     m_eyeTimer.changeInterval(600000);
 }
 
 void LauncherIconView::addCheckItem(AppLnk* app)
 {
     LauncherItem*item = new LauncherItem( this, app, bigIcns );
     if (item->isEyeImage()) {
         checkCallback();
     }
 }
 
 void LauncherIconView::requestEyePix(const LauncherItem*item)
 {
     if (!item) return;
     if (item->isEyeImage()) {
         checkCallback();
         int s = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize();
         m_EyeCallBack->requestThumb(item->appLnk()->file(),s,s);
     }
 }
 
 void LauncherIconView::stopEyeTimer()
 {
     if (m_EyeCallBack) {
         disconnect(m_EyeCallBack,SIGNAL(sig_Thumbnail(const QPixmap&,const QString&,int)),
             this,SLOT(setEyePixmap(const QPixmap&,const QString&,int)));
         delete m_EyeCallBack;
         m_EyeCallBack=0;
     }
     m_eyeTimer.stop();
 }
 
 void LauncherIconView::updateCategoriesAndMimeTypes()
 {
     mimes.clear();
     cats.clear();
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
         addCatsAndMimes(item->appLnk());
         item = (LauncherItem*)item->nextItem();
     }
     QListIterator<AppLnk> it(hidden);
     AppLnk* l;
     while ((l=it.current())) {
         addCatsAndMimes(l);
         ++it;
     }
 }
 
 void LauncherIconView::hideOrShowItems(bool resort)
 {
     viewport()->setUpdatesEnabled( FALSE );
     hidden.setAutoDelete(FALSE);
     QList<AppLnk> links=hidden;
     hidden.clear();
     hidden.setAutoDelete(TRUE);
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
         links.append(item->takeAppLnk());
         item = (LauncherItem*)item->nextItem();
     }
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
     while ((l=it.current())) {
         addItem(l,FALSE);
         ++it;
     }
     if ( resort && !autoArrange() )
     sort();
     viewport()->setUpdatesEnabled( TRUE );
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile,bool removeCache)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
     AppLnk* l;
     bool did = FALSE;
     DocLnk dl(linkfile);
     while (item) {
         l = item->appLnk();
         LauncherItem *nextItem = (LauncherItem *)item->nextItem();
         if (  l->linkFileKnown() && l->linkFile() == linkfile || l->fileKnown() &&
                  ( l->file() == linkfile || dl.isValid() && dl.file() == l->file() ) ) {
             if (removeCache) sm_EyeCache->remove(l->file());
             delete item;
             did = TRUE;
         }
         item = nextItem;
     }
     QListIterator<AppLnk> it(hidden);
     while ((l=it.current())) {
         ++it;
         if ( l->linkFileKnown() && l->linkFile() == linkfile
                 || l->file() == linkfile
                 || dl.isValid() && dl.file() == l->file() ) {
             hidden.removeRef(l);
            did = TRUE;
         }
     }
     return did;
 }
 
 void LauncherIconView::addItem(AppLnk* app, bool resort)
 {
     addCatsAndMimes(app);
     if ( (tf.isEmpty() || tf.match(app->type()) >= 0)
      && (cf == 0 || app->categories().contains(cf)
          || cf == -1 && app->categories().count() == 0 ) ) {
         addCheckItem(app);
     } else {
         hidden.append(app);
     }
     if ( resort ){
         sort();
     }
 }
 
 void LauncherIconView::changeItem(const AppLnk&old,AppLnk*nlink)
 {
     QString oldfile = old.file();
     QString newfile = nlink->file();
 
     if (newfile != oldfile) {
         QMap<QString,QPixmap>::Iterator it = sm_EyeCache->find(oldfile);
         if (it != sm_EyeCache->end()) {
             (*sm_EyeCache)[newfile]=(*it);
         }
         removeLink(old.linkFile());
     } else {
         removeLink(old.linkFile(),false);
     }
     addItem(nlink,false);
 }
 
 void LauncherIconView::timerEvent( QTimerEvent *te )
 {
     if ( te->timerId() == busyTimer ) {
         if ( bsy )
         bsy->animateIcon();
     } else {
         QIconView::timerEvent( te );
     }
 }
 
 void LauncherIconView::setBigIcons( bool bi )
 {
     sm_EyeCache->clear();
     bigIcns = bi;
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     busyPix.resize(0,0);
 #endif
 }
 
 QIconViewItem* LauncherIconView::busyItem() const
 {
     return bsy;
 }
 
 void LauncherIconView::setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; }
 
 void LauncherIconView::calculateGrid( ItemTextPos pos )
 {
         int dw = QApplication::desktop()->width();
         int viewerWidth = dw-style().scrollBarExtent().width();
         if ( pos == Bottom ) {
             if( !numColumns ) {
                 if ( viewerWidth <= 200 ) numColumns = 2;
                 else if ( viewerWidth >= 400 ) numColumns = viewerWidth/96;
                 else numColumns = 3;
             }
             setSpacing( 4 );
             setGridX( (viewerWidth-(numColumns+1)*spacing())/numColumns );
             setGridY( fontMetrics().height()*2+24 );
         } else {
             if( !numColumns ) {
                 if ( viewerWidth < 150 ) numColumns = 1;
                 else if ( viewerWidth >= 400 ) numColumns = viewerWidth/150;
                 else numColumns = 2;
-            }          
+            }
             setSpacing( 2 );
             setGridX( (viewerWidth-(numColumns+1)*spacing())/numColumns );
             setGridY( fontMetrics().height()+2 );
         }
 }
 
 void LauncherIconView::styleChange( QStyle &old )
 {
     QIconView::styleChange( old );
     calculateGrid( itemTextPos() );
 }
 
 void LauncherIconView::keyPressEvent(QKeyEvent* e)
 {
     ike = TRUE;
     if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) {
         if ( (e->state() & ShiftButton) )
             emit mouseButtonPressed(ShiftButton, currentItem(), QPoint() );
          else
             returnPressed(currentItem());
     }
 
     QIconView::keyPressEvent(e);
     ike = FALSE;
 }
 
 //===========================================================================
 // Implemantation of LauncherIconview end
 //===========================================================================
 
 
 //===========================================================================
 LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
     : QVBox( parent, name, fl )
 {
     catmb = 0;
     icons = new LauncherIconView( this );
     setFocusProxy(icons);
     QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
 
     icons->setItemsMovable( FALSE );
     icons->setAutoArrange( TRUE );
     icons->setSorting( TRUE );
     icons->setFrameStyle( QFrame::NoFrame );
     icons->setMargin( 0 );
     icons->setSelectionMode( QIconView::NoSelection );
     icons->setBackgroundMode( PaletteBase );
     icons->setResizeMode( QIconView::Adjust );
     vmode = (ViewMode)-1;
     setViewMode( Icon );
 
     connect( icons, SIGNAL(mouseButtonClicked(int,QIconViewItem*,const QPoint&)),
            SLOT(itemClicked(int,QIconViewItem*)) );
     connect( icons, SIGNAL(selectionChanged()),
            SLOT(selectionChanged()) );
     connect( icons, SIGNAL(returnPressed(QIconViewItem*)),
            SLOT(returnPressed(QIconViewItem*)) );
     connect( icons, SIGNAL(mouseButtonPressed(int,QIconViewItem*,const QPoint&)),
            SLOT(itemPressed(int,QIconViewItem*)) );
 
     tools = 0;
     setBackgroundType( Ruled, QString::null );
 }
 
 LauncherView::~LauncherView()
 {
     if ( bgCache && bgCache->contains( bgName ) )
     (*bgCache)[bgName]->ref--;
 }
 
 
 bool LauncherView::bsy=FALSE;
 
 void LauncherView::setBusy(bool on)
 {
     icons->setBusy(on);
 }
 
 void LauncherView::setBusyIndicatorType( const QString& type ) {
     if ( type. lower ( ) == "animated" )
     icons->setBusyIndicatorType(  BIT_Animated  ) ;
     else
     icons->setBusyIndicatorType(  BIT_Normal  ) ;
 }
 
 void LauncherView::hideIcons()
 {
     icons->hide();
 }
 
 void LauncherView::setToolsEnabled(bool y)
 {
     if ( !y != !tools ) {
         if ( y ) {
             tools = new QHBox(this);
             // Type filter
             typemb = new QComboBox(tools);
             QSizePolicy p = typemb->sizePolicy();
             p.setHorData(QSizePolicy::Expanding);
             typemb->setSizePolicy(p);
             // Category filter
             updateTools();
             tools->show();
         } else {
             delete tools;
             tools = 0;
         }
     }
 }
 
 void LauncherView::updateTools()
 {
     disconnect( typemb, SIGNAL(activated(int)),
             this, SLOT(showType(int)) );
     if ( catmb ) {
         disconnect( catmb, SIGNAL(signalSelected(int)),this,SLOT(showCategory(int)));
     }
 
     // ### I want to remove this
     icons->updateCategoriesAndMimeTypes();
 
     QString prev;
 
     // Type filter
     QStringList types;
     typelist = icons->mimeTypes();
     for (QStringList::ConstIterator it = typelist.begin(); it!=typelist.end(); ++it) {
         QString t = *it;
         if ( t.left(12) == "application/" ) {
             MimeType mt(t);
             const AppLnk* app = mt.application();
             if ( app )
                 t = app->name();
             else
                 t = t.mid(12);
         } else {
             t[0] = t[0].upper();
         }
         types += t;
     }
     types << tr("All types");
     prev = typemb->currentText();
     typemb->clear();
     typemb->insertStringList(types);
     for (int i=0; i<typemb->count(); i++) {
         if ( typemb->text(i) == prev ) {
             typemb->setCurrentItem(i);
             break;
         }
     }
     if ( prev.isNull() ) {
         typemb->setCurrentItem(typemb->count()-1);
     }
 
     int pcat = catmb ? catmb->currentCategory() : -2;
     if ( !catmb ) {
         catmb = new CategorySelect(tools);
     } else if (pcat!=-2) {
 
     }
     Categories cats( 0 );
     cats.load( categoryFileName() );
     QArray<int> vl( 0 );
     catmb->setCategories( vl, "Document View", // No tr
         tr("Document View") );
     catmb->setRemoveCategoryEdit( TRUE );
     catmb->setAllCategories( TRUE );
     catmb->setCurrentCategory(pcat);
 
     // if type has changed we need to redisplay
     if ( typemb->currentText() != prev )
         showType( typemb->currentItem() );
 
     connect(typemb, SIGNAL(activated(int)), this, SLOT(showType(int)));
     connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int)));
 }
 
 void LauncherView::sortBy(int s)
 {
     icons->setSortMethod((LauncherIconView::SortMethod)s);
 }
 
 void LauncherView::showType(int t)
 {
     if ( t >= (int)typelist.count() ) {
         icons->setTypeFilter("",TRUE);
     } else {
         QString ty = typelist[t];
         if ( !ty.contains('/') )
             ty += "/*";
         icons->setTypeFilter(ty,TRUE);
     }
diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h
index 7844673..9ea2418 100644
--- a/core/settings/launcher/tabconfig.h
+++ b/core/settings/launcher/tabconfig.h
@@ -1,73 +1,74 @@
 /*
                =.            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_iconcolumns == tc. m_iconcolumns ) &&
                        ( 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 abe310f..bd51628 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -116,384 +116,385 @@ public:
             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_iconcolumns->setValue( tc. m_iconcolumns );
     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 );
 
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index ab64331..42f0568 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -1,326 +1,330 @@
 /*
                =.            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 );
+        qDebug( "m_iconcolumns for %s = %d", (const char*) *it, 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)" );
+                QCopEnvelope ic( "QPE/Launcher", "setIconColumns(QString,int)" );
+                ic << *it << tc. m_iconcolumns;
+
+        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;
 }