From: mpmc Date: Thu, 1 Mar 2018 00:10:06 +0000 (+0000) Subject: webui: try to make the legend titles a bit more consistent throughout X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32c56a82968bf916e1e212614ad13e4f8ca72030;p=thirdparty%2Ftvheadend.git webui: try to make the legend titles a bit more consistent throughout --- diff --git a/src/config.c b/src/config.c index 8281066bd..c55e0fe3a 100644 --- a/src/config.c +++ b/src/config.c @@ -1536,7 +1536,7 @@ dobackup(const char *oldver) s = htsbuf_to_string(&q); tvherror(LS_CONFIG, "command '%s' returned error code %d", s, code); tvherror(LS_CONFIG, "executed in directory '%s'", root); - tvherror(LS_CONFIG, "please, do not report this as an error, you may use --nobackup option"); + tvherror(LS_CONFIG, "please DON'T report this as an error, you may use --nobackup to skip"); tvherror(LS_CONFIG, "... or run the above command in the printed directory"); tvherror(LS_CONFIG, "... using the same user/group as for the tvheadend executable"); tvherror(LS_CONFIG, "... to check the reason for the unfinished backup"); @@ -2057,33 +2057,29 @@ const idclass_t config_class = { .ic_save = config_class_save, .ic_groups = (const property_group_t[]) { { - .name = N_("Server settings"), + .name = N_("Server Settings"), .number = 1, }, { - .name = N_("Web interface settings"), + .name = N_("Web Interface Settings"), .number = 2, }, { - .name = N_("EPG settings"), + .name = N_("EPG Settings"), .number = 3, }, { - .name = N_("Channel icon/Picon settings"), + .name = N_("Channel icon/Picon Settings"), .number = 4, }, { - .name = N_("HTTP server settings"), + .name = N_("HTTP Server Settings"), .number = 5, }, { - .name = N_("System time update"), + .name = N_("Miscellaneous Settings"), .number = 6, }, - { - .name = N_("Misc settings"), - .number = 7, - }, {} }, .ic_properties = (const property_t[]){ @@ -2383,41 +2379,6 @@ const idclass_t config_class = { .opts = PO_EXPERT, .group = 5 }, - { - .type = PT_BOOL, - .id = "tvhtime_update_enabled", - .name = N_("Update time"), - .desc = N_("Enable system time updates. This will only work if " - "the user running Tvheadend has rights to update " - "the system clock (normally only root)."), - .off = offsetof(config_t, tvhtime_update_enabled), - .opts = PO_EXPERT, - .group = 6, - }, - { - .type = PT_BOOL, - .id = "tvhtime_ntp_enabled", - .name = N_("Enable NTP driver"), - .desc = N_("This will create an NTP driver (using shmem " - "interface) that you can feed into ntpd. This can " - "be run without root privileges, but generally the " - "performance is not that great."), - .off = offsetof(config_t, tvhtime_ntp_enabled), - .opts = PO_EXPERT, - .group = 6, - }, - { - .type = PT_U32, - .id = "tvhtime_tolerance", - .name = N_("Update tolerance (ms)"), - .desc = N_("Only update the system clock (doesn't affect NTP " - "driver) if the delta between the system clock and " - "DVB time is greater than this. This can help stop " - "excessive oscillations on the system clock."), - .off = offsetof(config_t, tvhtime_tolerance), - .opts = PO_EXPERT, - .group = 6, - }, { .type = PT_INT, .id = "iptv_tpool", @@ -2425,7 +2386,7 @@ const idclass_t config_class = { .desc = N_("Set the number of threads for IPTV to split load " "across more CPUs."), .off = offsetof(config_t, iptv_tpool_count), - .group = 7 + .group = 6, }, { .type = PT_INT, @@ -2442,7 +2403,7 @@ const idclass_t config_class = { .off = offsetof(config_t, dscp), .list = config_class_dscp_list, .opts = PO_EXPERT | PO_DOC_NLIST, - .group = 7 + .group = 6, }, { .type = PT_U32, @@ -2452,7 +2413,7 @@ const idclass_t config_class = { "there is a delay receiving CA keys. "), .off = offsetof(config_t, descrambler_buffer), .opts = PO_EXPERT, - .group = 7 + .group = 6, }, { .type = PT_BOOL, @@ -2463,7 +2424,7 @@ const idclass_t config_class = { "It may cause issues with some clients / players."), .off = offsetof(config_t, parser_backlog), .opts = PO_EXPERT, - .group = 7 + .group = 6, }, { .type = PT_STR, @@ -2476,7 +2437,7 @@ const idclass_t config_class = { .off = offsetof(config_t, muxconf_path), .notify = config_muxconfpath_notify, .opts = PO_ADVANCED, - .group = 7 + .group = 6, }, { .type = PT_BOOL, @@ -2484,7 +2445,42 @@ const idclass_t config_class = { .name = N_("Parse HbbTV info"), .desc = N_("Parse HbbTV information from services."), .off = offsetof(config_t, hbbtv), - .group = 7 + .group = 6, + }, + { + .type = PT_BOOL, + .id = "tvhtime_update_enabled", + .name = N_("Update time"), + .desc = N_("Enable system time updates. This will only work if " + "the user running Tvheadend has rights to update " + "the system clock (normally only root)."), + .off = offsetof(config_t, tvhtime_update_enabled), + .opts = PO_EXPERT, + .group = 6, + }, + { + .type = PT_BOOL, + .id = "tvhtime_ntp_enabled", + .name = N_("Enable NTP driver"), + .desc = N_("This will create an NTP driver (using shmem " + "interface) that you can feed into ntpd. This can " + "be run without root privileges, but generally the " + "performance is not that great."), + .off = offsetof(config_t, tvhtime_ntp_enabled), + .opts = PO_EXPERT, + .group = 6, + }, + { + .type = PT_U32, + .id = "tvhtime_tolerance", + .name = N_("Update tolerance (ms)"), + .desc = N_("Only update the system clock (doesn't affect NTP " + "driver) if the delta between the system clock and " + "DVB time is greater than this. This can help stop " + "excessive oscillations on the system clock."), + .off = offsetof(config_t, tvhtime_tolerance), + .opts = PO_EXPERT, + .group = 6, }, { .type = PT_STR, diff --git a/src/descrambler/caclient.c b/src/descrambler/caclient.c index 7a8f08de4..776a33de4 100644 --- a/src/descrambler/caclient.c +++ b/src/descrambler/caclient.c @@ -272,7 +272,7 @@ const idclass_t caclient_class = .ic_movedown = caclient_class_movedown, .ic_groups = (const property_group_t[]) { { - .name = N_("Client"), + .name = N_("General Settings"), .number = 1, }, {} diff --git a/src/descrambler/cclient.c b/src/descrambler/cclient.c index bf4833436..9d7ebfe1a 100644 --- a/src/descrambler/cclient.c +++ b/src/descrambler/cclient.c @@ -1268,19 +1268,19 @@ const idclass_t caclient_cc_class = .ic_caption = N_("Card client"), .ic_groups = (const property_group_t[]) { { - .name = N_("Client"), + .name = N_("General Settings"), .number = 1, }, { - .name = N_("Login information"), + .name = N_("Login Settings"), .number = 2, }, { - .name = N_("EMM"), + .name = N_("EMM Settings"), .number = 3, }, { - .name = N_("Connection"), + .name = N_("Connection Settings"), .number = 4, }, {} diff --git a/src/descrambler/dvbcam.c b/src/descrambler/dvbcam.c index 18a5c90ae..d1eca12b1 100644 --- a/src/descrambler/dvbcam.c +++ b/src/descrambler/dvbcam.c @@ -844,11 +844,11 @@ const idclass_t caclient_dvbcam_class = .ic_caption = N_("Linux DVB CAM Client"), .ic_groups = (const property_group_t[]) { { - .name = N_("Client"), + .name = N_("General Settings"), .number = 1, }, { - .name = N_("Common Interface"), + .name = N_("Common Interface Settings"), .number = 2, }, {} diff --git a/src/dvr/dvr_config.c b/src/dvr/dvr_config.c index 0a25b6c8d..f00cf97af 100644 --- a/src/dvr/dvr_config.c +++ b/src/dvr/dvr_config.c @@ -822,19 +822,19 @@ const idclass_t dvr_config_class = { .ic_perm = dvr_config_class_perm, .ic_groups = (const property_group_t[]) { { - .name = N_("General settings"), + .name = N_("General Settings"), .number = 1, }, { - .name = N_("Filesystem settings"), + .name = N_("Filesystem Settings"), .number = 2, }, { - .name = N_("Subdirectory options"), + .name = N_("Subdirectory Settings"), .number = 3, }, { - .name = N_("Filename and tagging options"), + .name = N_("Filename/Tagging Settings"), .number = 4, .column = 1, }, @@ -845,11 +845,11 @@ const idclass_t dvr_config_class = { .column = 2, }, { - .name = N_("EPG/Autorec settings"), + .name = N_("EPG/Autorec Settings"), .number = 6, }, { - .name = N_("Misc settings"), + .name = N_("Miscellaneous Settings"), .number = 7, }, {} diff --git a/src/epggrab.c b/src/epggrab.c index 9d5f996b0..0fe94be12 100644 --- a/src/epggrab.c +++ b/src/epggrab.c @@ -338,15 +338,15 @@ const idclass_t epggrab_class = { .ic_save = epggrab_class_save, .ic_groups = (const property_group_t[]) { { - .name = N_("General configuration"), + .name = N_("General Settings"), .number = 1, }, { - .name = N_("Internal grabber"), + .name = N_("Internal Grabber Settings"), .number = 2, }, { - .name = N_("Over-the-air grabbers"), + .name = N_("OTA (Over-the-air) Grabber Settings"), .number = 3, }, {} diff --git a/src/epggrab/module.c b/src/epggrab/module.c index cce20d268..3cf36b42f 100644 --- a/src/epggrab/module.c +++ b/src/epggrab/module.c @@ -143,7 +143,7 @@ const idclass_t epggrab_mod_class = { .ic_changed = epggrab_mod_class_changed, .ic_groups = (const property_group_t[]) { { - .name = N_("Settings"), + .name = N_("Grabber Settings"), .number = 1, }, {} diff --git a/src/profile.c b/src/profile.c index d2af4aa51..07e25eaf4 100644 --- a/src/profile.c +++ b/src/profile.c @@ -291,7 +291,7 @@ const idclass_t profile_class = .ic_delete = profile_class_delete, .ic_groups = (const property_group_t[]) { { - .name = N_("Configuration"), + .name = N_("General Settings"), .number = 1, }, {} @@ -306,6 +306,16 @@ const idclass_t profile_class = .set = profile_class_class_set, .group = 1 }, + { + .type = PT_STR, + .id = "name", + .name = N_("Profile name"), + .desc = N_("The name of the profile."), + .off = offsetof(profile_t, pro_name), + .get_opts = profile_class_name_opts, + .notify = idnode_notify_title_changed_lang, + .group = 1 + }, { .type = PT_BOOL, .id = "enabled", @@ -326,16 +336,6 @@ const idclass_t profile_class = .opts = PO_EXPERT, .group = 1 }, - { - .type = PT_STR, - .id = "name", - .name = N_("Profile name"), - .desc = N_("The name of the profile."), - .off = offsetof(profile_t, pro_name), - .get_opts = profile_class_name_opts, - .notify = idnode_notify_title_changed_lang, - .group = 1 - }, { .type = PT_STR, .id = "comment", @@ -345,6 +345,16 @@ const idclass_t profile_class = .off = offsetof(profile_t, pro_comment), .group = 1 }, + { + .type = PT_INT, + .id = "timeout", + .name = N_("Timeout (sec) (0=infinite)"), + .desc = N_("The number of seconds to wait for a stream to " + "start."), + .off = offsetof(profile_t, pro_timeout), + .def.i = 5, + .group = 1 + }, { .type = PT_INT, .id = "priority", @@ -368,16 +378,6 @@ const idclass_t profile_class = .opts = PO_EXPERT, .group = 1 }, - { - .type = PT_INT, - .id = "timeout", - .name = N_("Timeout (sec) (0=infinite)"), - .desc = N_("The number of seconds to wait for a stream to " - "start."), - .off = offsetof(profile_t, pro_timeout), - .def.i = 5, - .group = 1 - }, { .type = PT_BOOL, .id = "restart", @@ -387,7 +387,7 @@ const idclass_t profile_class = .off = offsetof(profile_t, pro_restart), .opts = PO_EXPERT, .def.i = 0, - .group = 1 + .group = 1, }, { .type = PT_BOOL, @@ -399,7 +399,7 @@ const idclass_t profile_class = .off = offsetof(profile_t, pro_contaccess), .opts = PO_EXPERT, .def.i = 1, - .group = 1 + .group = 1, }, { .type = PT_INT, @@ -409,7 +409,7 @@ const idclass_t profile_class = .off = offsetof(profile_t, pro_ca_timeout), .opts = PO_EXPERT, .def.i = 2000, - .group = 1 + .group = 1, }, { .type = PT_BOOL, @@ -1319,11 +1319,11 @@ const idclass_t profile_mpegts_pass_class = .ic_caption = N_("MPEG-TS Pass-thru/built-in"), .ic_groups = (const property_group_t[]) { { - .name = N_("Configuration"), + .name = N_("General Settings"), .number = 1, }, { - .name = N_("Rewrite MPEG-TS SI tables"), + .name = N_("Rewrite MPEG-TS SI Table(s) Settings"), .number = 2, }, {} @@ -1471,11 +1471,11 @@ const idclass_t profile_mpegts_spawn_class = .ic_caption = N_("MPEG-TS Spawn/built-in"), .ic_groups = (const property_group_t[]) { { - .name = N_("Configuration"), + .name = N_("General Settings"), .number = 1, }, { - .name = N_("Spawn configuration"), + .name = N_("Spawn Settings"), .number = 2, }, {} @@ -1608,11 +1608,11 @@ const idclass_t profile_matroska_class = .ic_caption = N_("Matroska (mkv)/built-in"), .ic_groups = (const property_group_t[]) { { - .name = N_("Configuration"), + .name = N_("General Settings"), .number = 1, }, { - .name = N_("Matroska specific"), + .name = N_("Matroska Specific Settings"), .number = 2, }, {} @@ -2236,11 +2236,11 @@ const idclass_t profile_transcode_class = .ic_caption = N_("Transcode/av-lib"), .ic_groups = (const property_group_t[]) { { - .name = N_("Configuration"), + .name = N_("General Settings"), .number = 1, }, { - .name = N_("Transcoding"), + .name = N_("Transcoding Settings"), .number = 2, }, {} diff --git a/src/satip/server.c b/src/satip/server.c index d1b0c1f45..a53484d05 100644 --- a/src/satip/server.c +++ b/src/satip/server.c @@ -643,23 +643,23 @@ const idclass_t satip_server_class = { .ic_changed = satip_server_class_changed, .ic_groups = (const property_group_t[]) { { - .name = N_("General"), + .name = N_("General Settings"), .number = 1, }, { - .name = N_("NAT"), + .name = N_("NAT Settings"), .number = 2, }, { - .name = N_("Signal"), + .name = N_("Signal Settings"), .number = 3, }, { - .name = N_("Exported tuners"), + .name = N_("Exported Tuner(s) Settings"), .number = 4, }, { - .name = N_("Other"), + .name = N_("Miscellaneous Settings"), .number = 5, }, {} diff --git a/src/transcoding/codec/profile_class.c b/src/transcoding/codec/profile_class.c index d3863e819..fea65b174 100644 --- a/src/transcoding/codec/profile_class.c +++ b/src/transcoding/codec/profile_class.c @@ -196,7 +196,7 @@ const codec_profile_class_t codec_profile_class = { .ic_delete = codec_profile_class_delete, .ic_groups = (const property_group_t[]) { { - .name = N_("Identification"), + .name = N_("General Settings"), .number = 1, }, { diff --git a/src/tvhlog.c b/src/tvhlog.c index a6d11c26b..d2a84cce1 100644 --- a/src/tvhlog.c +++ b/src/tvhlog.c @@ -719,9 +719,17 @@ const idclass_t tvhlog_conf_class = { .ic_perm_def = ACCESS_ADMIN, .ic_groups = (const property_group_t[]) { { - .name = N_("Settings"), + .name = N_("General Settings"), .number = 1, }, + { + .name = N_("Subsystem Output Settings"), + .number = 2, + }, + { + .name = N_("Miscellaneous Settings"), + .number = 3, + }, {} }, .ic_properties = (const property_t[]){ @@ -753,18 +761,6 @@ const idclass_t tvhlog_conf_class = { .set = tvhlog_class_debug_syslog_set, .group = 1, }, - { - .type = PT_STR, - .id = "debugsubs", - .name = N_("Debug subsystems"), - .desc = N_("Enter comma-separated list of subsystems you want " - "debugging output for (e.g " - "+linuxdvb,+subscriptions,+mpegts)."), - .get = tvhlog_class_debugsubs_get, - .set = tvhlog_class_debugsubs_set, - .opts = PO_MULTILINE, - .group = 1, - }, { .type = PT_BOOL, .id = "trace", @@ -777,12 +773,24 @@ const idclass_t tvhlog_conf_class = { #endif .group = 1, }, + { + .type = PT_STR, + .id = "debugsubs", + .name = N_("Debug subsystems"), + .desc = N_("Enter comma-separated list of subsystems you want " + "debugging output for (e.g. " + "linuxdvb,subscriptions,mpegts)."), + .get = tvhlog_class_debugsubs_get, + .set = tvhlog_class_debugsubs_set, + .opts = PO_MULTILINE, + .group = 2, + }, { .type = PT_STR, .id = "tracesubs", .name = N_("Trace subsystems"), .desc = N_("Enter comma-separated list of subsystems you want " - "to get traces for (e.g +linuxdvb,+subscriptions,+mpegts)."), + "to get traces for (e.g linuxdvb,subscriptions,mpegts)."), .get = tvhlog_class_tracesubs_get, .set = tvhlog_class_tracesubs_set, #if !ENABLE_TRACE @@ -790,7 +798,7 @@ const idclass_t tvhlog_conf_class = { #else .opts = PO_MULTILINE, #endif - .group = 1, + .group = 2, }, { .type = PT_BOOL, @@ -799,7 +807,7 @@ const idclass_t tvhlog_conf_class = { .desc = N_("Enable/disable libav log output."), .get = tvhlog_class_libav_get, .set = tvhlog_class_libav_set, - .group = 1, + .group = 3, }, {} }