| -rw-r--r-- | core/launcher/launcher.cpp | 7 | ||||
| -rw-r--r-- | core/launcher/launcherview.cpp | 2 | ||||
| -rw-r--r-- | core/settings/launcher/tabconfig.h | 1 | ||||
| -rw-r--r-- | core/settings/launcher/tabdialog.cpp | 1 | ||||
| -rw-r--r-- | core/settings/launcher/tabssettings.cpp | 6 |
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 @@ -417,2 +417,9 @@ void LauncherTabWidget::launcherMessage( const QCString &msg, const QByteArray & 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)" ) { 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 @@ -641,3 +641,3 @@ void LauncherIconView::calculateGrid( ItemTextPos pos ) else numColumns = 2; - } + } setSpacing( 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 @@ -60,2 +60,3 @@ struct TabConfig { ( m_bg_color == tc. m_bg_color ) && + ( m_iconcolumns == tc. m_iconcolumns ) && ( m_text_color == tc. m_text_color ) && 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 @@ -307,2 +307,3 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig //m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); + m_iconcolumns->setValue( tc. m_iconcolumns ); m_bgimage = tc. m_bg_image; 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 @@ -172,2 +172,3 @@ void TabsSettings::readTabSettings ( Config &cfg ) 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 ); @@ -265,3 +266,6 @@ void TabsSettings::accept ( ) - 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; |