default page configuration option

diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py
index e0408f27d38a18b175839bee9f57b5ad40554afe..583d9cd7669f1b4867e72aadeb2436bfbb9bf5c8 100644 (file)
--- a/src/CurlyTxSettings.py
+++ b/src/CurlyTxSettings.py
@@ -4,7 +4,7 @@ from Components.Sources.StaticText import StaticText
 
 from . import config
 from config import createPage
 
 from . import config
 from config import createPage

-from Components.config import config, getConfigListEntry
+from Components.config import config, getConfigListEntry, ConfigSelection

 from Components.ConfigList import ConfigList, ConfigListScreen
 
 class CurlyTxSettings(ConfigListScreen, Screen):
 from Components.ConfigList import ConfigList, ConfigListScreen
 
 class CurlyTxSettings(ConfigListScreen, Screen):


@@ -45,10 +45,17 @@ class CurlyTxSettings(ConfigListScreen, Screen):
         self.onClose.append(self.abort)
 
     def getConfigList(self):
         self.onClose.append(self.abort)
 
     def getConfigList(self):

+        #reload titles
+        config.plugins.CurlyTx.defaultPage = ConfigSelection(
+            [
+                (x, x.title.value) for x in config.plugins.CurlyTx.pages]
+            )
+

         list = [
             getConfigListEntry(_("Page:") + " " + x.title.value, x.uri)
                 for x in config.plugins.CurlyTx.pages
             ]
         list = [
             getConfigListEntry(_("Page:") + " " + x.title.value, x.uri)
                 for x in config.plugins.CurlyTx.pages
             ]

+        list.append(getConfigListEntry(_("Default page"), config.plugins.CurlyTx.defaultPage))

         list.append(getConfigListEntry(_("Show in main menu"), config.plugins.CurlyTx.menuMain))
         list.append(getConfigListEntry(_("Menu title"), config.plugins.CurlyTx.menuTitle))
         return list
         list.append(getConfigListEntry(_("Show in main menu"), config.plugins.CurlyTx.menuMain))
         list.append(getConfigListEntry(_("Menu title"), config.plugins.CurlyTx.menuTitle))
         return list


@@ -65,7 +72,7 @@ class CurlyTxSettings(ConfigListScreen, Screen):
             self.deletePageConfirm,
             MessageBox,
             _("Really delete this page?\nIt cannot be recovered!")
             self.deletePageConfirm,
             MessageBox,
             _("Really delete this page?\nIt cannot be recovered!")

-        )
+            )

 
     def deletePageConfirm(self, result):
         if not result:
 
     def deletePageConfirm(self, result):
         if not result:


@@ -88,7 +95,7 @@ class CurlyTxSettings(ConfigListScreen, Screen):
             self.session.openWithCallback(
                 self.pageEdited, CurlyTxPageEdit,
                 config.plugins.CurlyTx.pages[id], False
             self.session.openWithCallback(
                 self.pageEdited, CurlyTxPageEdit,
                 config.plugins.CurlyTx.pages[id], False

-            )
+                )

 
     def pageEdited(self, page, new):
         if not page:
 
     def pageEdited(self, page, new):
         if not page:

diff --git a/src/config.py b/src/config.py
index 81f7d5cd1aefd55d933fed31afb716400dad09c0..75054b0a980f5b298e8340811be5489dbc14cda9 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -13,10 +13,10 @@ def createPage():
 config.plugins.CurlyTx = ConfigSubsection()
 config.plugins.CurlyTx.menuMain = ConfigYesNo(default = True)
 config.plugins.CurlyTx.menuTitle = ConfigText(default = "CurlyTx")
 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.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)
+config.plugins.CurlyTx.defaultPage = ConfigSelection(
+    [(x, x.title.value) for x in config.plugins.CurlyTx.pages])