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 /core/settings/launcher | |
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/settings/launcher/tabconfig.h | 1 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 1 | ||||
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 6 |
3 files changed, 7 insertions, 1 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 | |||
@@ -59,4 +59,5 @@ struct TabConfig { | |||
59 | ( m_bg_image == tc. m_bg_image ) && | 59 | ( m_bg_image == tc. m_bg_image ) && |
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 ) && |
62 | ( m_font_use == tc. m_font_use ) && | 63 | ( m_font_use == tc. m_font_use ) && |
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 | |||
@@ -306,4 +306,5 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig | |||
306 | m_bgtype-> setButton ( tc. m_bg_type ); | 306 | m_bgtype-> setButton ( tc. m_bg_type ); |
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; |
309 | bgTypeClicked ( tc. m_bg_type ); | 310 | bgTypeClicked ( tc. m_bg_type ); |
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 | |||
@@ -171,4 +171,5 @@ void TabsSettings::readTabSettings ( Config &cfg ) | |||
171 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color ); | 171 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color ); |
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 ); |
174 | QStringList f = cfg. readListEntry ( "Font", ',' ); | 175 | QStringList f = cfg. readListEntry ( "Font", ',' ); |
@@ -264,5 +265,8 @@ void TabsSettings::accept ( ) | |||
264 | te << *it << tc. m_text_color; | 265 | te << *it << tc. m_text_color; |
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; |
268 | fe << ( tc. m_font_use ? tc. m_font_family : QString::null ); | 272 | fe << ( tc. m_font_use ? tc. m_font_family : QString::null ); |