git.cweiske.de
/
enigma2-curlytx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I finally found a way to restore the old page settings when the user aborts the setti...
[enigma2-curlytx.git]
/
src
/
CurlyTxSettings.py
diff --git
a/src/CurlyTxSettings.py
b/src/CurlyTxSettings.py
index bd6dc1c44f2537b953309add2a5c34de7756fe99..18e43c9c2f85efbbda967603d72e5f9e84b94b9a 100644
(file)
--- a/
src/CurlyTxSettings.py
+++ b/
src/CurlyTxSettings.py
@@
-77,6
+77,9
@@
class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen):
self.helpList.append((
self["actions"], "SetupActions",
[("ok", _("Edit selected page"))]))
self.helpList.append((
self["actions"], "SetupActions",
[("ok", _("Edit selected page"))]))
+ self.helpList.append((
+ self["actions"], "SetupActions",
+ [("ok", _("Load pages from feed"))]))
self.helpList.append((
self["actions"], "ColorActions",
[("yellow", _("Add new page"))]))
self.helpList.append((
self["actions"], "ColorActions",
[("yellow", _("Add new page"))]))
@@
-142,13
+145,13
@@
class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen):
return
del config.plugins.CurlyTx.pages[:]
return
del config.plugins.CurlyTx.pages[:]
- config.plugins.CurlyTx.pages.save()
- print("CurlyTx", len(config.plugins.CurlyTx.pages))
+
for pageData in pages:
page = createPage()
for pageData in pages:
page = createPage()
- page.title.value = pageData["title"]
- page.uri.value = pageData["url"]
config.plugins.CurlyTx.pages.append(page)
config.plugins.CurlyTx.pages.append(page)
+ page.title.setValue(pageData["title"])
+ page.uri.setValue(pageData["url"])
+
self["config"].setList(self.getConfigList())
def keySave(self):
self["config"].setList(self.getConfigList())
def keySave(self):
@@
-159,7
+162,11
@@
class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen):
ConfigListScreen.keySave(self)
def abort(self):
ConfigListScreen.keySave(self)
def abort(self):
- pass
+ #restore old page configuration
+ cfg = config.plugins.CurlyTx
+ del cfg.pages[:]
+ for i in cfg.pages.stored_values:
+ cfg.pages.append(createPage())