mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
New Setup item 'Restart'
This commit is contained in:
parent
ae3f18dd57
commit
b72b15cf8f
6
HISTORY
6
HISTORY
@ -1067,7 +1067,7 @@ Video Disk Recorder Revision History
|
|||||||
available on any DVB card).
|
available on any DVB card).
|
||||||
- Updated French language texts (thanks to Jean-Claude Repetto).
|
- Updated French language texts (thanks to Jean-Claude Repetto).
|
||||||
|
|
||||||
2002-03-16: Version 1.0.0pre4
|
2002-03-17: Version 1.0.0pre4
|
||||||
|
|
||||||
- Added 'Ca' code 201 for 'Cryptoworks, GOD-DIGITAL' to 'ca.conf' (thanks to
|
- Added 'Ca' code 201 for 'Cryptoworks, GOD-DIGITAL' to 'ca.conf' (thanks to
|
||||||
Bernd Schweikert).
|
Bernd Schweikert).
|
||||||
@ -1114,3 +1114,7 @@ Video Disk Recorder Revision History
|
|||||||
- The "Commands" menu now automatically assigns number keys as hotkeys to the
|
- The "Commands" menu now automatically assigns number keys as hotkeys to the
|
||||||
commands. If you have preceeded your commands with digits you may want to
|
commands. If you have preceeded your commands with digits you may want to
|
||||||
remove these from your 'commands.conf' file.
|
remove these from your 'commands.conf' file.
|
||||||
|
- The new Setup item "Restart" can be used to force a complete restart of VDR,
|
||||||
|
including reloading the driver. Note that this can only work if VDR and the
|
||||||
|
driver are wrapped into a mechanism that actually performs this action if VDR
|
||||||
|
exits. The 'runvdr' script can be used for this purpose.
|
||||||
|
32
i18n.c
32
i18n.c
@ -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.64 2002/03/16 10:04:23 kls Exp $
|
* $Id: i18n.c 1.65 2002/03/17 12:00:41 kls Exp $
|
||||||
*
|
*
|
||||||
* Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
|
* Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
|
||||||
* Italian translations provided by Alberto Carraro <bertocar@tin.it>
|
* Italian translations provided by Alberto Carraro <bertocar@tin.it>
|
||||||
@ -470,6 +470,26 @@ const tPhrase Phrases[] = {
|
|||||||
"Avbryte redigering?",
|
"Avbryte redigering?",
|
||||||
"Peruutetaanko muokkaus?",
|
"Peruutetaanko muokkaus?",
|
||||||
},
|
},
|
||||||
|
{ "Really restart?",
|
||||||
|
"Wirklich neu starten?",
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
},
|
||||||
|
{ "Recording - restart anyway?",
|
||||||
|
"Aufnahme läuft - trotzdem neu starten?",
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
},
|
||||||
{ "Recording - shut down anyway?",
|
{ "Recording - shut down anyway?",
|
||||||
"Aufnahme läuft - trotzdem ausschalten?",
|
"Aufnahme läuft - trotzdem ausschalten?",
|
||||||
"", // TODO
|
"", // TODO
|
||||||
@ -934,6 +954,16 @@ const tPhrase Phrases[] = {
|
|||||||
"", // TODO
|
"", // TODO
|
||||||
"", // TODO
|
"", // TODO
|
||||||
},
|
},
|
||||||
|
{ "Restart",
|
||||||
|
"Neustart",
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
"", // TODO
|
||||||
|
},
|
||||||
// Setup parameters:
|
// Setup parameters:
|
||||||
{ "OSD-Language",
|
{ "OSD-Language",
|
||||||
"OSD-Sprache",
|
"OSD-Sprache",
|
||||||
|
14
menu.c
14
menu.c
@ -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.169 2002/03/16 16:44:15 kls Exp $
|
* $Id: menu.c 1.170 2002/03/17 12:01:08 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "menu.h"
|
#include "menu.h"
|
||||||
@ -2142,6 +2142,7 @@ void cMenuSetupMisc::Set(void)
|
|||||||
class cMenuSetup : public cOsdMenu {
|
class cMenuSetup : public cOsdMenu {
|
||||||
private:
|
private:
|
||||||
virtual void Set(void);
|
virtual void Set(void);
|
||||||
|
eOSState Restart(void);
|
||||||
public:
|
public:
|
||||||
cMenuSetup(void);
|
cMenuSetup(void);
|
||||||
virtual eOSState ProcessKey(eKeys Key);
|
virtual eOSState ProcessKey(eKeys Key);
|
||||||
@ -2166,6 +2167,16 @@ void cMenuSetup::Set(void)
|
|||||||
Add(new cOsdItem(hk(tr("Recording")), osUser6));
|
Add(new cOsdItem(hk(tr("Recording")), osUser6));
|
||||||
Add(new cOsdItem(hk(tr("Replay")), osUser7));
|
Add(new cOsdItem(hk(tr("Replay")), osUser7));
|
||||||
Add(new cOsdItem(hk(tr("Miscellaneous")), osUser8));
|
Add(new cOsdItem(hk(tr("Miscellaneous")), osUser8));
|
||||||
|
Add(new cOsdItem(hk(tr("Restart")), osUser9));
|
||||||
|
}
|
||||||
|
|
||||||
|
eOSState cMenuSetup::Restart(void)
|
||||||
|
{
|
||||||
|
if (Interface->Confirm(cRecordControls::Active() ? tr("Recording - restart anyway?") : tr("Really restart?"))) {
|
||||||
|
cThread::EmergencyExit(true);
|
||||||
|
return osEnd;
|
||||||
|
}
|
||||||
|
return osContinue;
|
||||||
}
|
}
|
||||||
|
|
||||||
eOSState cMenuSetup::ProcessKey(eKeys Key)
|
eOSState cMenuSetup::ProcessKey(eKeys Key)
|
||||||
@ -2182,6 +2193,7 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
|
|||||||
case osUser6: return AddSubMenu(new cMenuSetupRecord);
|
case osUser6: return AddSubMenu(new cMenuSetupRecord);
|
||||||
case osUser7: return AddSubMenu(new cMenuSetupReplay);
|
case osUser7: return AddSubMenu(new cMenuSetupReplay);
|
||||||
case osUser8: return AddSubMenu(new cMenuSetupMisc);
|
case osUser8: return AddSubMenu(new cMenuSetupMisc);
|
||||||
|
case osUser9: return Restart();
|
||||||
default: ;
|
default: ;
|
||||||
}
|
}
|
||||||
if (Setup.OSDLanguage != osdLanguage) {
|
if (Setup.OSDLanguage != osdLanguage) {
|
||||||
|
Loading…
Reference in New Issue
Block a user