3 files changed, 6 insertions, 0 deletions

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
@@ -55,12 +55,13 @@ struct TabConfig {
         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 ) &&
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
@@ -302,12 +302,13 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
     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 ( ));
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
@@ -167,12 +167,13 @@ void TabsSettings::readTabSettings ( Config &cfg )
                         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 ( );
@@ -260,12 +261,15 @@ void TabsSettings::accept ( )
                                 break;
                 }
 
                 QCopEnvelope te( "QPE/Launcher", "setTextColor(QString,QString)" );
                 te << *it << tc. m_text_color;
 
+                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 );