cleanup some imports

[vuplus_dvbapp] / lib / python / Components / ConfigList.py

diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py
index 5b959dc..7ed6031 100644 (file)
--- a/lib/python/Components/ConfigList.py
+++ b/lib/python/Components/ConfigList.py
@@ -1,8 +1,9 @@
-from HTMLComponent import *
-from GUIComponent import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
 from config import KEY_LEFT, KEY_RIGHT, KEY_0, KEY_DELETE, KEY_OK, KEY_TIMEOUT, ConfigElement
 from Components.ActionMap import NumberActionMap
 from enigma import eListbox, eListboxPythonConfigContent, eTimer
+from Screens.MessageBox import MessageBox
 
 class ConfigList(HTMLComponent, GUIComponent, object):
        def __init__(self, list, session = None):
@@ -10,17 +11,18 @@ class ConfigList(HTMLComponent, GUIComponent, object):
                self.l = eListboxPythonConfigContent()
                self.l.setSeperation(100)
                self.timer = eTimer()
-               self.timer.timeout.get().append(self.timeout)
                self.list = list
                self.onSelectionChanged = [ ]
                self.current = None
                self.help_window = None
                self.setHelpWindowSession(session)
 
-       def execEnd(self):
-               self.timer = eTimer()
+       def execBegin(self):
                self.timer.timeout.get().append(self.timeout)
 
+       def execEnd(self):
+               self.timer.timeout.get().remove(self.timeout)
+
        def setHelpWindowSession(self, session):
                assert self.help_window is None, "you can't move a help window to another session"
                self.session = session
@@ -43,11 +45,17 @@ class ConfigList(HTMLComponent, GUIComponent, object):
        def getCurrent(self):
                return self.l.getCurrentSelection()
        
+       def getCurrentIndex(self):
+               return self.l.getCurrentSelectionIndex()
+       
        def invalidateCurrent(self):
                self.l.invalidateEntry(self.l.getCurrentSelectionIndex())
-               
+
        def invalidate(self, entry):
-               self.l.invalidateEntry(self.__list.index(entry))
+               # when the entry to invalidate does not exist, just ignore the request.
+               # this eases up conditional setup screens a lot.
+               if entry in self.__list:
+                       self.l.invalidateEntry(self.__list.index(entry))
 
        GUI_WIDGET = eListbox
        
@@ -90,8 +98,15 @@ class ConfigList(HTMLComponent, GUIComponent, object):
        def timeout(self):
                self.handleKey(KEY_TIMEOUT)
 
+       def isChanged(self):
+               is_changed = False
+               for x in self.list:
+                       is_changed |= x[1].isChanged()
+
+               return is_changed
+
 class ConfigListScreen:
-       def __init__(self, list, session = None):
+       def __init__(self, list, session = None, on_change = None):
                self["config_actions"] = NumberActionMap(["SetupActions", "TextInputActions"],
                {
                        "ok": self.keyOK,
@@ -111,18 +126,47 @@ class ConfigListScreen:
                }, -1) # to prevent left/right overriding the listbox
                
                self["config"] = ConfigList(list, session = session)
+               if on_change is not None:
+                       self.__changed = on_change
+               else:
+                       self.__changed = lambda: None
 
        def keyOK(self):
                self["config"].handleKey(KEY_OK)
 
        def keyLeft(self):
                self["config"].handleKey(KEY_LEFT)
+               self.__changed()
 
        def keyRight(self):
                self["config"].handleKey(KEY_RIGHT)
+               self.__changed()
 
        def keyDelete(self):
                self["config"].handleKey(KEY_DELETE)
+               self.__changed()
 
        def keyNumberGlobal(self, number):
                self["config"].handleKey(KEY_0 + number)
+               self.__changed()
+
+       # keySave and keyCancel are just provided in case you need them.
+       # you have to call them by yourself.
+       def keySave(self):
+               for x in self["config"].list:
+                       x[1].save()
+               self.close()
+       
+       def cancelConfirm(self, result):
+               if not result:
+                       return
+
+               for x in self["config"].list:
+                       x[1].cancel()
+               self.close()
+
+       def keyCancel(self):
+               if self["config"].isChanged():
+                       self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?"))
+               else:
+                       self.close()