Added status message "Resetting CAM..." for an immediate feedback when the CAM reset has been triggered

This commit is contained in:
Klaus Schmidinger
2005-10-02 10:20:19 +02:00
parent 23aa374e3d
commit 8302d81af2
4 changed files with 37 additions and 12 deletions

View File

@@ -3869,3 +3869,5 @@ Video Disk Recorder Revision History
- Fixed setting current menu item if the first one is non-selectable. - Fixed setting current menu item if the first one is non-selectable.
- cOsdItem::cOsdItem() now has a 'Selectable' parameter. - cOsdItem::cOsdItem() now has a 'Selectable' parameter.
- Improved displaying 'sub-title' and 'bottom text' in the CAM menu. - Improved displaying 'sub-title' and 'bottom text' in the CAM menu.
- Added status message "Resetting CAM..." for an immediate feedback when the CAM
reset has been triggered.

37
i18n.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: i18n.c 1.210 2005/09/25 11:57:04 kls Exp $ * $Id: i18n.c 1.211 2005/10/02 10:17:41 kls Exp $
* *
* Translations provided by: * Translations provided by:
* *
@@ -2294,6 +2294,27 @@ const tI18nPhrase Phrases[] = {
"Ei saa avada CAM men<65><6E>d!", "Ei saa avada CAM men<65><6E>d!",
"Kan ikke <20>bne CAM menuen!", "Kan ikke <20>bne CAM menuen!",
}, },
{ "Resetting CAM...",
"CAM wird zur<75>ckgesetzt...",
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
},
{ "Can't reset CAM!", { "Can't reset CAM!",
"CAM-Reset fehlgeschlagen!", "CAM-Reset fehlgeschlagen!",
"Ne morem resetirati CAM-a", "Ne morem resetirati CAM-a",
@@ -2316,23 +2337,23 @@ const tI18nPhrase Phrases[] = {
"Kan ikke nulstille CAM!", "Kan ikke nulstille CAM!",
}, },
{ "CAM has been reset", { "CAM has been reset",
"CAM wurde zur<75>ckgesetzt!", "CAM wurde zur<75>ckgesetzt",
"CAM je resetiran!", "CAM je resetiran",
"Modulo CAM reimpostato!", "Modulo CAM reimpostato",
"CAM is herstart!", "CAM is herstart",
"",//TODO "",//TODO
"La CAM a <20>t<EFBFBD> r<>initialis<69>e", "La CAM a <20>t<EFBFBD> r<>initialis<69>e",
"",//TODO "",//TODO
"Salausmoduuli alustettu", "Salausmoduuli alustettu",
"CAM-Reset wykonany!", "CAM-Reset wykonany",
"CAM reiniciada", "CAM reiniciada",
"<EFBFBD><EFBFBD><EFBFBD> CAM <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", "<EFBFBD><EFBFBD><EFBFBD> CAM <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"CA modulen har <20>terst<73>llts", "CA modulen har <20>terst<73>llts",
"CAM-ul a fost resetat", "CAM-ul a fost resetat",
"A CAM vissza lett <20>ll<6C>tva", "A CAM vissza lett <20>ll<6C>tva",
"CAM reiniciada", "CAM reiniciada",
"CAM-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!", "CAM-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"CAM je resetiran!", "CAM je resetiran",
"CAM mooduli taask<73>ivitus tehtud", "CAM mooduli taask<73>ivitus tehtud",
"CAM er blevet nulstillet", "CAM er blevet nulstillet",
}, },

3
menu.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 1.365 2005/10/02 09:59:30 kls Exp $ * $Id: menu.c 1.366 2005/10/02 10:08:57 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@@ -2180,6 +2180,7 @@ eOSState cMenuSetupCICAM::Reset(void)
{ {
cMenuSetupCICAMItem *item = (cMenuSetupCICAMItem *)Get(Current()); cMenuSetupCICAMItem *item = (cMenuSetupCICAMItem *)Get(Current());
if (item) { if (item) {
Skins.Message(mtWarning, tr("Resetting CAM..."));
if (item->CiHandler()->Reset(item->Slot())) { if (item->CiHandler()->Reset(item->Slot())) {
Skins.Message(mtInfo, tr("CAM has been reset")); Skins.Message(mtInfo, tr("CAM has been reset"));
return osEnd; return osEnd;

View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: skins.c 1.4 2005/01/14 13:07:19 kls Exp $ * $Id: skins.c 1.5 2005/10/02 10:12:10 kls Exp $
*/ */
#include "skins.h" #include "skins.h"
@@ -169,8 +169,9 @@ bool cSkins::SetCurrent(const char *Name)
eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds) eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
{ {
switch (Type) { switch (Type) {
case mtInfo: isyslog("info: %s", s); break; case mtInfo: isyslog("info: %s", s); break;
case mtError: esyslog("ERROR: %s", s); break; case mtWarning: isyslog("warning: %s", s); break;
case mtError: esyslog("ERROR: %s", s); break;
default: ; default: ;
} }
if (!Current()) if (!Current())