=== modified file 'src/daemon/installevent/installevent.cpp' --- src/daemon/installevent/installevent.cpp 2010-01-16 22:14:28 +0000 +++ src/daemon/installevent/installevent.cpp 2010-04-07 23:48:36 +0000 @@ -30,6 +30,7 @@ : Event(parent, name) , m_applicationName(0) , m_multimediaPackages() + , m_screensaverPackages() , m_packageList() , m_installGui(0) { @@ -39,6 +40,8 @@ m_multimediaPackages["libdvdread4"] = i18n("DVD Reading"); m_multimediaPackages["libk3b6-extracodecs"] = i18n("K3b CD Codecs"); m_multimediaPackages["libmp3lame0"] = i18n("MP3 Encoding"); + + m_screensaverPackages["kscreensaver"] = i18n("Set of default screensavers"); } InstallEvent::~InstallEvent() @@ -61,10 +64,10 @@ Event::show(icon, text, actions); } -void InstallEvent::addPackages() +void InstallEvent::addPackages(QMap* packageList) { - QMap::const_iterator packageIter = m_multimediaPackages.constBegin(); - while (packageIter != m_multimediaPackages.end()) { + QMap::const_iterator packageIter = packageList->constBegin(); + while (packageIter != packageList->end()) { if (!QFile::exists("/var/lib/dpkg/info/" + packageIter.key() + ".list")) { m_packageList[packageIter.key()] = packageIter.value(); } @@ -78,7 +81,9 @@ m_packageList.clear(); if (m_multimediaPackages.contains(package)) { - addPackages(); + addPackages(&m_multimediaPackages); + } else if (m_screensaverPackages.contains(package)) { + addPackages(&m_screensaverPackages); } if (!m_packageList.isEmpty()) { === modified file 'src/daemon/installevent/installevent.h' --- src/daemon/installevent/installevent.h 2010-01-16 22:14:28 +0000 +++ src/daemon/installevent/installevent.h 2010-04-07 23:38:05 +0000 @@ -42,11 +42,12 @@ private slots: void run(); - void addPackages(); + void addPackages(QMap* packageList); private: QString m_applicationName; QMap m_multimediaPackages; + QMap m_screensaverPackages; QMap m_packageList; InstallGui* m_installGui; };