--- kdebase-3.4.0/kicker/core/containerarea.cpp-- 2005-04-07 11:31:11.240134498 -0400 +++ kdebase-3.4.0/kicker/core/containerarea.cpp 2005-04-07 11:36:38.767344569 -0400 @@ -149,8 +149,57 @@ void ContainerArea::defaultContainerConf dsize -= 560; QStringList buttons; + QFile f; + QString menuType = KStandardDirs::menu_type_by_version(); + if( menuType == "kde" ) + { + f.setName(locate("data", "kicker/default-apps")); + } + else if( menuType == "mdk" ) + { + switch( KStandardDirs::mandrake_distro_version()) + { + case KStandardDirs::DOWNLOAD: + f.setName(locate("data", "kicker/default-download-apps")); + break; + case KStandardDirs::POWERPACK: + f.setName(locate("data", "kicker/default-powerpack-apps")); + break; + case KStandardDirs::DISCOVERY: + f.setName(locate("data", "kicker/default-discovery-apps")); + break; + case KStandardDirs::POWERPACKPLUS: + f.setName(locate("data", "kicker/default-powerpackplus-apps")); + break; + default: + f.setName(locate("data", "kicker/default-apps")); + break; + } + } + else + { + switch( KStandardDirs::mandrake_distro_version()) + { + case KStandardDirs::DOWNLOAD: + f.setName(locate("data", "kicker/default-download-apps-simplified")); + break; + case KStandardDirs::POWERPACK: + f.setName(locate("data", "kicker/default-powerpack-apps-simplified")); + break; + case KStandardDirs::DISCOVERY: + f.setName(locate("data", "kicker/default-discovery-apps-simplified")); + break; + case KStandardDirs::POWERPACKPLUS: + f.setName(locate("data", "kicker/default-powerpackplus-apps-simplified")); + break; + default: + f.setName(locate("data", "kicker/default-apps")); + break; + } + + } - QFile f(locate("data", "kicker/default-apps")); + if (f.open(IO_ReadOnly)) { QTextStream is(&f);