author | mickeyl <mickeyl> | 2005-01-11 17:32:06 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-01-11 17:32:06 (UTC) |
commit | f8fd8556da5649f54af740a5dbb9a8c1ead2bcfc (patch) (unidiff) | |
tree | db41b30ad733fc476746e1a9c7576a5a083240fa | |
parent | f82173157bdba4fa99afde9cc999bfe9b511ce07 (diff) | |
download | opie-f8fd8556da5649f54af740a5dbb9a8c1ead2bcfc.zip opie-f8fd8556da5649f54af740a5dbb9a8c1ead2bcfc.tar.gz opie-f8fd8556da5649f54af740a5dbb9a8c1ead2bcfc.tar.bz2 |
finish per-tab column setting. it now works on the fly and is persistent
-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 & | |||
417 | docLoadingWidget->setTextColor( QColor(color) ); | 417 | docLoadingWidget->setTextColor( QColor(color) ); |
418 | } else if ( msg == "setIconColumns(QString,int)" ) { | ||
419 | QString id; | ||
420 | stream >> id; | ||
421 | int number; | ||
422 | stream >> number; | ||
423 | if ( view(id ) ) | ||
424 | view(id)->setColNumber( number ); | ||
418 | } else if ( msg == "setFont(QString,QString,int,int,int)" ) { | 425 | } 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 ) | |||
641 | else numColumns = 2; | 641 | else numColumns = 2; |
642 | } | 642 | } |
643 | setSpacing( 2 ); | 643 | 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 { | |||
60 | ( m_bg_color == tc. m_bg_color ) && | 60 | ( m_bg_color == tc. m_bg_color ) && |
61 | ( m_iconcolumns == tc. m_iconcolumns ) && | ||
61 | ( m_text_color == tc. m_text_color ) && | 62 | ( 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 | |||
307 | //m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); | 307 | //m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); |
308 | m_iconcolumns->setValue( tc. m_iconcolumns ); | ||
308 | m_bgimage = tc. m_bg_image; | 309 | 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 ) | |||
172 | tc. m_iconcolumns = cfg. readNumEntry ( "Columns", tc. m_iconcolumns ); | 172 | tc. m_iconcolumns = cfg. readNumEntry ( "Columns", tc. m_iconcolumns ); |
173 | qDebug( "m_iconcolumns for %s = %d", (const char*) *it, tc.m_iconcolumns ); | ||
173 | tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color ); | 174 | tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color ); |
@@ -265,3 +266,6 @@ void TabsSettings::accept ( ) | |||
265 | 266 | ||
266 | QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" ); | 267 | QCopEnvelope ic( "QPE/Launcher", "setIconColumns(QString,int)" ); |
268 | ic << *it << tc. m_iconcolumns; | ||
269 | |||
270 | QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" ); | ||
267 | fe << *it; | 271 | fe << *it; |