1 files changed, 12 insertions, 2 deletions

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
@@ -52,4 +52,5 @@
 #include <qwhatsthis.h>
 #include <qcheckbox.h>
+#include <qspinbox.h>
 
 
@@ -81,4 +82,6 @@ private:
 };
 
+//FIXME: Why not derive SampleView from LauncherView ???
+
 class SampleView : public QIconView {
 public:
@@ -195,4 +198,5 @@ public:
     }
 
+    //FIXME: Add per-tab column handling from launcherview.cpp
     void calculateGrid ( ItemTextPos pos )
     {
@@ -417,11 +421,10 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
     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 ) );
@@ -429,4 +432,10 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
     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 );
 
@@ -507,4 +516,5 @@ void TabDialog::accept ( )
     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 ( );