diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2011-11-23 06:44:38 +0100 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2011-11-23 06:44:38 +0100 |
| commit | d8683e34bef971a36bb56e81af8f13d19c53ebf2 (patch) | |
| tree | 3a2b45c64f0a3c3b1e45b07fecdba67b54460c9a /src | |
| parent | c4b6d0e3754a1a083b8fd8118a92f5a39d802484 (diff) | |
| download | enigma2-curlytx-d8683e34bef971a36bb56e81af8f13d19c53ebf2.tar.gz enigma2-curlytx-d8683e34bef971a36bb56e81af8f13d19c53ebf2.zip | |
make code more readable
Diffstat (limited to 'src')
| -rw-r--r-- | src/CurlyTx.py | 11 | ||||
| -rw-r--r-- | src/CurlyTxSettings.py | 15 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/CurlyTx.py b/src/CurlyTx.py index 2fc9535..09d9ad1 100644 --- a/src/CurlyTx.py +++ b/src/CurlyTx.py @@ -142,24 +142,25 @@ class CurlyTx(Screen,HelpableScreen): self.loadNoPage() return - pageCount = len(config.plugins.CurlyTx.pages) + cfg = config.plugins.CurlyTx + pageCount = len(cfg.pages) 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 - 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 - self.currentFontSize = config.plugins.CurlyTx.pages[pageId].fontSize.value + self.currentFontSize = cfg.pages[pageId].fontSize.value self.setTitle(title) self.setTextFont() diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py index 587f03d..bd6dc1c 100644 --- a/src/CurlyTxSettings.py +++ b/src/CurlyTxSettings.py @@ -53,17 +53,18 @@ class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen): def getConfigList(self): #reload titles loadDefaultPageOptions() + cfg = config.plugins.CurlyTx 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): |