alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed all SuperKaramba specific logic since we are using the ScriptEngine for this now.

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=781482
This commit is contained in:
Sebastian Sauer 2008-03-02 23:41:20 +00:00
parent ae6880bc15
commit 92a724abe3
2 changed files with 11 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
appletbrowser/plasmaappletitemmodel.cpp
View File

@ -61,17 +61,7 @@ void PlasmaAppletItem::setFavorite(bool favorite)
setData(QVariant(attrs)); setData(QVariant(attrs));
QString pluginName = attrs["pluginName"].toString(); QString pluginName = attrs["pluginName"].toString();
if (pluginName == "skapplet" && attrs.contains("arguments")) {
// skapplet can be used with all SuperKaramba themes,
// so when setting skapplet as favorite it is also
// necessary to know which theme is meant
QString themePath = qvariant_cast<QVariantList>(attrs["arguments"])[0].toString();
m_model->setFavorite(pluginName + " - " + themePath, favorite);
} else {
m_model->setFavorite(pluginName, favorite); m_model->setFavorite(pluginName, favorite);
}
} }
void PlasmaAppletItem::setRunning(int count) void PlasmaAppletItem::setRunning(int count)
@ -130,12 +120,6 @@ void PlasmaAppletItemModel::populateModel()
} }
//kDebug() << info.pluginName() << " is the name of the plugin\n"; //kDebug() << info.pluginName() << " is the name of the plugin\n";
if (info.pluginName() == "skapplet") {
// If there is the SuperKaramba applet,
// add SuperKaramba themes to the
// model too
loadSuperKarambaThemes(info);
} else {
QMap<QString, QVariant> attrs; QMap<QString, QVariant> attrs;
attrs.insert("name", info.name()); attrs.insert("name", info.name());
attrs.insert("pluginName", info.pluginName()); attrs.insert("pluginName", info.pluginName());
@ -148,7 +132,6 @@ void PlasmaAppletItemModel::populateModel()
((m_used.contains(info.pluginName())) ? PlasmaAppletItem::Used : PlasmaAppletItem::NoFilter) ((m_used.contains(info.pluginName())) ? PlasmaAppletItem::Used : PlasmaAppletItem::NoFilter)
, &(extraPluginAttrs[info.pluginName()]))); , &(extraPluginAttrs[info.pluginName()])));
} }
}
} }
void PlasmaAppletItemModel::setRunningApplets(const QHash<QString, int> &apps) void PlasmaAppletItemModel::setRunningApplets(const QHash<QString, int> &apps)
@ -233,44 +216,3 @@ QString& PlasmaAppletItemModel::Application()
{ {
return m_application; return m_application;
} }
/*
* Define function type to get the SuperKaramba themes
* from skapplet (see skapplet.cpp in kdeutils/superkaramba)
*/
extern "C" {
typedef QList<QMap<QString, QVariant> > (*installedThemes)();
}
void PlasmaAppletItemModel::loadSuperKarambaThemes(const KPluginInfo &info)
{
KService::Ptr service = info.service();
QString libName = service->library();
// Load the Plugin as library to get access
// to installedThemes() in skapplet
KLibrary lib(libName);
installedThemes loadThemes = 0;
loadThemes = (installedThemes)lib.resolveFunction("installedThemes");
if (loadThemes) {
// loadThemes() returns the name, description, the icon
// and one argument (file path) from the theme
QList<QMap<QString, QVariant> > themeMetadata = loadThemes();
QMap <QString, QVariant> metadata;
foreach (metadata, themeMetadata) {
metadata.insert("pluginName", "skapplet");
metadata.insert("category", "SuperKaramba");
QString favorite = info.pluginName() + " - " + qvariant_cast<QVariantList>(metadata["arguments"])[0].toString();
appendRow(new PlasmaAppletItem(this, metadata,
((m_favorites.contains(favorite)) ? PlasmaAppletItem::Favorite : PlasmaAppletItem::NoFilter) |
((m_used.contains(info.pluginName())) ? PlasmaAppletItem::Used : PlasmaAppletItem::NoFilter)));
}
} else {
kWarning() << "Could not load" << libName << "; KLibrary said:" << lib.errorString();
}
}

1
appletbrowser/plasmaappletitemmodel_p.h
View File

@ -81,7 +81,6 @@ private:
QStringList m_used; QStringList m_used;
KConfigGroup m_configGroup; KConfigGroup m_configGroup;
void loadSuperKarambaThemes(const KPluginInfo &info);
void populateModel(); void populateModel();
}; };