From: Glenn-1990 <g_christiaensen@msn.com>
Date: Wed, 19 Oct 2016 11:46:13 +0000 (+0200)
Subject: Added some suggestions from CvH
X-Git-Tag: v4.2.1~247
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a54db947fe1930380afbb3cb92913fe6e3123da4;p=thirdparty%2Ftvheadend.git

Added some suggestions from CvH
---

diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index e593fde3b..e452d71dc 100644
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -612,7 +612,7 @@ const idclass_t mpegts_mux_class =
       .off      = offsetof(mpegts_mux_t, mm_scan_state),
       .set      = mpegts_mux_class_scan_state_set,
       .list     = mpegts_mux_class_scan_state_enum,
-      .opts     = PO_NOSAVE | PO_SORTKEY | PO_DOC_NLIST,
+      .opts     = PO_ADVANCED | PO_NOSAVE | PO_SORTKEY | PO_DOC_NLIST,
     },
     {
       .type     = PT_INT,
@@ -656,7 +656,7 @@ const idclass_t mpegts_mux_class =
        .id       = "tsid_zero",
        .name     = N_("Accept zero value for TSID"),
        .off      = offsetof(mpegts_mux_t, mm_tsid_accept_zero_value),
-       .opts     = PO_ADVANCED
+       .opts     = PO_EXPERT
     },
     {
       .type     = PT_INT,
diff --git a/src/input/mpegts/mpegts_mux_dvb.c b/src/input/mpegts/mpegts_mux_dvb.c
index a6b7f57df..c2255a116 100644
--- a/src/input/mpegts/mpegts_mux_dvb.c
+++ b/src/input/mpegts/mpegts_mux_dvb.c
@@ -493,7 +493,7 @@ const idclass_t dvb_mux_dvbs_class =
       MUX_PROP_STR("pls_mode", N_("PLS mode"), dvbs, pls_mode, "ROOT"),
       .desc     = N_("The Physical Layer Scrambling (PLS) mode "
                      "used on the mux."),
-      .opts     = PO_ADVANCED,
+      .opts     = PO_EXPERT,
     },
     {
       .type     = PT_U32,
diff --git a/src/timeshift.c b/src/timeshift.c
index 7d75f294f..3502b258b 100644
--- a/src/timeshift.c
+++ b/src/timeshift.c
@@ -267,7 +267,7 @@ const idclass_t timeshift_conf_class = {
       .name   = N_("RAM only"),
       .desc   = N_("Only use system RAM for timeshift buffers."),
       .off    = offsetof(timeshift_conf_t, ram_only),
-      .opts   = PO_EXPERT,
+      .opts   = PO_ADVANCED,
     },
     {
       .type   = PT_BOOL,
diff --git a/src/webui/static/app/config.js b/src/webui/static/app/config.js
index 3df02c713..5cce15224 100644
--- a/src/webui/static/app/config.js
+++ b/src/webui/static/app/config.js
@@ -108,7 +108,7 @@ tvheadend.imgcacheconf = function(panel, index) {
         title: _('Image Cache'),
         iconCls: 'imgcacheconf',
         tabIndex: index,
-        uilevel: 'advanced',
+        uilevel: 'expert',
         comet: 'imagecache',
         width: 550,
         labelWidth: 200,
diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
index d31d5b962..6b352a6ab 100644
--- a/src/webui/static/app/tvheadend.js
+++ b/src/webui/static/app/tvheadend.js
@@ -777,7 +777,7 @@ function accessUpdate(o) {
             tvheadend.caclient(cp, 6);
 
         /* Debug */
-        if (o.uilevel == 'expert') {
+        if (o.uilevel == 'advanced' || o.uilevel == 'expert') {
             var dbg = new Ext.TabPanel({
                 tabIndex: 7,
                 activeTab: 0,
diff --git a/src/webui/static/app/tvhlog.js b/src/webui/static/app/tvhlog.js
index f3453cd8d..8294a9b89 100644
--- a/src/webui/static/app/tvhlog.js
+++ b/src/webui/static/app/tvhlog.js
@@ -36,6 +36,7 @@ tvheadend.memoryinfo = function(panel, index)
         titleP: _('Memory Information Entries'),
         iconCls: 'exclamation',
         tabIndex: index,
+        uilevel: 'expert',
         readonly: true
     });
 };