jadedctrl/Chat-O-Matic
jadedctrl/ Chat-O-Matic
1
0
Disbranĉigi 0
Fontkodo Issues 20 Tirpetoj Actions Packages Projects Eldonoj 2 Wiki Activity

(purple) Append ':' to settings names as appropriate

This commit is contained in:
Jaidyn Ann 2021-07-02 13:47:47 -05:00
parent 7db93bf596
commit a6c9569be2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
protocols/purple/PurpleApp.cpp
View File

@ -363,7 +363,7 @@ PurpleApp::_ParseProtoOptions(PurplePluginProtocolInfo* info)
else if (prefIter->next == NULL) { else if (prefIter->next == NULL) {
BMessage setting; BMessage setting;
setting.AddString("name", "username"); setting.AddString("name", "username");
setting.AddString("description", "Username"); setting.AddString("description", "Username:");
setting.AddString("error", "A username needs to be specified!"); setting.AddString("error", "A username needs to be specified!");
setting.AddInt32("type", B_STRING_TYPE); setting.AddInt32("type", B_STRING_TYPE);
temp.AddMessage("setting", &setting); temp.AddMessage("setting", &setting);
@ -377,7 +377,7 @@ PurpleApp::_ParseProtoOptions(PurplePluginProtocolInfo* info)
PurpleAccountUserSplit* split = (PurpleAccountUserSplit*)splitIter->data; PurpleAccountUserSplit* split = (PurpleAccountUserSplit*)splitIter->data;
BMessage setting; BMessage setting;
setting.AddString("name", "username_split"); setting.AddString("name", "username_split");
setting.AddString("description", split->text); setting.AddString("description", BString(split->text).Append(":"));
setting.AddString("default", split->default_value); setting.AddString("default", split->default_value);
setting.AddInt32("type", B_STRING_TYPE); setting.AddInt32("type", B_STRING_TYPE);
temp.AddMessage("setting", &setting); temp.AddMessage("setting", &setting);
@ -386,7 +386,7 @@ PurpleApp::_ParseProtoOptions(PurplePluginProtocolInfo* info)
// Password setting // Password setting
BMessage passwd; BMessage passwd;
passwd.AddString("name", "password"); passwd.AddString("name", "password");
passwd.AddString("description", "Password"); passwd.AddString("description", "Password:");
passwd.AddInt32("type", B_STRING_TYPE); passwd.AddInt32("type", B_STRING_TYPE);
passwd.AddBool("is_secret", true); passwd.AddBool("is_secret", true);
temp.AddMessage("setting", &passwd); temp.AddMessage("setting", &passwd);
@ -401,12 +401,13 @@ PurpleApp::_ParseProtoOptions(PurplePluginProtocolInfo* info)
BMessage setting; BMessage setting;
setting.AddString("name", pref->pref_name); setting.AddString("name", pref->pref_name);
setting.AddString("description", pref->text); BString description = BString(pref->text).Append(":");
switch (type) switch (type)
{ {
case PURPLE_PREF_BOOLEAN: case PURPLE_PREF_BOOLEAN:
{ {
description = pref->text;
bType = B_BOOL_TYPE; bType = B_BOOL_TYPE;
setting.AddBool("default", pref->default_value.boolean); setting.AddBool("default", pref->default_value.boolean);
break; break;
@ -435,11 +436,13 @@ PurpleApp::_ParseProtoOptions(PurplePluginProtocolInfo* info)
bType = B_STRING_TYPE; bType = B_STRING_TYPE;
setting.AddString("default", pref->default_value.string); setting.AddString("default", pref->default_value.string);
} }
if (pref->masked) if (pref->masked)
setting.AddBool("is_hidden", true); setting.AddBool("is_hidden", true);
setting.AddString("error", setting.AddString("error",
BString(pref->text).Append(" needs to be specified.")); BString(pref->text).Append(" needs to be specified."));
setting.AddInt32("type", bType); setting.AddInt32("type", bType);
setting.AddString("description", description);
temp.AddMessage("setting", &setting); temp.AddMessage("setting", &setting);
} }
return temp; return temp;