From abd38d119550105bc1fa2ca25f386fb7eddc8919 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 15 Mar 2018 21:23:01 +0100 Subject: [PATCH] daemon-control: update Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5152d34b8b03821c301f85c318a1edf21ac03eac Author: vanhofen Date: 2018-03-15 (Thu, 15 Mar 2018) Origin message was: ------------------ - daemon-control: update ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/icons/status/ca/Makefile.am | 1 + data/icons/status/ca/cccam_green.png | Bin 0 -> 304 bytes data/locale/deutsch.locale | 2 ++ data/locale/english.locale | 2 ++ src/gui/daemon_control.cpp | 1 + src/system/locals.h | 2 ++ src/system/locals_intern.h | 2 ++ src/system/setting_helpers.cpp | 2 ++ 8 files changed, 12 insertions(+) create mode 100644 data/icons/status/ca/cccam_green.png diff --git a/data/icons/status/ca/Makefile.am b/data/icons/status/ca/Makefile.am index 13c3bf922..dec8eeae7 100644 --- a/data/icons/status/ca/Makefile.am +++ b/data/icons/status/ca/Makefile.am @@ -4,6 +4,7 @@ install_DATA = \ biss_green.png \ biss_white.png \ biss_yellow.png \ + cccam_green.png \ ci+_green.png \ ci+_grey.png \ conax_green.png \ diff --git a/data/icons/status/ca/cccam_green.png b/data/icons/status/ca/cccam_green.png new file mode 100644 index 0000000000000000000000000000000000000000..005d544644bc4d985167d9454d11a2eaad351691 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-G!3-py-CZXQq>KZ6LR@{;2LO@xO8*BB9ymEU zUAuPe(xpomFJ5eKZ!az`21>c6xD^!@-MxGF^5x6-?%gXbE!`cRw+5)4u_VYZn8D%M zjWiG^$=lt9p@UV{1IXbl@Q5sCVBi)8VMc~ob0mO*>?NMQuI!JPc}0Xw#eeZu0ENmt zT^vI!PG6l8$#p=1$E7*4VBzV%{?Ti{y7TOC$YgJGJaO33fZ>?`DTWyileySzd{5Ui z+m-iZEw@nG;vy#cW1g$3>LH&aQavluw{5lHlIOg0X{O}y{BvKu_i>8*Uwv0$P?>c# rayO^-$-|{(2kU=Hc%M#4<&9m=BIen$?a6GQ3m80I{an^LB{Ts5;C*j` literal 0 HcmV?d00001 diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 8b2083603..5ed903644 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -247,6 +247,8 @@ ca_init_1 CI-Modul ca_init_2 Conax-Karte und CI-Modul cablesetup.provider Kabelanbieter camd_control camd-Steuerung +camd_item_cccam_hint CCCam - Softcam +camd_item_cccam_name cccam camd_item_cs2gbox_hint cs2gbox - Newcamd Bridge camd_item_cs2gbox_name cs2gbox camd_item_doscam_hint DOSCam - Softcam und Emulator diff --git a/data/locale/english.locale b/data/locale/english.locale index b0f435421..3b1058de8 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -247,6 +247,8 @@ ca_init_1 CI module ca_init_2 Conax-Card and CI module cablesetup.provider cable provider camd_control camd control +camd_item_cccam_hint CCCam - Softcam +camd_item_cccam_name cccam camd_item_cs2gbox_hint cs2gbox - Newcamd bridge camd_item_cs2gbox_name cs2gbox camd_item_doscam_hint DOSCam - Softcam and emulator diff --git a/src/gui/daemon_control.cpp b/src/gui/daemon_control.cpp index 05d0e0726..801cd2f2b 100644 --- a/src/gui/daemon_control.cpp +++ b/src/gui/daemon_control.cpp @@ -147,6 +147,7 @@ camds_data_t camds_data[]= {LOCALE_CAMD_ITEM_NCAM_NAME, LOCALE_CAMD_ITEM_NCAM_HINT, "NCAM", "ncam", 0, 0}, {LOCALE_CAMD_ITEM_OSCAM_NAME, LOCALE_CAMD_ITEM_OSCAM_HINT, "OSCAM", "oscam", 0, 0}, {LOCALE_CAMD_ITEM_OSEMU_NAME, LOCALE_CAMD_ITEM_OSEMU_HINT, "OSEMU", "osemu", 0, 0}, + {LOCALE_CAMD_ITEM_CCCAM_NAME, LOCALE_CAMD_ITEM_CCCAM_HINT, "CCCAM", "cccam", 0, 0}, {LOCALE_CAMD_ITEM_NEWCS_NAME, LOCALE_CAMD_ITEM_NEWCS_HINT, "NEWCS", "newcs", 0, 0}, {LOCALE_CAMD_ITEM_GBOX_NAME, LOCALE_CAMD_ITEM_GBOX_HINT, "GBOX.NET", "gbox", 0, 0}, {LOCALE_CAMD_ITEM_CS2GBOX_NAME, LOCALE_CAMD_ITEM_CS2GBOX_HINT, "CS2GBOX", "cs2gbox", 0, 0} diff --git a/src/system/locals.h b/src/system/locals.h index a75eda84a..e4c80cf48 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -274,6 +274,8 @@ typedef enum LOCALE_CA_INIT_2, LOCALE_CABLESETUP_PROVIDER, LOCALE_CAMD_CONTROL, + LOCALE_CAMD_ITEM_CCCAM_HINT, + LOCALE_CAMD_ITEM_CCCAM_NAME, LOCALE_CAMD_ITEM_CS2GBOX_HINT, LOCALE_CAMD_ITEM_CS2GBOX_NAME, LOCALE_CAMD_ITEM_DOSCAM_HINT, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index a6a4a502b..c9562b01e 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -274,6 +274,8 @@ const char * locale_real_names[] = "ca_init_2", "cablesetup.provider", "camd_control", + "camd_item_cccam_hint", + "camd_item_cccam_name", "camd_item_cs2gbox_hint", "camd_item_cs2gbox_name", "camd_item_doscam_hint", diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index b6d0a6f80..6057c1987 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -179,6 +179,7 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data) strstr(filename, "doscam") || strstr(filename, "ncam") || strstr(filename, "oscam") || + strstr(filename, "cccam") || strstr(filename, "cs2gbox") || strstr(filename, "gbox")) { @@ -227,6 +228,7 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data) strstr(filename, "doscam") || strstr(filename, "ncam") || strstr(filename, "oscam") || + strstr(filename, "cccam") || strstr(filename, "cs2gbox") || strstr(filename, "gbox")) {