Commit 1302194c authored by Aline Gondim Santos's avatar Aline Gondim Santos Committed by Sébastien Blin

plugin: support for preferences in callView

Change-Id: I12241fa07e9ac6bcdbfdac29154d86528e606611
parent dfeaa870
...@@ -28,34 +28,33 @@ ...@@ -28,34 +28,33 @@
// LRC // LRC
#include "typedefs.h" #include "typedefs.h"
namespace lrc namespace lrc {
{
namespace api namespace api {
{
namespace plugin namespace plugin {
{ /**
/**
* This class describes current plugin Details * This class describes current plugin Details
*/ */
struct PluginDetails struct PluginDetails
{ {
QString name = ""; QString name = "";
QString path = ""; QString path = "";
QString iconPath = ""; QString iconPath = "";
bool loaded = false; bool loaded = false;
}; };
struct MediaHandlerDetails struct MediaHandlerDetails
{ {
QString id = ""; QString id = "";
QString name = ""; QString name = "";
QString iconPath = ""; QString iconPath = "";
}; QString pluginId = "";
} };
} // namespace plugin
class LIB_EXPORT PluginModel : public QObject { class LIB_EXPORT PluginModel : public QObject
{
Q_OBJECT Q_OBJECT
public: public:
PluginModel(); PluginModel();
...@@ -148,7 +147,9 @@ public: ...@@ -148,7 +147,9 @@ public:
* Modify preference of installed plugin * Modify preference of installed plugin
* @return true if preference was succesfully modified * @return true if preference was succesfully modified
*/ */
Q_INVOKABLE bool setPluginPreference(const QString& path, const QString& key, const QString& value); Q_INVOKABLE bool setPluginPreference(const QString& path,
const QString& key,
const QString& value);
/** /**
* Get preferences values of installed plugin * Get preferences values of installed plugin
...@@ -170,7 +171,6 @@ public: ...@@ -170,7 +171,6 @@ public:
Q_INVOKABLE bool addValueToPreference(const QString& pluginId, Q_INVOKABLE bool addValueToPreference(const QString& pluginId,
const QString& preferenceKey, const QString& preferenceKey,
const QString& value); const QString& value);
}; };
} // namespace api } // namespace api
......
...@@ -35,17 +35,15 @@ ...@@ -35,17 +35,15 @@
// Ring daemon // Ring daemon
// LRC // LRC
#include "dbus/pluginmanager.h" #include "dbus/pluginmanager.h"
namespace lrc namespace lrc {
{
using namespace api; using namespace api;
PluginModel::PluginModel() PluginModel::PluginModel()
: QObject() : QObject()
{} {}
PluginModel::~PluginModel() {} PluginModel::~PluginModel() {}
...@@ -82,8 +80,7 @@ PluginModel::getPluginDetails(const QString& path) ...@@ -82,8 +80,7 @@ PluginModel::getPluginDetails(const QString& path)
} }
MapStringString details = PluginManager::instance().getPluginDetails(path); MapStringString details = PluginManager::instance().getPluginDetails(path);
plugin::PluginDetails result; plugin::PluginDetails result;
if (!details.empty()) if (!details.empty()) {
{
result.name = details["name"]; result.name = details["name"];
result.path = path; result.path = path;
result.iconPath = details["iconPath"]; result.iconPath = details["iconPath"];
...@@ -100,8 +97,7 @@ PluginModel::getPluginDetails(const QString& path) ...@@ -100,8 +97,7 @@ PluginModel::getPluginDetails(const QString& path)
bool bool
PluginModel::installPlugin(const QString& jplPath, bool force) PluginModel::installPlugin(const QString& jplPath, bool force)
{ {
if (getPluginsEnabled()) if (getPluginsEnabled()) {
{
return PluginManager::instance().installPlugin(jplPath, force); return PluginManager::instance().installPlugin(jplPath, force);
} }
return false; return false;
...@@ -136,7 +132,7 @@ void ...@@ -136,7 +132,7 @@ void
PluginModel::toggleCallMediaHandler(const QString& id) PluginModel::toggleCallMediaHandler(const QString& id)
{ {
MapStringString toggleInfo = PluginManager::instance().getCallMediaHandlerStatus(); MapStringString toggleInfo = PluginManager::instance().getCallMediaHandlerStatus();
if (toggleInfo["name"] == id){ if (toggleInfo["name"] == id) {
PluginManager::instance().toggleCallMediaHandler(id, false); PluginManager::instance().toggleCallMediaHandler(id, false);
} else { } else {
PluginManager::instance().toggleCallMediaHandler(id, true); PluginManager::instance().toggleCallMediaHandler(id, true);
...@@ -157,11 +153,11 @@ PluginModel::getCallMediaHandlerDetails(const QString& id) ...@@ -157,11 +153,11 @@ PluginModel::getCallMediaHandlerDetails(const QString& id)
} }
MapStringString mediaHandlerDetails = PluginManager::instance().getCallMediaHandlerDetails(id); MapStringString mediaHandlerDetails = PluginManager::instance().getCallMediaHandlerDetails(id);
plugin::MediaHandlerDetails result; plugin::MediaHandlerDetails result;
if (!mediaHandlerDetails.empty()) if (!mediaHandlerDetails.empty()) {
{
result.id = id; result.id = id;
result.iconPath = mediaHandlerDetails["iconPath"]; result.iconPath = mediaHandlerDetails["iconPath"];
result.name = mediaHandlerDetails["name"]; result.name = mediaHandlerDetails["name"];
result.pluginId = mediaHandlerDetails["pluginId"];
} }
return result; return result;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment