git.cweiske.de
/
enigma2-curlytx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3b9f976
)
fix many crashes when dealing with changed page settings
author
Christian Weiske
<cweiske@cweiske.de>
Thu, 17 Nov 2011 22:03:26 +0000
(23:03 +0100)
committer
Christian Weiske
<cweiske@cweiske.de>
Thu, 17 Nov 2011 22:03:26 +0000
(23:03 +0100)
src/CurlyTx.py
patch
|
blob
|
history
diff --git
a/src/CurlyTx.py
b/src/CurlyTx.py
index 6da35c6b1b74519f1a685afea7e2752b7026fb52..e8cde92dd15c851285b5a7cb84e4dc058f977545 100644
(file)
--- a/
src/CurlyTx.py
+++ b/
src/CurlyTx.py
@@
-60,25
+60,38
@@
class CurlyTx(Screen):
self["text"].pageDown()
def prevPage(self):
self["text"].pageDown()
def prevPage(self):
+ if self.currentPage == None:
+ return
+
pageId = self.currentPage - 1
if pageId < 0:
pageId = len(config.plugins.CurlyTx.pages) - 1
self.loadUrl(pageId)
def nextPage(self):
pageId = self.currentPage - 1
if pageId < 0:
pageId = len(config.plugins.CurlyTx.pages) - 1
self.loadUrl(pageId)
def nextPage(self):
+ if self.currentPage == None:
+ return
+
pageId = self.currentPage + 1
if pageId > len(config.plugins.CurlyTx.pages) - 1:
pageId = 0
self.loadUrl(pageId)
def reload(self):
pageId = self.currentPage + 1
if pageId > len(config.plugins.CurlyTx.pages) - 1:
pageId = 0
self.loadUrl(pageId)
def reload(self):
+ if self.currentPage == None:
+ return
+
self.loadUrl(self.currentPage)
def loadUrl(self, pageId):
self.loadUrl(self.currentPage)
def loadUrl(self, pageId):
+ if pageId == None:
+ self.loadNoPage()
+ return
+
pageId = int(pageId)
if pageId > (len(config.plugins.CurlyTx.pages) - 1):
if len(config.plugins.CurlyTx.pages) == 0:
pageId = int(pageId)
if pageId > (len(config.plugins.CurlyTx.pages) - 1):
if len(config.plugins.CurlyTx.pages) == 0:
- self
["text"].setText("Go and add a page in the settings");
+ self
.loadNoPage()
else:
self["text"].setText("Invalid page " + pageId);
return
else:
self["text"].setText("Invalid page " + pageId);
return
@@
-102,10
+115,17
@@
class CurlyTx(Screen):
+ "\n\nURL: " + url
)
+ "\n\nURL: " + url
)
+ def loadNoPage(self):
+ self["text"].setText("Go and add a page in the settings");
+
def showSettings(self):
def showSettings(self):
- #self.session.openWithCallback(self.setConf ,Pic_Setup)
from CurlyTxSettings import CurlyTxSettings
self.session.openWithCallback(self.onSettingsChanged, CurlyTxSettings)
def onSettingsChanged(self):
from CurlyTxSettings import CurlyTxSettings
self.session.openWithCallback(self.onSettingsChanged, CurlyTxSettings)
def onSettingsChanged(self):
- "fixme"
+ if len(config.plugins.CurlyTx.pages) == 0:
+ self.currentPage = None
+ self.loadUrl(self.currentPage)
+ elif self.currentPage == None:
+ self.currentPage = 0
+ self.loadUrl(self.currentPage)