make code more readable

diff --git a/src/CurlyTx.py b/src/CurlyTx.py
index 2fc9535ba3e538e337ca2f2a86388aa5bf5c8c1f..09d9ad13970782a172df481927ce3e42f1fdbfcd 100644 (file)
--- a/src/CurlyTx.py
+++ b/src/CurlyTx.py
@@ -142,24 +142,25 @@ class CurlyTx(Screen,HelpableScreen):
             self.loadNoPage()
             return
 
             self.loadNoPage()
             return
 

-        pageCount = len(config.plugins.CurlyTx.pages)
+        cfg = config.plugins.CurlyTx
+        pageCount = len(cfg.pages)

         pageId = int(pageId)
         if pageId > (pageCount - 1):
         pageId = int(pageId)
         if pageId > (pageCount - 1):

-            if len(config.plugins.CurlyTx.pages) == 0:
+            if len(cfg.pages) == 0:

                 self.loadNoPage()
             else:
                 self["text"].setText("Invalid page " + pageId);
             return
 
                 self.loadNoPage()
             else:
                 self["text"].setText("Invalid page " + pageId);
             return
 

-        url   = config.plugins.CurlyTx.pages[pageId].uri.value
-        title = config.plugins.CurlyTx.pages[pageId].title.value
+        url   = cfg.pages[pageId].uri.value
+        title = cfg.pages[pageId].title.value

 
         if pageCount > 1:
             title = "{0} [{1}/{2}]".format(title, pageId + 1, pageCount)
 
         self.currentPage = pageId
         self.currentUrl = url
 
         if pageCount > 1:
             title = "{0} [{1}/{2}]".format(title, pageId + 1, pageCount)
 
         self.currentPage = pageId
         self.currentUrl = url

-        self.currentFontSize = config.plugins.CurlyTx.pages[pageId].fontSize.value
+        self.currentFontSize = cfg.pages[pageId].fontSize.value

 
         self.setTitle(title)
         self.setTextFont()
 
         self.setTitle(title)
         self.setTextFont()

diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py
index 587f03d60e7fc3a3b9dd3f8939c23f9d2104bd74..bd6dc1c44f2537b953309add2a5c34de7756fe99 100644 (file)
--- a/src/CurlyTxSettings.py
+++ b/src/CurlyTxSettings.py
@@ -53,17 +53,18 @@ class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen):
     def getConfigList(self):
         #reload titles
         loadDefaultPageOptions()
     def getConfigList(self):
         #reload titles
         loadDefaultPageOptions()

+        cfg = config.plugins.CurlyTx

 
         list = [
             getConfigListEntry(_("Page:") + " " + x.title.value, x.uri)
 
         list = [
             getConfigListEntry(_("Page:") + " " + x.title.value, x.uri)

-                for x in config.plugins.CurlyTx.pages
+                for x in cfg.pages

             ]
             ]

-        if len(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(_("Show in extensions menu"), config.plugins.CurlyTx.menuExtensions))
-        list.append(getConfigListEntry(_("Menu title"), config.plugins.CurlyTx.menuTitle))
-        list.append(getConfigListEntry(_("Page feed URL"), config.plugins.CurlyTx.feedUrl))
+        if len(cfg.pages):
+            list.append(getConfigListEntry(_("Default page"), cfg.defaultPage))
+        list.append(getConfigListEntry(_("Show in main menu"), cfg.menuMain))
+        list.append(getConfigListEntry(_("Show in extensions menu"), cfg.menuExtensions))
+        list.append(getConfigListEntry(_("Menu title"), cfg.menuTitle))
+        list.append(getConfigListEntry(_("Page feed URL"), cfg.feedUrl))

         return list
 
     def loadHelp(self):
         return list
 
     def loadHelp(self):