WEBUI: another round of view level sorting

tvheadend · Dec 2, 2015 · 3941176 · 3941176
1 parent 4aeabd2
commit 3941176
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/src/bouquet.c b/src/bouquet.c
@@ -910,27 +910,31 @@ const idclass_t bouquet_class = {
       .name     = N_("Map zero-numbered channels"),
       .off      = offsetof(bouquet_t, bq_mapnolcn),
       .notify   = bouquet_class_mapnolcn_notify,
+      .opts     = PO_ADVANCED,
     },
     {
       .type     = PT_BOOL,
       .id       = "mapnoname",
       .name     = N_("Map unnamed channels"),
       .off      = offsetof(bouquet_t, bq_mapnoname),
       .notify   = bouquet_class_mapnoname_notify,
+      .opts     = PO_ADVANCED,
     },
     {
       .type     = PT_BOOL,
       .id       = "mapradio",
       .name     = N_("Map radio channels"),
       .off      = offsetof(bouquet_t, bq_mapradio),
       .notify   = bouquet_class_mapradio_notify,
+      .opts     = PO_ADVANCED,
     },
     {
       .type     = PT_BOOL,
       .id       = "chtag",
       .name     = N_("Create tag"),
       .off      = offsetof(bouquet_t, bq_chtag),
       .notify   = bouquet_class_chtag_notify,
+      .opts     = PO_ADVANCED,
     },
     {
       .type     = PT_STR,
@@ -939,7 +943,7 @@ const idclass_t bouquet_class = {
       .get      = bouquet_class_chtag_ref_get,
       .set      = bouquet_class_chtag_ref_set,
       .rend     = bouquet_class_chtag_ref_rend,
-      .opts     = PO_RDONLY | PO_HIDDEN,
+      .opts     = PO_RDONLY | PO_HIDDEN | PO_NOUI,
     },
     {
       .type     = PT_STR,
@@ -960,7 +964,7 @@ const idclass_t bouquet_class = {
       .id       = "ssl_peer_verify",
       .name     = N_("SSL verify peer"),
       .off      = offsetof(bouquet_t, bq_ssl_peer_verify),
-      .opts     = PO_ADVANCED | PO_HIDDEN,
+      .opts     = PO_ADVANCED | PO_HIDDEN | PO_EXPERT,
       .notify   = bouquet_class_ext_url_notify,
     },
     {
@@ -977,7 +981,7 @@ const idclass_t bouquet_class = {
       .id       = "source",
       .name     = N_("Source"),
       .off      = offsetof(bouquet_t, bq_src),
-      .opts     = PO_RDONLY,
+      .opts     = PO_RDONLY | PO_ADVANCED,
     },
     {
       .type     = PT_STR,
@@ -1015,6 +1019,7 @@ const idclass_t bouquet_class = {
       .name     = N_("Channel number offset"),
       .off      = offsetof(bouquet_t, bq_lcn_offset),
       .notify   = bouquet_class_lcn_offset_notify,
+      .opts     = PO_ADVANCED
     },
     {}
   }

diff --git a/src/channels.c b/src/channels.c
@@ -453,7 +453,6 @@ const idclass_t channel_class = {
       .set      = channel_class_tags_set,
       .list     = channel_tag_class_get_list,
       .rend     = channel_class_tags_rend,
-      .opts     = PO_ADVANCED
     },
     {
       .type     = PT_STR,

diff --git a/src/epggrab.c b/src/epggrab.c
@@ -296,14 +296,15 @@ const idclass_t epggrab_class = {
       .name   = N_("Cron multi-line"),
       .off    = offsetof(epggrab_conf_t, cron),
       .notify = epggrab_class_cron_notify,
-      .opts   = PO_MULTILINE,
+      .opts   = PO_MULTILINE | PO_ADVANCED,
       .group  = 2,
     },
     {
       .type   = PT_BOOL,
       .id     = "ota_initial",
       .name   = N_("Force initial EPG scan at start-up"),
       .off    = offsetof(epggrab_conf_t, ota_initial),
+      .opts   = PO_ADVANCED,
       .group  = 3,
     },
     {
@@ -312,14 +313,15 @@ const idclass_t epggrab_class = {
       .name   = N_("Over-the-air Cron multi-line"),
       .off    = offsetof(epggrab_conf_t, ota_cron),
       .notify = epggrab_class_ota_cron_notify,
-      .opts   = PO_MULTILINE,
+      .opts   = PO_MULTILINE | PO_ADVANCED,
       .group  = 3,
     },
     {
       .type   = PT_U32,
       .id     = "ota_timeout",
       .name   = N_("EPG scan timeout in seconds (30-7200)"),
       .off    = offsetof(epggrab_conf_t, ota_timeout),
+      .opts   = PO_ADVANCED,
       .group  = 3,
     },
     {}

diff --git a/src/epggrab/module.c b/src/epggrab/module.c
@@ -147,6 +147,7 @@ const idclass_t epggrab_mod_class = {
       .id     = "priority",
       .name   = N_("Priority"),
       .off    = offsetof(epggrab_module_t, priority),
+      .opts   = PO_ADVANCED,
       .group  = 1
     },
     {}
@@ -171,6 +172,7 @@ const idclass_t epggrab_class_mod_int = {
       .id     = "args",
       .name   = N_("Extra arguments"),
       .off    = offsetof(epggrab_module_int_t, args),
+      .opts   = PO_ADVANCED,
       .group  = 1
     },
     {}

diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
@@ -152,6 +152,7 @@ const idclass_t satip_frontend_class =
       .id       = "udp_rtp_port",
       .name     = N_("UDP RTP port number (2 ports)"),
       .off      = offsetof(satip_frontend_t, sf_udp_rtp_port),
+      .opts     = PO_ADVANCED,
     },
     {
       .type     = PT_INT,