--- kdebase-3.4.2/kicker/applets/launcher/quicklauncher.cpp-- 2005-05-23 14:14:14.000000000 +0200 +++ kdebase-3.4.2/kicker/applets/launcher/quicklauncher.cpp 2005-08-16 14:33:26.000000000 +0200 @@ -379,7 +379,7 @@ void QuickLauncher::dragEnterEvent(QDrag _dragButtons=new ButtonGroup; _oldButtons=new ButtonGroup(*_buttons); - + QString url; KURL::List::ConstIterator it = kurlList.begin(); for ( ; it != kurlList.end(); ++it ) { @@ -601,11 +601,94 @@ void QuickLauncher::loadConfig() addApp(*iter++); } } else { - addApp("kde-Home.desktop"); - addApp("kde-konsole.desktop"); - addApp("kde-KControl.desktop"); - addApp("kde-Help.desktop"); - addApp("kde-kwrite.desktop"); + QString typeMenu = KStandardDirs::menu_type_by_version(); + switch( KStandardDirs::mandrake_distro_version()) + { + case KStandardDirs::DOWNLOAD: + { + if ( typeMenu != "mdk" ) + { + addApp("kde-Home.desktop"); + addApp("kde-konsole.desktop"); + addApp("kde-KControl.desktop"); + addApp("kde-Help.desktop"); + addApp("kde-kwrite.desktop"); + } + else + { + addApp("Mandrakelinux-Internet-WebBrowsers-Mozilla Firefox.desktop"); + addApp("Mandrakelinux-Internet-Mail-Kontact.desktop"); + addApp("Mandrakelinux-Internet-InstantMessaging-kopete.desktop"); + addApp("Mandrakelinux-System-Terminals-konsole.desktop"); + } + } + break; + case KStandardDirs::POWERPACK: + { + if ( typeMenu != "mdk" ) + { + addApp("kde-Home.desktop"); + addApp("kde-konsole.desktop"); + addApp("kde-KControl.desktop"); + addApp("kde-Help.desktop"); + addApp("kde-kwrite.desktop"); + } + else + { + addApp("Mandrakelinux-Internet-WebBrowsers-Mozilla Firefox.desktop"); + addApp("Mandrakelinux-Internet-Mail-Kontact.desktop"); + addApp("Mandrakelinux-Office-Wordprocessors-OpenOffice.org Writer.desktop"); + addApp("Mandrakelinux-MoreApplications-Development-DevelopmentEnvironments-kdevelop.desktop"); + addApp("Mandrakelinux-System-Terminals-konsole.desktop"); + addApp("Mandrakelinux-System-Configuration-Configure Your Computer.desktop"); + } + } + break; + case KStandardDirs::DISCOVERY: + { + if ( typeMenu != "mdk" ) + { + addApp("kde-Home.desktop"); + addApp("kde-konsole.desktop"); + addApp("kde-KControl.desktop"); + addApp("kde-Help.desktop"); + addApp("kde-kwrite.desktop"); + } + else + { + addApp("Mandrakelinux-Internet-WebBrowsers-Mozilla Firefox.desktop"); + addApp("Mandrakelinux-Internet-Mail-kontact.desktop"); + addApp("Mandrakelinux-Internet-InstantMessaging-kopete.desktop"); + addApp("Mandrakelinux-Office-Wordprocessors-openoffice.org_writer.desktop"); + addApp("Mandrakelinux-Multimedia-Sound-amarok.desktop"); + } + } + break; + case KStandardDirs::POWERPACKPLUS: + { + if ( typeMenu != "mdk" ) + { + addApp("kde-Home.desktop"); + addApp("kde-konsole.desktop"); + addApp("kde-KControl.desktop"); + addApp("kde-Help.desktop"); + addApp("kde-kwrite.desktop"); + } + else + { + + addApp("Mandrakelinux-Internet-WebBrowsers-Mozilla Firefox.desktop"); + addApp("Mandrakelinux-Internet-Mail-kontact.desktop"); + addApp("Mandrakelinux-Office-Wordprocessors-openoffice.org_writer.desktop"); + addApp("Mandrakelinux-System-Terminals-konsole.desktop"); + addApp("Mandrakelinux-System-Configuration-configure_your_computer_(expert).desktop"); + addApp( "Mandrakelinux-System-Configuration-configure_your_computer.desktop" ); + } + } + break; + default: + break; + } } }