ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add support for allowedValues

Browse Source
This commit is contained in:
Michael Zanetti 2014-07-06 19:01:20 +02:00
parent 16f15a347b
commit f32abc8a2e
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libguh/types/paramtype.cpp
View File

@ -86,6 +86,16 @@ void ParamType::setLimits(const QVariant &min, const QVariant &max)
m_maxValue = max; m_maxValue = max;
} }
QList<QVariant> ParamType::allowedValues() const
{
return m_allowedValues;
}
void ParamType::setAllowedValues(const QList<QVariant> allowedValues)
{
m_allowedValues = allowedValues;
}
QDebug operator<<(QDebug dbg, const ParamType &paramType) QDebug operator<<(QDebug dbg, const ParamType &paramType)
{ {
dbg.nospace() << "ParamType(Name: " << paramType.name() dbg.nospace() << "ParamType(Name: " << paramType.name()

4
libguh/types/paramtype.h
View File

@ -45,12 +45,16 @@ public:
QPair<QVariant, QVariant> limits() const; QPair<QVariant, QVariant> limits() const;
void setLimits(const QVariant &min, const QVariant &max); void setLimits(const QVariant &min, const QVariant &max);
QList<QVariant> allowedValues() const;
void setAllowedValues(const QList<QVariant> allowedValues);
private: private:
QString m_name; QString m_name;
QVariant::Type m_type; QVariant::Type m_type;
QVariant m_defaultValue; QVariant m_defaultValue;
QVariant m_minValue; QVariant m_minValue;
QVariant m_maxValue; QVariant m_maxValue;
QVariantList m_allowedValues;
}; };
QDebug operator<<(QDebug dbg, const ParamType &paramType); QDebug operator<<(QDebug dbg, const ParamType &paramType);

1
plugins/deviceplugins/mailnotification/devicepluginmailnotification.cpp
View File

@ -322,6 +322,7 @@ QList<DeviceClass> DevicePluginMailNotification::supportedDevices() const
customMailParams.append(portCustomParam); customMailParams.append(portCustomParam);
ParamType authCustomParam("auth", QVariant::String); ParamType authCustomParam("auth", QVariant::String);
authCustomParam.setAllowedValues(QVariantList() << "PLAIN" << "LOGIN");
customMailParams.append(authCustomParam); customMailParams.append(authCustomParam);
deviceClassCustomMail.setActions(mailActions); deviceClassCustomMail.setActions(mailActions);

4
server/jsonrpc/jsontypes.cpp
View File

@ -69,6 +69,7 @@ void JsonTypes::init()
s_paramType.insert("o:defaultValue", "variant"); s_paramType.insert("o:defaultValue", "variant");
s_paramType.insert("o:minValue", "variant"); s_paramType.insert("o:minValue", "variant");
s_paramType.insert("o:maxValue", "variant"); s_paramType.insert("o:maxValue", "variant");
s_paramType.insert("o:allowedValues", QVariantList() << "variant");
// Param // Param
s_param.insert("name", "string"); s_param.insert("name", "string");
@ -332,6 +333,9 @@ QVariantMap JsonTypes::packParamType(const ParamType &paramType)
if (paramType.maxValue().isValid()) { if (paramType.maxValue().isValid()) {
variantMap.insert("maxValue", paramType.maxValue()); variantMap.insert("maxValue", paramType.maxValue());
} }
if (!paramType.allowedValues().isEmpty()) {
variantMap.insert("allowedValues", paramType.allowedValues());
}
return variantMap; return variantMap;
} }