summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--core/launcher/launcher.cpp1
-rw-r--r--core/launcher/launcherview.cpp38
-rw-r--r--core/launcher/launcherview.h5
4 files changed, 32 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 8847714..fdaaa25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,4 +3,5 @@
New Features
------------
+ * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl)
Fixed Bugs
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
@@ -290,4 +290,5 @@ void LauncherTabWidget::setTabViewAppearance( LauncherView *v, Config &cfg )
// bool customFont = cfg.readBoolEntry( "CustomFont", FALSE );
+ v->setColNumber( cfg.readNumEntry( "Columns", 0 ) );
QStringList font = cfg.readListEntry( "Font", ',' );
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
@@ -23,4 +23,5 @@
/* OPIE */
#include <opie2/odebug.h>
+#include <qpe/config.h>
#include <qtopia/qpeapplication.h>
#include <qtopia/private/categories.h>
@@ -283,5 +284,5 @@ 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;
@@ -626,20 +627,20 @@ void LauncherIconView::calculateGrid( ItemTextPos pos )
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 );
}
@@ -1004,4 +1005,15 @@ void LauncherView::setBackgroundType( BackgroundType t, const QString &val )
}
+void LauncherView::setColNumber( int num )
+{
+ icons->setColNumber( num );
+}
+
+void LauncherIconView::setColNumber( int num )
+{
+ numColumns = num;
+ calculateGrid( Bottom );
+}
+
void LauncherView::setTextColor( const QColor &tc )
{
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
@@ -83,4 +83,6 @@ public:
void setViewFont( const QFont & );
void clearViewFont();
+
+ void setColNumber( int );
void relayout(void);
@@ -197,4 +199,6 @@ public:
}
+ void setColNumber( int );
+
void drawBackground( QPainter *p, const QRect &r );
void setItemTextPos( ItemTextPos pos );
@@ -246,4 +250,5 @@ private:
BusyIndicatorType busyType;
QTimer m_eyeTimer;
+ int numColumns;
};