diff -Naur extrecmenu-1.2.org/Makefile extrecmenu-1.2/Makefile --- extrecmenu-1.2.org/Makefile 2008-03-22 09:56:13.000000000 -0400 +++ extrecmenu-1.2/Makefile 2008-12-06 14:05:28.000000000 -0500 @@ -3,6 +3,13 @@ # # $Id$ +############################################################################### +# +# uncomment if you use the pin-plugin and want to protect your recordings +WITHPINPLUGIN=1 +# +############################################################################### + # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. # By default the main source file also carries this name. diff -Naur extrecmenu-1.2.org/mymenueditrecording.c extrecmenu-1.2/mymenueditrecording.c --- extrecmenu-1.2.org/mymenueditrecording.c 2008-03-22 11:23:47.000000000 -0400 +++ extrecmenu-1.2/mymenueditrecording.c 2008-12-06 14:03:25.000000000 -0500 @@ -45,7 +45,7 @@ if(DirBase) strn0cpy(path,DirBase,sizeof(path)); } - Add(new cMenuEditStrItem(trVDR("Name"),name,sizeof(name),tr(FileNameChars))); + Add(new cMenuEditStrItem(tr("Name"),name,sizeof(name),tr(FileNameChars))); cRemote::Put(kRight); } @@ -120,7 +120,7 @@ myMenuNewName::myMenuNewName():cOsdMenu(tr("New folder"),12) { strn0cpy(name,tr("New folder"),sizeof(name)); - Add(new cMenuEditStrItem(trVDR("Name"),name,sizeof(name),tr(FileNameChars))); + Add(new cMenuEditStrItem(tr("Name"),name,sizeof(name),tr(FileNameChars))); cRemote::Put(kRight); } @@ -471,8 +471,8 @@ priority=recording->priority; lifetime=recording->lifetime; - Add(new cMenuEditIntItem(trVDR("Priority"),&priority,0,MAXPRIORITY)); - Add(new cMenuEditIntItem(trVDR("Lifetime"),&lifetime,0,MAXLIFETIME)); + Add(new cMenuEditIntItem(tr("Priority"),&priority,0,MAXPRIORITY)); + Add(new cMenuEditIntItem(tr("Lifetime"),&lifetime,0,MAXLIFETIME)); } eOSState myMenuRecordingDetails::ProcessKey(eKeys Key) diff -Naur extrecmenu-1.2.org/mymenurecordings.c extrecmenu-1.2/mymenurecordings.c --- extrecmenu-1.2.org/mymenurecordings.c 2008-03-22 11:21:48.000000000 -0400 +++ extrecmenu-1.2/mymenurecordings.c 2008-12-28 12:13:48.000000000 -0500 @@ -41,7 +41,7 @@ #endif }; -myMenuRecordingInfo::myMenuRecordingInfo(const cRecording *Recording, bool WithButtons):cOsdMenu(trVDR("Recording info")) +myMenuRecordingInfo::myMenuRecordingInfo(const cRecording *Recording, bool WithButtons):cOsdMenu(tr("Recording info")) { recording=Recording; withButtons=WithButtons; @@ -95,8 +95,8 @@ else text << tr("Size") << ": " << recmb << " MB\n"; - text << trVDR("Priority") << ": " << recording->priority << "\n"; - text << trVDR("Lifetime") << ": " << recording->lifetime << "\n"; + text << tr("Priority") << ": " << recording->priority << "\n"; + text << tr("Lifetime") << ": " << recording->lifetime << "\n"; DisplayMenu()->SetText(text.str().c_str(),false); cStatus::MsgOsdTextItem(text.str().c_str()); @@ -202,9 +202,9 @@ else if(MoveCutterThread->IsCutting(filename)) titlebuffer << Icons::Scissor(); // cutting recording else if(Recording->IsNew() && !mysetup.PatchNew) - titlebuffer << '*'; + titlebuffer << Icons::New(); else if(!Recording->IsNew() && mysetup.PatchNew) - titlebuffer << Icons::Continue(); // alternative to new marker / rewind / continue + titlebuffer << '!'; // alternative to new marker / rewind / continue else titlebuffer << ' '; // no icon titlebuffer << '\t'; @@ -479,12 +479,12 @@ if(base) buffer << base; else - buffer << trVDR("Recordings"); + buffer << tr("Recordings"); buffer << " (" << minutes/60 << ":" << setw(2) << setfill('0') << minutes%60 << " " - << trVDR("free") + << tr("free") << ")"; SetTitle(buffer.str().c_str()); @@ -636,7 +636,7 @@ { cRecording *recording=Recordings.GetByName(Item->FileName()); if(!recording) - Skins.Message(mtError,trVDR("Error while accessing recording!")); + Skins.Message(mtError,tr("Error while accessing recording!")); return recording; } @@ -805,12 +805,12 @@ myMenuRecordingsItem *item=(myMenuRecordingsItem*)Get(Current()); if(item&&!item->IsDirectory()) { - if(Interface->Confirm(trVDR("Delete recording?"))) + if(Interface->Confirm(tr("Delete recording?"))) { cRecordControl *rc=cRecordControls::GetRecordControl(item->FileName()); if(rc) { - if(Interface->Confirm(trVDR("Timer still recording - really delete?"))) + if(Interface->Confirm(tr("Timer still recording - really delete?"))) { cTimer *timer=rc->Timer(); if(timer) @@ -843,7 +843,7 @@ return osBack; } else - Skins.Message(mtError,trVDR("Error while deleting recording!")); + Skins.Message(mtError,tr("Error while deleting recording!")); } } } @@ -942,7 +942,7 @@ char *parameter=NULL; asprintf(¶meter,"\"%s\"",recording->FileName()); myMenuCommands *menu; - eOSState state=AddSubMenu(menu=new myMenuCommands(trVDR("Recording commands"),&RecordingCommands,parameter)); + eOSState state=AddSubMenu(menu=new myMenuCommands(tr("Recording commands"),&RecordingCommands,parameter)); free(parameter); if(Key!=kNone) state=menu->ProcessKey(Key); @@ -1065,7 +1065,7 @@ #endif if(MoveCutterThread->IsCutting(rec->FileName())) { - if(Interface->Confirm(trVDR("Cancel editing?"))) + if(Interface->Confirm(tr("Cancel editing?"))) { MoveCutterThread->CancelCut(rec->FileName()); Set(true);