diff --git a/src/SvgHandler.cpp b/src/SvgHandler.cpp --- a/src/SvgHandler.cpp +++ b/src/SvgHandler.cpp @@ -168,9 +168,6 @@ QPixmap SvgHandler::renderSvg( const QUrl& url, const QString& keyname, int width, int height, const QString& element, bool skipCache, const qreal opacity ) { - if( !url.isLocalFile() ) - return QPixmap(); - QString key; if( !skipCache ) { @@ -186,7 +183,7 @@ pixmap = QPixmap( width, height ); pixmap.fill( Qt::transparent ); - QString name = url.toLocalFile(); + QString name = url.isLocalFile() ? url.toLocalFile() : url.url(); QReadLocker readLocker( &m_lock ); if( ! m_renderers[name] ) { diff --git a/src/SvgTinter.cpp b/src/SvgTinter.cpp --- a/src/SvgTinter.cpp +++ b/src/SvgTinter.cpp @@ -39,7 +39,7 @@ {} QByteArray -SvgTinter::tint( const QString &filename) +SvgTinter::tint( const QString &filename ) { QFile file( filename ); if ( !file.open( QIODevice::ReadOnly ) ) diff --git a/src/context/AppletModel.h b/src/context/AppletModel.h --- a/src/context/AppletModel.h +++ b/src/context/AppletModel.h @@ -41,7 +41,6 @@ Icon, Mainscript, Collapsed, - PackagePath, ContentHeight }; Q_ENUM(Role) diff --git a/src/context/AppletModel.cpp b/src/context/AppletModel.cpp --- a/src/context/AppletModel.cpp +++ b/src/context/AppletModel.cpp @@ -125,9 +125,6 @@ case ContentHeight: return Amarok::config("Context").readEntry(package.metadata().pluginId() + "_contentHeight", 300); - - case PackagePath: - return QVariant(package.path() + "contents/"); } return QVariant(); @@ -172,7 +169,6 @@ roles.insert(Icon, "icon"); roles.insert(Mainscript, "mainscript"); roles.insert(Collapsed, "collapsed"); - roles.insert(PackagePath, "packagePath"); roles.insert(ContentHeight, "contentHeight"); return roles; diff --git a/src/context/applets/currenttrack/package/contents/ui/main.qml b/src/context/applets/currenttrack/package/contents/ui/main.qml --- a/src/context/applets/currenttrack/package/contents/ui/main.qml +++ b/src/context/applets/currenttrack/package/contents/ui/main.qml @@ -99,7 +99,7 @@ id: emptyComponent AmarokQml.PixmapItem { - source: Svg.renderSvg("file://" + applet.packagePath + "images/amarok-currenttrack.svg", + source: Svg.renderSvg(applet.imageUrl("amarok-currenttrack.svg"), "CurrentTrack", width, height, diff --git a/src/context/context_qml_package/contents/ui/main.qml b/src/context/context_qml_package/contents/ui/main.qml --- a/src/context/context_qml_package/contents/ui/main.qml +++ b/src/context/context_qml_package/contents/ui/main.qml @@ -58,7 +58,6 @@ "iconSource": icon, "collapsed": collapsed, "contentHeight": contentHeight, - "packagePath": packagePath, "configEnabled": Qt.binding(function() { return appletToolbar.configEnabled; } ) }); } diff --git a/src/context/qml_plugin/Applet.qml b/src/context/qml_plugin/Applet.qml --- a/src/context/qml_plugin/Applet.qml +++ b/src/context/qml_plugin/Applet.qml @@ -17,7 +17,6 @@ import QtQuick 2.4 import QtQuick.Dialogs 1.2 import org.kde.kirigami 2.0 as Kirigami -import org.kde.kirigami 2.0 as Kirigami Rectangle { @@ -27,7 +26,6 @@ property alias title: header.title property string name: "Nameless Applet" property string appletId - property string packagePath property url iconSource property bool collapsed: false property bool configEnabled: false