comparison: client/args.c
client/args.c
- changeset 966
- e411ed7c5f10
- parent 948
- 94bc57d63128
- child 980
- 39cb60b6a81b
equal
deleted
inserted
replaced
| 965:5d4419042d9b | 966:e411ed7c5f10 |
|---|---|
| 135 if(val && val->type == CX_JSON_STRING) { | 135 if(val && val->type == CX_JSON_STRING) { |
| 136 funcs->name(args, val->value.string.ptr); | 136 funcs->name(args, val->value.string.ptr); |
| 137 } | 137 } |
| 138 } | 138 } |
| 139 | 139 |
| 140 void init_groups(const CxJsonValue *value, void *args, argfunc_set_intarray setarray) { | 140 void init_states(const CxJsonValue *value, void *args, argfunc_set_intarray setarray) { |
| 141 CxJsonValue *val = cxJsonObjGet(value, "states"); | 141 CxJsonValue *val = cxJsonObjGet(value, "states"); |
| 142 if(!val || val->type != CX_JSON_ARRAY) { | 142 if(!val || val->type != CX_JSON_ARRAY) { |
| 143 return; | 143 return; |
| 144 } | 144 } |
| 145 | 145 |
| 206 if(value->type != CX_JSON_OBJECT) { | 206 if(value->type != CX_JSON_OBJECT) { |
| 207 return args; | 207 return args; |
| 208 } | 208 } |
| 209 | 209 |
| 210 init_common_args(value, args, &button_args); | 210 init_common_args(value, args, &button_args); |
| 211 init_groups(value, args, (argfunc_set_intarray)ui_button_args_set_groups); | 211 init_states(value, args, (argfunc_set_intarray)ui_button_args_set_groups); |
| 212 | 212 |
| 213 CxJsonValue *val = cxJsonObjGet(value, "label"); | 213 CxJsonValue *val = cxJsonObjGet(value, "label"); |
| 214 if(val && val->type == CX_JSON_STRING) { | 214 if(val && val->type == CX_JSON_STRING) { |
| 215 ui_button_args_set_label(args, val->value.string.ptr); | 215 ui_button_args_set_label(args, val->value.string.ptr); |
| 216 } | 216 } |
| 238 if(value->type != CX_JSON_OBJECT) { | 238 if(value->type != CX_JSON_OBJECT) { |
| 239 return args; | 239 return args; |
| 240 } | 240 } |
| 241 | 241 |
| 242 init_common_args(value, args, &button_args); | 242 init_common_args(value, args, &button_args); |
| 243 init_groups(value, args, (argfunc_set_intarray)ui_button_args_set_groups); | 243 init_states(value, args, (argfunc_set_intarray)ui_button_args_set_groups); |
| 244 | 244 |
| 245 CxJsonValue *val = cxJsonObjGet(value, "label"); | 245 CxJsonValue *val = cxJsonObjGet(value, "label"); |
| 246 if(val && val->type == CX_JSON_STRING) { | 246 if(val && val->type == CX_JSON_STRING) { |
| 247 ui_toggle_args_set_label(args, val->value.string.ptr); | 247 ui_toggle_args_set_label(args, val->value.string.ptr); |
| 248 } | 248 } |
| 262 ui_toggle_args_set_labeltype(args, (int)val->value.integer); | 262 ui_toggle_args_set_labeltype(args, (int)val->value.integer); |
| 263 } | 263 } |
| 264 | 264 |
| 265 val = cxJsonObjGet(value, "enable_group"); | 265 val = cxJsonObjGet(value, "enable_group"); |
| 266 if(val && val->type == CX_JSON_INTEGER) { | 266 if(val && val->type == CX_JSON_INTEGER) { |
| 267 ui_toggle_args_set_enablegroup(args, (int)val->value.integer); | 267 ui_toggle_args_set_enablestate(args, (int)val->value.integer); |
| 268 } | 268 } |
| 269 | 269 |
| 270 return args; | 270 return args; |
| 271 } | 271 } |
