Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
WEBUI: Add initial UI level handling for idnode panels
  • Loading branch information
@perexg
perexg committed Dec 1, 2015
1 parent e2eb0a8 commit 022c96b
Show file tree
Hide file tree
Showing 7 changed files with 286 additions and 81 deletions.
22 changes: 16 additions & 6 deletions src/channels.c
View file
Expand Up @@ -359,6 +359,7 @@ const idclass_t channel_class = {
.name = N_("Automatically name from network"),
.off = offsetof(channel_t, ch_autoname),
.set = channel_class_autoname_set,
.opts = PO_ADVANCED,
.opts = PO_NOSAVE,
},
{
Expand All @@ -384,19 +385,21 @@ const idclass_t channel_class = {
.name = N_("User icon"),
.off = offsetof(channel_t, ch_icon),
.notify = channel_class_icon_notify,
.opts = PO_ADVANCED,
},
{
.type = PT_STR,
.id = "icon_public_url",
.name = N_("Icon URL"),
.get = channel_class_get_icon,
.opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN,
.opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN | PO_EXPERT,
},
{
.type = PT_BOOL,
.id = "epgauto",
.name = N_("Automatically map EPG source"),
.off = offsetof(channel_t, ch_epgauto),
.opts = PO_ADVANCED,
},
{
.type = PT_STR,
Expand All @@ -406,7 +409,7 @@ const idclass_t channel_class = {
.set = channel_class_epggrab_set,
.get = channel_class_epggrab_get,
.list = channel_class_epggrab_list,
.opts = PO_NOSAVE,
.opts = PO_NOSAVE | PO_ADVANCED,
},
{
.type = PT_INT,
Expand Down Expand Up @@ -439,6 +442,7 @@ const idclass_t channel_class = {
.set = channel_class_services_set,
.list = channel_class_services_enum,
.rend = channel_class_services_rend,
.opts = PO_ADVANCED
},
{
.type = PT_STR,
Expand All @@ -448,7 +452,8 @@ const idclass_t channel_class = {
.get = channel_class_tags_get,
.set = channel_class_tags_set,
.list = channel_tag_class_get_list,
.rend = channel_class_tags_rend
.rend = channel_class_tags_rend,
.opts = PO_ADVANCED
},
{
.type = PT_STR,
Expand All @@ -457,7 +462,7 @@ const idclass_t channel_class = {
.get = channel_class_bouquet_get,
.set = channel_class_bouquet_set,
.list = bouquet_class_get_list,
.opts = PO_RDONLY
.opts = PO_RDONLY | PO_ADVANCED
},
{
.type = PT_STR,
Expand All @@ -466,7 +471,7 @@ const idclass_t channel_class = {
.set = channel_class_epg_parent_set,
.list = channel_class_get_list,
.off = offsetof(channel_t, ch_epg_parent),
.opts = PO_ADVANCED
.opts = PO_EXPERT
},
{}
}
Expand Down Expand Up @@ -1279,6 +1284,7 @@ const idclass_t channel_tag_class = {
.id = "index",
.name = N_("Sort index"),
.off = offsetof(channel_tag_t, ct_index),
.opts = PO_ADVANCED,
},
{
.type = PT_STR,
Expand All @@ -1291,32 +1297,36 @@ const idclass_t channel_tag_class = {
.id = "internal",
.name = N_("Internal"),
.off = offsetof(channel_tag_t, ct_internal),
.opts = PO_ADVANCED
},
{
.type = PT_BOOL,
.id = "private",
.name = N_("Private"),
.off = offsetof(channel_tag_t, ct_private),
.opts = PO_ADVANCED
},
{
.type = PT_STR,
.id = "icon",
.name = N_("Icon (full URL)"),
.off = offsetof(channel_tag_t, ct_icon),
.notify = channel_tag_class_icon_notify,
.opts = PO_ADVANCED
},
{
.type = PT_STR,
.id = "icon_public_url",
.name = N_("Icon URL"),
.get = channel_tag_class_get_icon,
.opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN,
.opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN | PO_EXPERT,
},
{
.type = PT_BOOL,
.id = "titled_icon",
.name = N_("Icon has title"),
.off = offsetof(channel_tag_t, ct_titled_icon),
.opts = PO_ADVANCED
},
{
.type = PT_STR,
Expand Down
18 changes: 15 additions & 3 deletions src/config.c
View file
Expand Up @@ -1948,15 +1948,15 @@ const idclass_t config_class = {
.id = "version",
.name = N_("Configuration version"),
.off = offsetof(config_t, version),
.opts = PO_RDONLY | PO_HIDDEN,
.opts = PO_RDONLY | PO_HIDDEN | PO_EXPERT,
.group = 1
},
{
.type = PT_STR,
.id = "full_version",
.name = N_("Last updated from"),
.off = offsetof(config_t, full_version),
.opts = PO_RDONLY | PO_HIDDEN,
.opts = PO_RDONLY | PO_HIDDEN | PO_EXPERT,
.group = 1
},
{
Expand All @@ -1979,6 +1979,7 @@ const idclass_t config_class = {
.id = "cookie_expires",
.name = N_("Cookie expiration (days)"),
.off = offsetof(config_t, cookie_expires),
.opts = PO_ADVANCED,
.group = 1
},
{
Expand All @@ -1987,6 +1988,7 @@ const idclass_t config_class = {
.name = N_("HTTP CORS origin"),
.set = config_class_cors_origin_set,
.off = offsetof(config_t, cors_origin),
.opts = PO_EXPERT,
.group = 1
},
{
Expand All @@ -1995,13 +1997,15 @@ const idclass_t config_class = {
.name = N_("DSCP/TOS for streaming"),
.off = offsetof(config_t, dscp),
.list = config_class_dscp_list,
.opts = PO_EXPERT,
.group = 1
},
{
.type = PT_U32,
.id = "descrambler_buffer",
.name = N_("Descrambler buffer (TS packets)"),
.off = offsetof(config_t, descrambler_buffer),
.opts = PO_EXPERT,
.group = 1
},
{
Expand All @@ -2023,7 +2027,7 @@ const idclass_t config_class = {
.set = config_class_info_area_set,
.get = config_class_info_area_get,
.list = config_class_info_area_list,
.opts = PO_LORDER,
.opts = PO_LORDER | PO_ADVANCED,
.group = 3
},
{
Expand All @@ -2039,55 +2043,63 @@ const idclass_t config_class = {
.id = "muxconfpath",
.name = N_("DVB scan files path"),
.off = offsetof(config_t, muxconf_path),
.opts = PO_ADVANCED,
.group = 4
},
{
.type = PT_BOOL,
.id = "tvhtime_update_enabled",
.name = N_("Update time"),
.off = offsetof(config_t, tvhtime_update_enabled),
.opts = PO_EXPERT,
.group = 5,
},
{
.type = PT_BOOL,
.id = "tvhtime_ntp_enabled",
.name = N_("Enable NTP driver"),
.off = offsetof(config_t, tvhtime_update_enabled),
.opts = PO_EXPERT,
.group = 5,
},
{
.type = PT_U32,
.id = "tvhtime_tolerance",
.name = N_("Update tolerance (ms)"),
.off = offsetof(config_t, tvhtime_tolerance),
.opts = PO_EXPERT,
.group = 5,
},
{
.type = PT_BOOL,
.id = "prefer_picon",
.name = N_("Prefer picons over channel name"),
.off = offsetof(config_t, prefer_picon),
.opts = PO_ADVANCED,
.group = 6,
},
{
.type = PT_STR,
.id = "chiconpath",
.name = N_("Channel icon path (see Help)"),
.off = offsetof(config_t, chicon_path),
.opts = PO_ADVANCED,
.group = 6,
},
{
.type = PT_BOOL,
.id = "chiconlowercase",
.name = N_("Channel icon name lower-case"),
.off = offsetof(config_t, chicon_lowercase),
.opts = PO_ADVANCED,
.group = 6,
},
{
.type = PT_STR,
.id = "piconpath",
.name = N_("Picon path (see Help)"),
.off = offsetof(config_t, picon_path),
.opts = PO_ADVANCED,
.group = 6,
},
{}
Expand Down

0 comments on commit 022c96b

Please sign in to comment.