make number of icon columns in the launcher customizable per-tab

TODO: add GUI for that

4 files changed, 32 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 8847714..fdaaa25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,28 +1,29 @@
 2005-??-??	Opie 1.2.0
 
 	New Features
 	------------
+	* Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,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)
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 970b8cb..4f81076 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -268,48 +268,49 @@ void LauncherTabWidget::setLoadingProgress( int percent )
 // ### 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() )
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index dc4c57f..9d78c0d 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -1,48 +1,49 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "launcherview.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <qpe/config.h>
 #include <qtopia/qpeapplication.h>
 #include <qtopia/private/categories.h>
 #include <qtopia/categoryselect.h>
 #include <qtopia/mimetype.h>
 #include <qtopia/resource.h>
 using namespace Opie::Core;
 
 #include <qpe/qcopenvelope_qws.h>
 
 /* QT */
 #include <qtimer.h>
 #include <qfileinfo.h>
 #include <qiconview.h>
 #include <qobjectlist.h>
 
 
 // These define how the busy icon is animated and highlighted
 #define BRIGHTEN_BUSY_ICON
 //#define ALPHA_FADE_BUSY_ICON
 //#define USE_ANIMATED_BUSY_ICON_OVERLAY
 #define BOUNCE_BUSY_ICON
 
 typedef QMap<QString,QPixmap>::Iterator pixiter;
 
@@ -261,49 +262,49 @@ void LauncherItem::resetIcon()
     if (isEyeImage()) {
         QMap<QString,QPixmap>::Iterator it = LauncherIconView::sm_EyeCache->find(appLnk()->file());
         if (it != LauncherIconView::sm_EyeCache->end()) {
             setPixmap(*it);
             return;
         }
     }
     setPixmap(isBigIcon ? app->bigPixmap() : app->pixmap());
 }
 
 void LauncherItem::setEyePixmap(const QPixmap&aIcon)
 {
     if (!isEyeImage()) return;
     setPixmap(aIcon);
     m_EyeImageSet = EYE_ICON;
 }
 
 //===========================================================================
 // Implemantation of LauncherIconview start
 //===========================================================================
 
 QMap<QString,QPixmap>* LauncherIconView::sm_EyeCache=0;
 
 LauncherIconView::LauncherIconView( QWidget* parent, const char* name )
-    : QIconView(parent,name),tf(""),cf(0),bsy(0),busyTimer(0),bigIcns(TRUE),bgColor(white)
+    : QIconView(parent,name),tf(""),cf(0),bsy(0),busyTimer(0),bigIcns(TRUE),bgColor(white),numColumns(0)
 {
     m_EyeCallBack = 0;
     if (!sm_EyeCache) sm_EyeCache = new QMap<QString,QPixmap>();
     sortmeth = Name;
     hidden.setAutoDelete(TRUE);
     ike = FALSE;
     calculateGrid( Bottom );
     connect(&m_eyeTimer,SIGNAL(timeout()),this,SLOT(stopEyeTimer()));
 }
 
 LauncherIconView::~LauncherIconView()
 {
     odebug << "LauncherIconView::~LauncherIconView()" << oendl;
 #if 0 // debuggery
     QListIterator<AppLnk> it(hidden);
     AppLnk* l;
     while ((l=it.current())) {
         ++it;
         //odebug << "" << l << ": hidden (should remove)" << oendl;
     }
 #endif
 }
 
 int LauncherIconView::compare(const AppLnk* a, const AppLnk* b)
@@ -604,64 +605,64 @@ void LauncherIconView::timerEvent( QTimerEvent *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 ) {
-            int cols = 3;
-            if ( viewerWidth <= 200 )
-                cols = 2;
-            else if ( viewerWidth >= 400 )
-                 cols = viewerWidth/96;
+            if( !numColumns ) {
+                if ( viewerWidth <= 200 ) numColumns = 2;
+                else if ( viewerWidth >= 400 ) numColumns = viewerWidth/96;
+                else numColumns = 3;
+            }
             setSpacing( 4 );
-            setGridX( (viewerWidth-(cols+1)*spacing())/cols );
+            setGridX( (viewerWidth-(numColumns+1)*spacing())/numColumns );
             setGridY( fontMetrics().height()*2+24 );
         } else {
-            int cols = 2;
-            if ( viewerWidth < 150 )
-                cols = 1;
-            else if ( viewerWidth >= 400 )
-                cols = viewerWidth/150;
+            if( !numColumns ) {
+                if ( viewerWidth < 150 ) numColumns = 1;
+                else if ( viewerWidth >= 400 ) numColumns = viewerWidth/150;
+                else numColumns = 2;
+            }          
             setSpacing( 2 );
-            setGridX( (viewerWidth-(cols+1)*spacing())/cols );
+            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;
 }
 
@@ -982,48 +983,59 @@ void LauncherView::setBackgroundType( BackgroundType t, const QString &val )
     for ( QObjectListIt it( *list ); (obj=it.current()); ++it ) {
     if ( obj->isWidgetType() ) {
         QWidget *w = (QWidget*)obj;
         w->setBackgroundPixmap( bg );
         if ( bgName.isEmpty() ) {
         // Solid Color
         if ( val.isEmpty() )
             w->setBackgroundColor( colorGroup().base() );
         else
             w->setBackgroundColor( val );
         } else {
         // Ruled or Image pixmap
         w->setBackgroundOrigin( ParentOrigin );
         }
     }
     }
     delete list;
 
     bgType = t;
     icons->viewport()->update();
 
     QTimer::singleShot( 1000, this, SLOT(flushBgCache()) );
 }
 
