Diffstat (limited to 'core/settings/launcher/tabssettings.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | core/settings/launcher/tabssettings.cpp | 69 |
1 files changed, 43 insertions, 26 deletions
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index a5afaf2..9d6e8c1 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp @@ -49,3 +49,3 @@ -#define GLOBALID "_launchersettings_global_dummy_" +#define GLOBALID ".global." @@ -126,13 +126,24 @@ void TabsSettings::readTabSettings ( Config &cfg ) + TabConfig global_def; + global_def. m_view = TabConfig::Icon; + global_def. m_bg_type = TabConfig::Ruled; + global_def. m_bg_image = "launcher/opie-background"; + global_def. m_bg_color = colorGroup ( ). color ( QColorGroup::Base ). name ( ); + global_def. m_text_color = colorGroup ( ). color ( QColorGroup::Text ). name ( ); + global_def. m_font_use = false; + global_def. m_font_family = font ( ). family ( ); + global_def. m_font_size = font ( ). pointSize ( ); + global_def. m_font_weight = 50; + global_def. m_font_italic = false; + global_def. m_changed = false; + + for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { - TabConfig tc; - tc. m_view = TabConfig::Icon; - tc. m_bg_type = TabConfig::Ruled; - tc. m_changed = false; + TabConfig tc = ( it != m_ids. begin ( )) ? m_tabs [GLOBALID] : global_def; cfg. setGroup ( grp. arg ( *it )); - if ( *it == GLOBALID ) - cfg. clearGroup ( ); - QString view = cfg. readEntry ( "View", "Icon" ); + QString view = cfg. readEntry ( "View" ); + if ( view == "Icon" ) // No tr + tc. m_view = TabConfig::Icon; if ( view == "List" ) // No tr @@ -140,4 +151,6 @@ void TabsSettings::readTabSettings ( Config &cfg ) - QString bgType = cfg. readEntry ( "BackgroundType", "Image" ); - if ( bgType == "SolidColor" ) + QString bgType = cfg. readEntry ( "BackgroundType" ); + if ( bgType == "Image" ) + tc. m_bg_type = TabConfig::Image; + else if ( bgType == "SolidColor" ) tc. m_bg_type = TabConfig::SolidColor; @@ -146,7 +159,8 @@ void TabsSettings::readTabSettings ( Config &cfg ) - tc. m_bg_image = cfg. readEntry ( "BackgroundImage", "launcher/opie-background" ); - tc. m_bg_color = cfg. readEntry ( "BackgroundColor", colorGroup ( ). color ( QColorGroup::Base ). name ( )); - tc. m_text_color = cfg. readEntry ( "TextColor", colorGroup ( ). color ( QColorGroup::Text ). name ( )); + tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image ); + tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color ); + 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; tc. m_font_family = f [0]; @@ -155,9 +169,3 @@ void TabsSettings::readTabSettings ( Config &cfg ) tc. m_font_italic = ( f [3]. toInt ( )); - } else { - tc. m_font_family = font ( ). family ( ); - tc. m_font_size = font ( ). pointSize ( ); - tc. m_font_weight = 50; - tc. m_font_italic = false; - } - + } m_tabs [*it] = tc; @@ -178,4 +186,6 @@ void TabsSettings::readTabSettings ( Config &cfg ) } - if ( same ) + if ( same ) { m_tabs [GLOBALID] = *first; + m_tabs [GLOBALID]. m_changed = true; + } } @@ -193,3 +203,3 @@ void TabsSettings::accept ( ) - if ( !tc. m_changed || ( *it == GLOBALID )) + if ( !tc. m_changed ) continue; @@ -213,4 +223,9 @@ void TabsSettings::accept ( ) - QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" ); - cfg. writeEntry ( "Font", f ); + if ( tc. m_font_use ) { + QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" ); + cfg. writeEntry ( "Font", f ); + } + else + cfg. removeEntry ( "Font" ); + QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); @@ -236,5 +251,7 @@ void TabsSettings::accept ( ) QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" ); - fe << *it << tc. m_font_family; + fe << *it; + fe << ( tc. m_font_use ? tc. m_font_family : QString::null ); fe << tc. m_font_size; - fe << tc. m_font_weight << ( tc. m_font_italic ? 1 : 0 ); + fe << tc. m_font_weight; + fe << ( tc. m_font_italic ? 1 : 0 ); |