Add a number of basic property descriptions, hide a few properties.

diff --git a/src/descrambler/caclient.c b/src/descrambler/caclient.c
index 574eacd662a4de392e660621dba366b9e4f258ed..0b4caaffa1b520a6105035cf6669069c13bc8170 100644 (file)
--- a/src/descrambler/caclient.c
+++ b/src/descrambler/caclient.c
@@ -242,7 +242,7 @@ CLASS_DOC(caclient)
 const idclass_t caclient_class =
 {
   .ic_class      = "caclient",
-  .ic_caption    = N_("Conditional access client"),
+  .ic_caption    = N_("Conditional Access Client"),
   .ic_changed    = caclient_class_changed,
   .ic_save       = caclient_class_save,
   .ic_event      = "caclient",
@@ -256,7 +256,7 @@ const idclass_t caclient_class =
       .type     = PT_STR,
       .id       = "class",
       .name     = N_("Class"),
-      .opts     = PO_RDONLY | PO_HIDDEN,
+      .opts     = PO_RDONLY | PO_HIDDEN | PO_NOUI,
       .get      = caclient_class_class_get,
       .set      = caclient_class_class_set,
     },
@@ -264,19 +264,21 @@ const idclass_t caclient_class =
       .type     = PT_INT,
       .id       = "index",
       .name     = N_("Index"),
-      .opts     = PO_RDONLY | PO_HIDDEN,
+      .opts     = PO_RDONLY | PO_HIDDEN | PO_NOUI,
       .off      = offsetof(caclient_t, cac_index),
     },
     {
       .type     = PT_BOOL,
       .id       = "enabled",
       .name     = N_("Enabled"),
+      .desc     = N_("Enable/Disable CA client."),
       .off      = offsetof(caclient_t, cac_enabled),
     },
     {
       .type     = PT_STR,
       .id       = "name",
       .name     = N_("Client name"),
+      .desc     = N_("Name of the client."),
       .off      = offsetof(caclient_t, cac_name),
       .notify   = idnode_notify_title_changed,
     },
@@ -284,6 +286,7 @@ const idclass_t caclient_class =
       .type     = PT_STR,
       .id       = "comment",
       .name     = N_("Comment"),
+      .desc     = N_("Free-form text field, enter whatever you like."),
       .off      = offsetof(caclient_t, cac_comment),
     },
     {
@@ -291,7 +294,7 @@ const idclass_t caclient_class =
       .id       = "status",
       .name     = N_("Status"),
       .get      = caclient_class_status_get,
-      .opts     = PO_RDONLY | PO_HIDDEN | PO_NOSAVE,
+      .opts     = PO_RDONLY | PO_HIDDEN | PO_NOSAVE | PO_NOUI,
     },
     { }
   }

diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index e8f05780c1a66fe3c032bcabc2095599297564d6..d3ecdd6be5390baa1837e0ebac90d39c22cb983a 100644 (file)
--- a/src/descrambler/capmt.c
+++ b/src/descrambler/capmt.c
@@ -2287,12 +2287,13 @@ const idclass_t caclient_capmt_class =
 {
   .ic_super      = &caclient_class,
   .ic_class      = "caclient_capmt",
-  .ic_caption    = N_("CAPMT (Linux Network DVBAPI)"),
+  .ic_caption    = N_("CA Client - CAPMT (Linux Network DVBAPI)"),
   .ic_properties = (const property_t[]){
     {
       .type     = PT_INT,
       .id       = "mode",
       .name     = N_("Mode"),
+      .desc     = N_("Oscam mode."),
       .off      = offsetof(capmt_t, capmt_oscam),
       .list     = caclient_capmt_class_oscam_mode_list,
       .def.i    = CAPMT_OSCAM_MULTILIST,
@@ -2301,6 +2302,7 @@ const idclass_t caclient_capmt_class =
       .type     = PT_STR,
       .id       = "camdfilename",
       .name     = N_("Camd.socket filename / IP Address (TCP mode)"),
+      .desc     = N_("Socket or IP Address (when in TCP mode)."),
       .off      = offsetof(capmt_t, capmt_sockfile),
       .def.s    = "/tmp/camd.socket",
     },
@@ -2308,6 +2310,7 @@ const idclass_t caclient_capmt_class =
       .type     = PT_INT,
       .id       = "port",
       .name     = N_("Listen / Connect port"),
+      .desc     = N_("Port to listen on."),
       .off      = offsetof(capmt_t, capmt_port),
       .def.i    = 9000
     },

diff --git a/src/descrambler/constcw.c b/src/descrambler/constcw.c
index ffdc01e755c575a37bd89c2500aef26720db31f9..8b88d8bccf01139de2c4c7b7bcd19f630c5bb02e 100644 (file)
--- a/src/descrambler/constcw.c
+++ b/src/descrambler/constcw.c
@@ -282,12 +282,13 @@ const idclass_t caclient_ccw_des_class =
 {
   .ic_super      = &caclient_class,
   .ic_class      = "caclient_ccw_des",
-  .ic_caption    = N_("DES constant code word client"),
+  .ic_caption    = N_("CA Client - DES Constant Code Word"),
   .ic_properties = (const property_t[]){
     {
       .type     = PT_U16,
       .id       = "caid",
       .name     = N_("CA ID"),
+      .desc     = N_("Conditional Access Identification."),
       .off      = offsetof(constcw_t, ccw_caid),
       .opts     = PO_HEXA,
       .def.u16  = 0x2600
@@ -296,6 +297,7 @@ const idclass_t caclient_ccw_des_class =
       .type     = PT_U32,
       .id       = "providerid",
       .name     = N_("Provider ID"),
+      .desc     = N_("The provider's ID."),
       .off      = offsetof(constcw_t, ccw_providerid),
       .opts     = PO_HEXA,
       .def.u32  = 0
@@ -304,6 +306,7 @@ const idclass_t caclient_ccw_des_class =
       .type     = PT_U16,
       .id       = "tsid",
       .name     = N_("Transponder ID"),
+      .desc     = N_("The transponder ID."),
       .off      = offsetof(constcw_t, ccw_tsid),
       .opts     = PO_HEXA,
       .def.u16  = 1,
@@ -312,6 +315,7 @@ const idclass_t caclient_ccw_des_class =
       .type     = PT_U16,
       .id       = "sid",
       .name     = N_("Service ID"),
+      .desc     = N_("The service ID."),
       .off      = offsetof(constcw_t, ccw_sid),
       .opts     = PO_HEXA,
       .def.u16  = 1,
@@ -320,6 +324,7 @@ const idclass_t caclient_ccw_des_class =
       .type     = PT_STR,
       .id       = "key_even",
       .name     = N_("Even key"),
+      .desc     = N_("Even key."),
       .set      = constcw_class_key_even_set,
       .get      = constcw_class_key_even_get,
       .opts     = PO_PASSWORD,
@@ -329,6 +334,7 @@ const idclass_t caclient_ccw_des_class =
       .type     = PT_STR,
       .id       = "key_odd",
       .name     = N_("Odd key"),
+      .desc     = N_("Odd key."),
       .set      = constcw_class_key_odd_set,
       .get      = constcw_class_key_odd_get,
       .opts     = PO_PASSWORD,
@@ -342,12 +348,13 @@ const idclass_t caclient_ccw_aes_class =
 {
   .ic_super      = &caclient_class,
   .ic_class      = "caclient_ccw_aes",
-  .ic_caption    = N_("AES constant code word client"),
+  .ic_caption    = N_("CA Client - AES Constant Code Word"),
   .ic_properties = (const property_t[]){
     {
       .type     = PT_U16,
       .id       = "caid",
       .name     = N_("CA ID"),
+      .desc     = N_("Conditional Access Identification."),
       .off      = offsetof(constcw_t, ccw_caid),
       .opts     = PO_HEXA,
       .def.u16  = 0x2600,
@@ -356,6 +363,7 @@ const idclass_t caclient_ccw_aes_class =
       .type     = PT_U32,
       .id       = "providerid",
       .name     = N_("Provider ID"),
+      .desc     = N_("The provider's ID."),
       .off      = offsetof(constcw_t, ccw_providerid),
       .opts     = PO_HEXA,
       .def.u32  = 0
@@ -364,6 +372,7 @@ const idclass_t caclient_ccw_aes_class =
       .type     = PT_U16,
       .id       = "tsid",
       .name     = N_("Transponder ID"),
+      .desc     = N_("The transponder ID."),
       .off      = offsetof(constcw_t, ccw_tsid),
       .opts     = PO_HEXA,
       .def.u16  = 1,
@@ -372,6 +381,7 @@ const idclass_t caclient_ccw_aes_class =
       .type     = PT_U16,
       .id       = "sid",
       .name     = N_("Service ID"),
+      .desc     = N_("The service ID"),
       .off      = offsetof(constcw_t, ccw_sid),
       .opts     = PO_HEXA,
       .def.u16  = 1,
@@ -380,6 +390,7 @@ const idclass_t caclient_ccw_aes_class =
       .type     = PT_STR,
       .id       = "key_even",
       .name     = N_("Even key"),
+      .desc     = N_("Even key."),
       .set      = constcw_class_key_even_set,
       .get      = constcw_class_key_even_get,
       .opts     = PO_PASSWORD,
@@ -389,6 +400,7 @@ const idclass_t caclient_ccw_aes_class =
       .type     = PT_STR,
       .id       = "key_odd",
       .name     = N_("Odd key"),
+      .desc     = N_("Odd key."),
       .set      = constcw_class_key_odd_set,
       .get      = constcw_class_key_odd_get,
       .opts     = PO_PASSWORD,

diff --git a/src/descrambler/cwc.c b/src/descrambler/cwc.c
index cdc50acba4022f743e5ea2e2e7662222c947ab1b..f5075c0da7256ae04dddf56c290468f53a643e87 100644 (file)
--- a/src/descrambler/cwc.c
+++ b/src/descrambler/cwc.c
@@ -1798,18 +1798,20 @@ const idclass_t caclient_cwc_class =
 {
   .ic_super      = &caclient_class,
   .ic_class      = "caclient_cwc",
-  .ic_caption    = N_("Code word client (newcamd)"),
+  .ic_caption    = N_("CA Client - Code Word Client (newcamd)"),
   .ic_properties = (const property_t[]){
     {
       .type     = PT_STR,
       .id       = "username",
       .name     = N_("Username"),
+      .desc     = N_("Login username."),
       .off      = offsetof(cwc_t, cwc_username),
     },
     {
       .type     = PT_STR,
       .id       = "password",
       .name     = N_("Password"),
+      .desc     = N_("Login password."),
       .off      = offsetof(cwc_t, cwc_password),
       .opts     = PO_PASSWORD
     },
@@ -1817,6 +1819,7 @@ const idclass_t caclient_cwc_class =
       .type     = PT_STR,
       .id       = "hostname",
       .name     = N_("Hostname/IP"),
+      .desc     = N_("Hostname (or IP) of the server."),
       .off      = offsetof(cwc_t, cwc_hostname),
       .def.s    = "localhost",
     },
@@ -1824,12 +1827,14 @@ const idclass_t caclient_cwc_class =
       .type     = PT_INT,
       .id       = "port",
       .name     = N_("Port"),
+      .desc     = N_("Port to connect to."),
       .off      = offsetof(cwc_t, cwc_port),
     },
     {
       .type     = PT_STR,
       .id       = "deskey",
       .name     = N_("DES key"),
+      .desc     = N_("DES Key."),
       .set      = caclient_cwc_class_deskey_set,
       .get      = caclient_cwc_class_deskey_get,
       .opts     = PO_PASSWORD,
@@ -1839,6 +1844,7 @@ const idclass_t caclient_cwc_class =
       .type     = PT_BOOL,
       .id       = "emm",
       .name     = N_("Update card (EMM)"),
+      .desc     = N_("Enable/disable offering of Entitlement Management Message updates."),
       .off      = offsetof(cwc_t, cwc_emm),
       .def.i    = 1
     },
@@ -1846,6 +1852,7 @@ const idclass_t caclient_cwc_class =
       .type     = PT_BOOL,
       .id       = "emmex",
       .name     = N_("Updates from one mux (EMM)"),
+      .desc     = N_("Update Entitlement Management Messages from one mux only."),
       .off      = offsetof(cwc_t, cwc_emmex),
       .def.i    = 1
     },