+void LauncherView::setColNumber( int num )
+{
+    icons->setColNumber( num );
+}
+
+void LauncherIconView::setColNumber( int num )
+{
+    numColumns = num;
+    calculateGrid( Bottom );
+}
+
 void LauncherView::setTextColor( const QColor &tc )
 {
     textCol = tc;
     QColorGroup cg = icons->colorGroup();
     cg.setColor( QColorGroup::Text, tc );
     icons->setPalette( QPalette(cg,cg,cg) );
     icons->viewport()->update();
 }
 
 void LauncherView::setViewFont( const QFont &f )
 {
     icons->setFont( f );
     icons->hideOrShowItems( FALSE );
 }
 
 void LauncherView::clearViewFont()
 {
     icons->unsetFont();
     icons->hideOrShowItems( FALSE );
 }
 
 void LauncherView::resizeEvent(QResizeEvent *e)
 {
 //  qDebug("LauncherView resize event");
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h
index 05073ab..e2869eb 100644
--- a/core/launcher/launcherview.h
+++ b/core/launcher/launcherview.h
@@ -61,48 +61,50 @@ public:
     void removeAllItems();
     void setSortEnabled(bool);
     void setUpdatesEnabled(bool);
     void sort();
 
     void setToolsEnabled(bool);
     void updateTools();
 
     void setBusy(bool);
     void setBusyIndicatorType( const QString& );
 
     enum ViewMode { Icon, List };
     void setViewMode( ViewMode m );
     ViewMode viewMode() const { return vmode; }
 
     enum BackgroundType { Ruled, SolidColor, Image };
     void setBackgroundType( BackgroundType t, const QString & );
     BackgroundType backgroundType() const { return bgType; }
 
     void setTextColor( const QColor & );
     QColor textColor() const { return textCol; }
 
     void setViewFont( const QFont & );
     void clearViewFont();
+    
+    void setColNumber( int );
 
     void relayout(void);
 
 signals:
     void clicked( const AppLnk * );
     void rightPressed( AppLnk * );
 
 protected slots:
     void selectionChanged();
     void returnPressed( QIconViewItem *item );
     void itemClicked( int, QIconViewItem * );
     void itemPressed( int, QIconViewItem * );
     void sortBy(int);
     void showType(int);
     void showCategory( int );
     void resizeEvent(QResizeEvent *);
     void flushBgCache();
 
 protected:
     void paletteChange( const QPalette & );
 
     void fontChanged(const QFont &);
 
 private:
@@ -175,48 +177,50 @@ public:
     }
 
     void setBusy(bool on);
     bool inKeyEvent() const { return ike; }
 
     void addItem(AppLnk* app, bool resort=TRUE);
     bool removeLink(const QString& linkfile,bool removeCache = true);
     void changeItem(const AppLnk&old,AppLnk*nlink);
 
     QStringList mimeTypes() const;
     QStringList categories() const;
     void clear();
     void addCatsAndMimes(AppLnk* app);
 
     void setBackgroundOrigin( QWidget::BackgroundOrigin ) {}
 
     void setBackgroundPixmap( const QPixmap &pm ) {
         bgPixmap = pm;
     }
 
     void setBackgroundColor( const QColor &c ) {
         bgColor = c;
     }
 
+    void setColNumber( int );
+    
     void drawBackground( QPainter *p, const QRect &r );
     void setItemTextPos( ItemTextPos pos );
     void hideOrShowItems(bool resort);
 
     void setTypeFilter(const QString& typefilter, bool resort);
     void setCategoryFilter( int catfilter, bool resort );
 
     enum SortMethod { Name, Date, Type };
 
     void setSortMethod( SortMethod m );
     int compare(const AppLnk* a, const AppLnk* b);
     void requestEyePix(const LauncherItem*which);
 
     static QMap<QString,QPixmap>* sm_EyeCache;
 
 protected:
     virtual void timerEvent( QTimerEvent *te );
     void styleChange( QStyle &old );
     void calculateGrid( ItemTextPos pos );
     void focusInEvent( QFocusEvent * ) {}
     void focusOutEvent( QFocusEvent * ) {}
     LauncherItem*findDocItem(const QString&);
     void addCheckItem(AppLnk* app);
     void checkCallback();
@@ -224,27 +228,28 @@ protected:
 
 protected slots:
     void setEyePixmap(const QPixmap&,const QString&,int width);
     void stopEyeTimer();
 
 private:
     QList<AppLnk> hidden;
     QDict<void> mimes;
     QDict<void> cats;
     SortMethod sortmeth;
     QRegExp tf;
     int cf;
     LauncherItem* bsy;
     int busyTimer;
     bool ike;
     bool bigIcns;
     QPixmap bgPixmap;
     QColor bgColor;
     LauncherThumbReceiver*m_EyeCallBack;
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     QPixmap busyPix;
 #endif
     BusyIndicatorType busyType;
     QTimer m_eyeTimer;
+    int numColumns;
 };
 
 #endif // LAUNCHERVIEW_H