git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_617_default_favlist_handling_fix'
[enigma2.git]
/
lib
/
python
/
Components
/
UsageConfig.py
diff --git
a/lib/python/Components/UsageConfig.py
b/lib/python/Components/UsageConfig.py
index f133f9f611e538b3180c4ce528dcf921386dea34..b86c1a13128fc1a3cd26351637f12f7423c275ca 100644
(file)
--- a/
lib/python/Components/UsageConfig.py
+++ b/
lib/python/Components/UsageConfig.py
@@
-53,6
+53,12
@@
def InitUsageConfig():
("show_menu", _("show shutdown menu")),
("shutdown", _("immediate shutdown")),
("standby", _("Standby")) ] )
("show_menu", _("show shutdown menu")),
("shutdown", _("immediate shutdown")),
("standby", _("Standby")) ] )
+
+ config.usage.on_short_powerpress = ConfigSelection(default = "standby", choices = [
+ ("show_menu", _("show shutdown menu")),
+ ("shutdown", _("immediate shutdown")),
+ ("standby", _("Standby")) ] )
+
config.usage.alternatives_priority = ConfigSelection(default = "0", choices = [
("0", "DVB-S/-C/-T"),
config.usage.alternatives_priority = ConfigSelection(default = "0", choices = [
("0", "DVB-S/-C/-T"),
@@
-62,6
+68,8
@@
def InitUsageConfig():
("4", "DVB-T/-C/-S"),
("5", "DVB-T/-S/-C") ])
("4", "DVB-T/-C/-S"),
("5", "DVB-T/-S/-C") ])
+ config.usage.show_event_progress_in_servicelist = ConfigYesNo(default = False)
+
config.usage.blinking_display_clock_during_recording = ConfigYesNo(default = False)
config.usage.show_message_when_recording_starts = ConfigYesNo(default = True)
config.usage.blinking_display_clock_during_recording = ConfigYesNo(default = False)
config.usage.show_message_when_recording_starts = ConfigYesNo(default = True)