make default page selection finally work

2 files changed, 13 insertions, 10 deletions

diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py
index 583d9cd..87aeb62 100644
--- a/src/CurlyTxSettings.py
+++ b/src/CurlyTxSettings.py
@@ -3,7 +3,7 @@ from Components.ActionMap import ActionMap, NumberActionMap
 from Components.Sources.StaticText import StaticText
 
 from . import config
-from config import createPage
+from config import createPage, loadDefaultPageOptions
 from Components.config import config, getConfigListEntry, ConfigSelection
 from Components.ConfigList import ConfigList, ConfigListScreen
 
@@ -46,10 +46,7 @@ class CurlyTxSettings(ConfigListScreen, Screen):
 
     def getConfigList(self):
         #reload titles
-        config.plugins.CurlyTx.defaultPage = ConfigSelection(
-            [
-                (x, x.title.value) for x in config.plugins.CurlyTx.pages]
-            )
+        loadDefaultPageOptions()
 
         list = [
             getConfigListEntry(_("Page:") + " " + x.title.value, x.uri)
@@ -143,7 +140,6 @@ class CurlyTxPageEdit(Screen, ConfigListScreen):
 
     def save(self):
         self.close(self.page, self.new)
-        #FIXME: pass page to parent
 
     def keyCancel(self):
         self.close(None, self.new)
diff --git a/src/config.py b/src/config.py
index 75054b0..9cb5ea2 100644
--- a/src/config.py
+++ b/src/config.py
@@ -9,14 +9,21 @@ def createPage():
         )
     return s
 
+def loadDefaultPageOptions():
+    defaults = []
+    for i in range(0, len(config.plugins.CurlyTx.pages)):
+        defaults.append((str(i), config.plugins.CurlyTx.pages[i].title.value))
+    print "CurlyTx", defaults
+    if hasattr(config.plugins.CurlyTx, "defaultPage"):
+        config.plugins.CurlyTx.defaultPage.setChoices(defaults, "0")
+    else:
+        config.plugins.CurlyTx.defaultPage = ConfigSelection(defaults, "0")
+
 #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()
-
 for id,value in config.plugins.CurlyTx.pages.stored_values.iteritems():
     config.plugins.CurlyTx.pages.append(createPage())
-
-config.plugins.CurlyTx.defaultPage = ConfigSelection(
-    [(x, x.title.value) for x in config.plugins.CurlyTx.pages])
+loadDefaultPageOptions()