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
@@ -414,8 +414,15 @@ void LauncherTabWidget::launcherMessage( const QCString &msg, const QByteArray &
         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;
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
@@ -638,9 +638,9 @@ void LauncherIconView::calculateGrid( ItemTextPos pos )
             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 );
         }
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
@@ -57,8 +57,9 @@ struct TabConfig {
 		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 ) &&
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
@@ -304,8 +304,9 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
     //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 ));
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
@@ -169,8 +169,9 @@ void TabsSettings::readTabSettings ( Config &cfg )
 		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;
@@ -262,9 +263,12 @@ void TabsSettings::accept ( )
 
 		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;