--- kdebase-3.3.0/kcontrol/kicker/lookandfeeltab_impl.cpp-- 2004-09-16 04:28:19.018693147 -0400 +++ kdebase-3.3.0/kcontrol/kicker/lookandfeeltab_impl.cpp 2004-09-16 04:29:54.873632151 -0400 @@ -225,15 +225,16 @@ void LookAndFeelTab::load() m_urlColor->setEnabled(false); m_browserColor->setEnabled(false); m_wlColor->setEnabled(false); - if (c.readBoolEntry("EnableTileBackground", false)) + if (c.readBoolEntry("EnableTileBackground", true)) { c.setGroup("button_tiles"); - if (c.readBoolEntry("EnableKMenuTiles", false)) + if (c.readBoolEntry("EnableKMenuTiles", true)) { - tile = c.readEntry("KMenuTile", "solid_blue"); + tile = c.readEntry("KMenuTile", "Colorize"); + QColor kickerButtonColor( 104, 129, 188 ); m_kmenuTile->setCurrentItem(m_tilename.findIndex(tile)); - m_kmenuColor->setColor(c.readColorEntry("KMenuTileColor")); + m_kmenuColor->setColor(c.readColorEntry("KMenuTileColor", &kickerButtonColor)); m_kmenuColor->setEnabled(tile == "Colorize"); } @@ -362,14 +363,14 @@ void LookAndFeelTab::defaults() m_zoom_cb->setChecked(false); m_showToolTips->setChecked(true); - m_kmenuTile->setCurrentItem(0); + m_kmenuTile->setCurrentItem(1); m_urlTile->setCurrentItem(0); m_browserTile->setCurrentItem(0); m_wlTile->setCurrentItem(0); m_desktopTile->setCurrentItem(0); - m_kmenuColor->setColor(QColor()); - m_kmenuColor->setEnabled(false); + m_kmenuColor->setColor(QColor(104,129,188)); + m_kmenuColor->setEnabled(true); m_urlColor->setColor(QColor()); m_urlColor->setEnabled(false); m_desktopColor->setColor(QColor()); --- kdebase-3.3.0/kicker/buttons/panelbutton.cpp-- 2004-09-16 04:30:07.436886281 -0400 +++ kdebase-3.3.0/kicker/buttons/panelbutton.cpp 2004-09-16 04:32:00.441172107 -0400 @@ -49,7 +49,7 @@ void PanelButton::configure() return; KConfigGroup config( KGlobal::config(), "buttons" ); - if( !config.readBoolEntry( "EnableTileBackground", false ) ) { + if( !config.readBoolEntry( "EnableTileBackground", true ) ) { setTile( QString::null ); return; } @@ -60,16 +60,31 @@ void PanelButton::configure() return; } - QString tile = tilesGroup.readEntry( name + "Tile" ); - QColor color = QColor(); - - if (tile == "Colorize") - { - color = tilesGroup.readColorEntry( name + "TileColor" ); - tile = QString::null; + if( name == "KMenu" ) + { + QString tile = tilesGroup.readEntry( name + "Tile", "Colorize" ); + QColor color = (tile == "Colorize" ) ? QColor(104,129,188) : QColor(); + + if (tile == "Colorize") + { + color = tilesGroup.readColorEntry( name + "TileColor", &color ); + tile = QString::null; + } + setTile( tile, color ); + } + else + { + QString tile = tilesGroup.readEntry( name + "Tile" ); + QColor color = QColor(); + + if (tile == "Colorize") + { + color = tilesGroup.readColorEntry( name + "TileColor" ); + tile = QString::null; + } + setTile( tile, color ); } - - setTile( tile, color ); + PanelButtonBase::configure(); } void PanelButton::slotIconChanged(int group)