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

manage args also for pasted text without urls

Browse Source
This commit is contained in:
Marco Martin 2013-09-19 19:52:53 +02:00
parent 7489fa32f8
commit 3656c416f2
2 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

@ -214,6 +214,33 @@ Plasma::Applet *ContainmentInterface::addApplet(const QString &plugin, const QVa
return applet; return applet;
} }
void ContainmentInterface::setAppletArgs(Plasma::Applet *applet, const QString &mimetype, const QString &data)
{
if (!applet) {
return;
}
KConfig argsConf(applet->package().filePath("config", "argsrc"));
foreach (const QString &group, argsConf.groupList()) {
KConfigGroup cg(&argsConf, group);
if (cg.hasKey(mimetype)) {
QString key = cg.readEntry(mimetype);
Plasma::ConfigLoader *config = applet->configScheme();
if (config) {
KConfigSkeletonItem *item = config->findItemByName(key);
if (item) {
item->setProperty(data);
config->blockSignals(true);
config->writeConfig();
config->blockSignals(false);
m_appletScriptEngine->configNeedsSaving();
}
}
}
}
}
void ContainmentInterface::processMimeData(QMimeData *mimeData, int x, int y) void ContainmentInterface::processMimeData(QMimeData *mimeData, int x, int y)
{ {
if (!mimeData) { if (!mimeData) {
@ -310,6 +337,7 @@ void ContainmentInterface::processMimeData(QMimeData *mimeData, int x, int y)
if (!selectedPlugin.isEmpty()) { if (!selectedPlugin.isEmpty()) {
//TODO: remove all this temp file logic
KTemporaryFile tempFile; KTemporaryFile tempFile;
if (mimeData && tempFile.open()) { if (mimeData && tempFile.open()) {
//TODO: what should we do with files after the applet is done with them?? //TODO: what should we do with files after the applet is done with them??
@ -326,7 +354,8 @@ void ContainmentInterface::processMimeData(QMimeData *mimeData, int x, int y)
qDebug() << args; qDebug() << args;
tempFile.close(); tempFile.close();
addApplet(selectedPlugin, args, QPoint(x, y)); Plasma::Applet *applet = addApplet(selectedPlugin, args, QPoint(x, y));
setAppletArgs(applet, pluginFormats[selectedPlugin], mimeData->data(pluginFormats[selectedPlugin]));
} }
} }
} }
@ -395,6 +424,7 @@ void ContainmentInterface::mimeTypeRetrieved(KIO::Job *job, const QString &mimet
return; return;
} }
//TODO: remove assignment of applet args
QVariantList args; QVariantList args;
args << tjob->url().url() << mimetype; args << tjob->url().url() << mimetype;
@ -469,28 +499,7 @@ void ContainmentInterface::mimeTypeRetrieved(KIO::Job *job, const QString &mimet
} }
} else { } else {
Plasma::Applet *applet = addApplet(actionsToApplets[choice], args, posi); Plasma::Applet *applet = addApplet(actionsToApplets[choice], args, posi);
//TODO: put in a function setAppletArgs(applet, mimetype, tjob->url().toString());
if (applet) {
KConfig argsConf(applet->package().filePath("config", "argsrc"));
foreach (const QString &group, argsConf.groupList()) {
KConfigGroup cg(&argsConf, group);
if (cg.hasKey(mimetype)) {
QString key = cg.readEntry(mimetype);
Plasma::ConfigLoader *config = applet->configScheme();
if (config) {
KConfigSkeletonItem *item = config->findItemByName(key);
if (item) {
item->setProperty(tjob->url());
config->blockSignals(true);
config->writeConfig();
config->blockSignals(false);
m_appletScriptEngine->configNeedsSaving();
}
}
}
}
}
} }
clearDataForMimeJob(job); clearDataForMimeJob(job);
@ -498,7 +507,8 @@ void ContainmentInterface::mimeTypeRetrieved(KIO::Job *job, const QString &mimet
} }
} else { } else {
// we can at least create an icon as a link to the URL // we can at least create an icon as a link to the URL
addApplet("org.kde.icon", args, posi); Plasma::Applet *applet = addApplet("org.kde.icon", args, posi);
setAppletArgs(applet, mimetype, tjob->url().toString());
} }
} }

1
src/scriptengines/qml/plasmoid/containmentinterface.h
View File

@ -146,6 +146,7 @@ protected Q_SLOTS:
private: private:
void clearDataForMimeJob(KIO::Job *job); void clearDataForMimeJob(KIO::Job *job);
Plasma::Applet *addApplet(const QString &plugin, const QVariantList &args, const QPoint &pos); Plasma::Applet *addApplet(const QString &plugin, const QVariantList &args, const QPoint &pos);
void setAppletArgs(Plasma::Applet *applet, const QString &mimetype, const QString &data);
WallpaperInterface *m_wallpaperInterface; WallpaperInterface *m_wallpaperInterface;
QList<QObject *> m_appletInterfaces; QList<QObject *> m_appletInterfaces;