load configured pages on startup

diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py
index 2fc7d4a72b28c36574f6e73c0b6ee2f8d8f46c8d..309bf3e70a8a0bf475bacc70d04885aaada0328d 100644 (file)
--- a/src/CurlyTxSettings.py
+++ b/src/CurlyTxSettings.py
@@ -42,6 +42,7 @@ class CurlyTxSettings(ConfigListScreen, Screen):
         self["key_blue"]   = StaticText(_("Delete"))
 
         ConfigListScreen.__init__(self, self.getConfigList(), session = self.session)
         self["key_blue"]   = StaticText(_("Delete"))
 
         ConfigListScreen.__init__(self, self.getConfigList(), session = self.session)

+        self.onClose.append(self.abort)

 
     def getConfigList(self):
         list = [
 
     def getConfigList(self):
         list = [


@@ -73,6 +74,8 @@ class CurlyTxSettings(ConfigListScreen, Screen):
         id = self["config"].getCurrentIndex()
         del config.plugins.CurlyTx.pages[id]
 
         id = self["config"].getCurrentIndex()
         del config.plugins.CurlyTx.pages[id]
 

+        config.plugins.CurlyTx.pages.save()
+

         self["config"].setList(self.getConfigList())
 
     def newPage(self):
         self["config"].setList(self.getConfigList())
 
     def newPage(self):


@@ -86,13 +89,21 @@ class CurlyTxSettings(ConfigListScreen, Screen):
         if new:
             num = len(config.plugins.CurlyTx.pages)
             config.plugins.CurlyTx.pages.append(page)
         if new:
             num = len(config.plugins.CurlyTx.pages)
             config.plugins.CurlyTx.pages.append(page)

+            #FIXME: save

 
         config.plugins.CurlyTx.pages[num].save()
 
         config.plugins.CurlyTx.pages[num].save()

-        config.plugins.CurlyTx.pages.save()

 
         self["config"].setList(self.getConfigList())
 
 
 
         self["config"].setList(self.getConfigList())
 
 

+    def keySave(self):
+        config.plugins.CurlyTx.pages.save()
+        ConfigListScreen.keySave(self)
+
+    def abort(self):
+        pass
+
+

 
 class CurlyTxPageEdit(Screen, ConfigListScreen):
     def __init__(self, session, page, new = False):
 
 class CurlyTxPageEdit(Screen, ConfigListScreen):
     def __init__(self, session, page, new = False):

diff --git a/src/config.py b/src/config.py
index 9a98357d48fa7066300805ddfa4af0c9fd6e3d5b..81f7d5cd1aefd55d933fed31afb716400dad09c0 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -1,19 +1,5 @@
 from Components.config import config, ConfigYesNo, ConfigSelection, ConfigNumber, ConfigText, ConfigSubsection, ConfigSubList
 
 from Components.config import config, ConfigYesNo, ConfigSelection, ConfigNumber, ConfigText, ConfigSubsection, ConfigSubList
 

-#configuration setup
-config.plugins.CurlyTx = ConfigSubsection()
-config.plugins.CurlyTx.menuMain = ConfigYesNo(default = True)
-config.plugins.CurlyTx.menuTitle = ConfigText(default = "CurlyTx")
-config.plugins.CurlyTx.pages = ConfigSubList()
-#i = 0
-#while i < len(config.plugins.CurlyTx.pages):
-#    config.plugins.CurlyTx.pages.append(createPage)
-#    i += 1
-#    del s
-#del i
-#config.plugins.CurlyTx.defaultPage = ConfigNumber(default=0)
-
-

 def createPage():
     s = ConfigSubsection()
     s.uri   = ConfigText(default="http://", fixed_size=False)
 def createPage():
     s = ConfigSubsection()
     s.uri   = ConfigText(default="http://", fixed_size=False)


@@ -22,3 +8,15 @@ def createPage():
         fixed_size = False
         )
     return s
         fixed_size = False
         )
     return s

+
+#configuration setup
+config.plugins.CurlyTx = ConfigSubsection()
+config.plugins.CurlyTx.menuMain = ConfigYesNo(default = True)
+config.plugins.CurlyTx.menuTitle = ConfigText(default = "CurlyTx")
+config.plugins.CurlyTx.pageCount = ConfigNumber(default = 0)
+config.plugins.CurlyTx.pages = ConfigSubList()
+
+for id,value in config.plugins.CurlyTx.pages.stored_values.iteritems():
+    config.plugins.CurlyTx.pages.append(createPage())
+
+#config.plugins.CurlyTx.defaultPage = ConfigNumber(default=0)