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

Revert "Fix loading plasmoids by absolute path"

Browse Source 
This reverts commit 2ed819f37d.

panel loading was completely broken, the patch idea was fine,
but has to be redone and tested better.

CCMAIL:aleixpol@kde.org
This commit is contained in:
Marco Martin 2016-10-10 23:31:37 +02:00
parent 2ed819f37d
commit 014979d8bf
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plasma/private/applet_p.cpp
View File

@ -29,9 +29,7 @@
#include <qstandardpaths.h> #include <qstandardpaths.h>
#include <QTimer> #include <QTimer>
#include <QJsonArray> #include <QJsonArray>
#include <QDir>
#include <QDebug> #include <QDebug>
#include <QFileInfo>
#include <QMessageBox> #include <QMessageBox>
#include <klocalizedstring.h> #include <klocalizedstring.h>
@ -115,9 +113,8 @@ AppletPrivate::~AppletPrivate()
delete modificationsTimer; delete modificationsTimer;
} }
void AppletPrivate::init(const QString &_packagePath, const QVariantList &args) void AppletPrivate::init(const QString &packagePath, const QVariantList &args)
{ {
const QString packagePath = _packagePath.isEmpty() ? QFileInfo(appletDescription.metaDataFileName()).dir().path() : _packagePath;
// WARNING: do not access config() OR globalConfig() in this method! // WARNING: do not access config() OR globalConfig() in this method!
// that requires a Corona, which is not available at this point // that requires a Corona, which is not available at this point
q->setHasConfigurationInterface(true); q->setHasConfigurationInterface(true);

4
src/plasmaquick/configmodel.cpp
View File

@ -199,9 +199,7 @@ QVariant ConfigModel::data(const QModelIndex &index, int role) const
const QString source = d->categories.at(index.row())->source(); const QString source = d->categories.at(index.row())->source();
// Quick check if source is an absolute path or not // Quick check if source is an absolute path or not
if (d->appletInterface && !source.isEmpty() && !(source.startsWith('/') && source.endsWith(QLatin1String("qml")))) { if (d->appletInterface && !source.isEmpty() && !(source.startsWith('/') && source.endsWith(QLatin1String("qml")))) {
if(!d->appletInterface.data()->kPackage().isValid()) return QUrl::fromLocalFile(d->appletInterface.data()->package().filePath("ui", source));
qWarning() << "wrong applet" << d->appletInterface.data()->pluginMetaData().name();
return QUrl::fromLocalFile(d->appletInterface.data()->kPackage().filePath("ui", source));
} else { } else {
return source; return source;
} }