git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 'layers' (in buffered mode, which is not working at the moment).
[enigma2.git]
/
lib
/
python
/
Screens
/
MessageBox.py
diff --git
a/lib/python/Screens/MessageBox.py
b/lib/python/Screens/MessageBox.py
index 0133de2a5038e1ebc9086b63375c6a541b901f6a..df2766702da77c5b491c719e3801a766de280cee 100644
(file)
--- a/
lib/python/Screens/MessageBox.py
+++ b/
lib/python/Screens/MessageBox.py
@@
-10,16
+10,16
@@
class MessageBox(Screen):
TYPE_INFO = 1
TYPE_WARNING = 2
TYPE_ERROR = 3
TYPE_INFO = 1
TYPE_WARNING = 2
TYPE_ERROR = 3
-
- def __init__(self, session, text, type = TYPE_YESNO, timeout = -1, close_on_any_key = False):
+
+ def __init__(self, session, text, type = TYPE_YESNO, timeout = -1, close_on_any_key = False
, default = True
):
self.type = type
Screen.__init__(self, session)
self.type = type
Screen.__init__(self, session)
-
+
self["text"] = Label(text)
self["text"] = Label(text)
-
+
self.text = text
self.close_on_any_key = close_on_any_key
self.text = text
self.close_on_any_key = close_on_any_key
-
+
self["ErrorPixmap"] = Pixmap()
self["QuestionPixmap"] = Pixmap()
self["InfoPixmap"] = Pixmap()
self["ErrorPixmap"] = Pixmap()
self["QuestionPixmap"] = Pixmap()
self["InfoPixmap"] = Pixmap()
@@
-33,12
+33,15
@@
class MessageBox(Screen):
self["QuestionPixmap"].hide()
if type != self.TYPE_INFO:
self["InfoPixmap"].hide()
self["QuestionPixmap"].hide()
if type != self.TYPE_INFO:
self["InfoPixmap"].hide()
-
+
if type == self.TYPE_YESNO:
if type == self.TYPE_YESNO:
- self.list = [ (_("yes"), 0), (_("no"), 1) ]
+ if default == True:
+ self.list = [ (_("yes"), 0), (_("no"), 1) ]
+ else:
+ self.list = [ (_("no"), 1), (_("yes"), 0) ]
self["list"] = MenuList(self.list)
self["list"] = MenuList(self.list)
-
+
self["actions"] = ActionMap(["MsgBoxActions", "DirectionActions"],
{
"cancel": self.cancel,
self["actions"] = ActionMap(["MsgBoxActions", "DirectionActions"],
{
"cancel": self.cancel,
@@
-96,10
+99,10
@@
class MessageBox(Screen):
def timeoutCallback(self):
print "Timeout!"
self.ok()
def timeoutCallback(self):
print "Timeout!"
self.ok()
-
+
def cancel(self):
self.close(False)
def cancel(self):
self.close(False)
-
+
def ok(self):
if self.type == self.TYPE_YESNO:
self.close(self["list"].getCurrent()[1] == 0)
def ok(self):
if self.type == self.TYPE_YESNO:
self.close(self["list"].getCurrent()[1] == 0)
@@
-111,13
+114,13
@@
class MessageBox(Screen):
def up(self):
self.move(self["list"].instance.moveUp)
def up(self):
self.move(self["list"].instance.moveUp)
-
+
def down(self):
self.move(self["list"].instance.moveDown)
def left(self):
self.move(self["list"].instance.pageUp)
def down(self):
self.move(self["list"].instance.moveDown)
def left(self):
self.move(self["list"].instance.pageUp)
-
+
def right(self):
self.move(self["list"].instance.pageDown)
def right(self):
self.move(self["list"].instance.pageDown)