translate weekdays in fuzzy date display

[enigma2.git] / lib / python / Tools / Notifications.py

diff --git a/lib/python/Tools/Notifications.py b/lib/python/Tools/Notifications.py
index b547639beb20f7910ff3ea0a0bfc96b71a3a3b64..0410a4e2d18bcfaa4fe55995829b6c5cc6786a84 100644 (file)
--- a/lib/python/Tools/Notifications.py
+++ b/lib/python/Tools/Notifications.py
@@ -3,11 +3,43 @@ notifications = [ ]
 
 notificationAdded = [ ]
 
-def AddNotification(screen, *args):
-       AddNotificationWithCallback(None, screen, *args)
+# notifications which are currently on screen (and might be closed by similiar notifications)
+current_notifications = [ ]
 
-def AddNotificationWithCallback(fnc, screen, *args):
-       notifications.append((fnc, screen) + args)
+def __AddNotification(fnc, screen, id, *args, **kwargs):
+       notifications.append((fnc, screen, args, kwargs, id))
        for x in notificationAdded:
                x()
 
+def AddNotification(screen, *args, **kwargs):
+       AddNotificationWithCallback(None, screen, *args, **kwargs)
+
+def AddNotificationWithCallback(fnc, screen, *args, **kwargs):
+       __AddNotification(fnc, screen, None, *args, **kwargs)
+
+def AddNotificationWithID(id, screen, *args, **kwargs):
+       __AddNotification(None, screen, id, *args, **kwargs)
+
+# we don't support notifications with callback and ID as this
+# would require manually calling the callback on cancelled popups.
+
+def RemovePopup(id):
+       # remove similiar notifications
+       print "RemovePopup, id =", id
+       for x in notifications:
+               if x[4] and x[4] == id:
+                       print "(found in notifications)"
+                       notifications.remove(x)
+
+       for x in current_notifications:
+               if x[0] == id:
+                       print "(found in current notifications)"
+                       x[1].close()
+
+from Screens.MessageBox import MessageBox
+
+def AddPopup(text, type, timeout, id = None):
+       if id is not None:
+               RemovePopup(id)
+       print "AddPopup, id =", id
+       AddNotificationWithID(id, MessageBox, text = text, type = type, timeout = timeout, close_on_any_key = True)