-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 | |||
@@ -57,8 +57,9 @@ struct TabConfig { | |||
57 | return ( m_view == tc. m_view ) && | 57 | return ( m_view == tc. m_view ) && |
58 | ( m_bg_type == tc. m_bg_type ) && | 58 | ( m_bg_type == tc. m_bg_type ) && |
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 ) && |
63 | ( m_font_use ? ( | 64 | ( m_font_use ? ( |
64 | ( m_font_family == tc. m_font_family ) && | 65 | ( 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 | |||
304 | //m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); | 304 | //m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); |
305 | iconColorClicked ( m_iconcolor-> color ( )); | 305 | iconColorClicked ( m_iconcolor-> color ( )); |
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 ); |
310 | m_fontuse-> setChecked ( tc. m_font_use ); | 311 | m_fontuse-> setChecked ( tc. m_font_use ); |
311 | m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); | 312 | 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 ) | |||
169 | tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image ); | 169 | tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image ); |
170 | tc. m_last_directory = cfg2.readEntry( "DefaultDir", "" ); | 170 | tc. m_last_directory = cfg2.readEntry( "DefaultDir", "" ); |
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", ',' ); |
175 | if ( f. count ( ) == 4 ) { | 176 | if ( f. count ( ) == 4 ) { |
176 | tc. m_font_use = true; | 177 | tc. m_font_use = true; |
@@ -262,9 +263,12 @@ void TabsSettings::accept ( ) | |||
262 | 263 | ||
263 | QCopEnvelope te( "QPE/Launcher", "setTextColor(QString,QString)" ); | 264 | QCopEnvelope te( "QPE/Launcher", "setTextColor(QString,QString)" ); |
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 ); |
269 | fe << tc. m_font_size; | 273 | fe << tc. m_font_size; |
270 | fe << tc. m_font_weight; | 274 | fe << tc. m_font_weight; |