aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>2006-12-17 22:45:57 +0000
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>2006-12-17 22:45:57 +0000
commitba1b105a176e5f62faf9d6d1f4c1a4c19764a2e4 (patch)
tree6981461e8aa1d115ee40dacf4accceb977830cfa /lib/python/Screens
parentbbd916fde5e3d4b36dc8c96bfd2c63a524a4ef4c (diff)
downloadenigma2-ba1b105a176e5f62faf9d6d1f4c1a4c19764a2e4.tar.gz
enigma2-ba1b105a176e5f62faf9d6d1f4c1a4c19764a2e4.zip
replace software update plugin with a more user friendly approach
add an ipkg python class
Diffstat (limited to 'lib/python/Screens')
-rw-r--r--lib/python/Screens/TimerEdit.py2
-rw-r--r--lib/python/Screens/__init__.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index dbf3f1b5..5532dc83 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -199,7 +199,7 @@ class TimerSanityConflict(Screen):
if len(timer) > 1:
self["timer2"] = TimerList(self.getTimerList(timer[1]))
else:
- self["timer2"] = Button("No conflict")
+ self["timer2"] = TimerList([])
self.list = []
count = 0
diff --git a/lib/python/Screens/__init__.py b/lib/python/Screens/__init__.py
index 6e57497a..0780cedf 100644
--- a/lib/python/Screens/__init__.py
+++ b/lib/python/Screens/__init__.py
@@ -6,4 +6,5 @@ __all__ = ["ChannelSelection", "ClockDisplay", "ConfigMenu",
"EpgSelection", "EventView", "Standby", "ServiceInfo",
"InfoBarGenerics", "HelpMenu", "Wizard", "PiPSetup",
"PVRState", "Console", "InputBox", "ChoiceBox", "SimpleSummary",
- "TimerSelection", "SubservicesQuickzap", "ParentalControlSetup" ]
+ "TimerSelection", "SubservicesQuickzap", "ParentalControlSetup",
+ "SleepTimerEdit" ]