author | sandman <sandman> | 2002-09-27 00:56:30 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-27 00:56:30 (UTC) |
commit | 82012ba8a063b729dec92db60c939834530a9fa4 (patch) (side-by-side diff) | |
tree | 105de4a377a4fb5c1a4c0c2e450e1ed3e93d66f7 /core/settings/launcher/tabssettings.cpp | |
parent | dcd5eb6949787321c278b10772bd75a27ec6d508 (diff) | |
download | opie-82012ba8a063b729dec92db60c939834530a9fa4.zip opie-82012ba8a063b729dec92db60c939834530a9fa4.tar.gz opie-82012ba8a063b729dec92db60c939834530a9fa4.tar.bz2 |
- fixed the font selection
- added a .control file
- fixed the default bg type
Diffstat (limited to 'core/settings/launcher/tabssettings.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index 0faaea3..8f5f7fa 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp @@ -105,42 +105,44 @@ void TabsSettings::readTabSettings ( ) 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; cfg. setGroup ( grp. arg ( *it )); QString view = cfg. readEntry ( "View", "Icon" ); if ( view == "List" ) // No tr tc. m_view = TabConfig::List; - QString bgType = cfg. readEntry ( "BackgroundType", "Ruled" ); + QString bgType = cfg. readEntry ( "BackgroundType", "Image" ); if ( bgType == "SolidColor" ) tc. m_bg_type = TabConfig::SolidColor; else if ( bgType == "Image" ) // No tr tc. m_bg_type = TabConfig::Image; - tc. m_bg_image = cfg. readEntry ( "BackgroundImage", "wallpaper/opie" ); + 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 ( )); QStringList f = cfg. readListEntry ( "Font", ',' ); if ( f. count ( ) == 4 ) { tc. m_font_family = f [0]; tc. m_font_size = f [1]. toInt ( ); - tc. m_font_style = f [2]; + tc. m_font_weight = f [2]. toInt ( ); + tc. m_font_italic = ( f [3]. toInt ( )); } else { tc. m_font_family = font ( ). family ( ); tc. m_font_size = font ( ). pointSize ( ); - tc. m_font_style = "Regular"; + tc. m_font_weight = 50; + tc. m_font_italic = false; } m_tabs [*it] = tc; } } void TabsSettings::accept ( ) { Config cfg ( "Launcher" ); // Launcher Tab QString grp ( "Tab %1" ); // No tr @@ -158,50 +160,50 @@ void TabsSettings::accept ( ) case TabConfig::List: cfg.writeEntry ( "View", "List" ); break; } QCopEnvelope e ( "QPE/Launcher", "setTabView(QString,int)" ); e << *it << tc. m_view; cfg. writeEntry ( "BackgroundImage", tc. m_bg_image ); cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); cfg. writeEntry ( "TextColor", tc. m_text_color ); - QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + tc. m_font_style + ",0"; + 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 ); QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); switch ( tc. m_bg_type ) { case TabConfig::Ruled: cfg.writeEntry( "BackgroundType", "Ruled" ); be << *it << tc. m_bg_type << QString(""); break; case TabConfig::SolidColor: cfg.writeEntry( "BackgroundType", "SolidColor" ); be << *it << tc. m_bg_type << tc. m_bg_color; break; case TabConfig::Image: cfg.writeEntry( "BackgroundType", "Image" ); be << *it << tc. m_bg_type << tc. m_bg_image; break; } QCopEnvelope te( "QPE/Launcher", "setTextColor(QString,QString)" ); te << *it << tc. m_text_color; QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" ); fe << *it << tc. m_font_family; fe << tc. m_font_size; - fe << 50 << 0; + fe << tc. m_font_weight << ( tc. m_font_italic ? 1 : 0 ); tc. m_changed = false; } } void TabsSettings::newClicked ( ) { QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" )); } void TabsSettings::deleteClicked ( ) { |