git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
activate language when used in standalone screen
[enigma2.git]
/
lib
/
python
/
Screens
/
Satconfig.py
diff --git
a/lib/python/Screens/Satconfig.py
b/lib/python/Screens/Satconfig.py
index c1a6d5b7ec0b9edfd10aef4c8daac587dd1f0f77..f2cdaaceabbf1a2f6c2b8393c152096a1e1fb321 100644
(file)
--- a/
lib/python/Screens/Satconfig.py
+++ b/
lib/python/Screens/Satconfig.py
@@
-44,7
+44,8
@@
class NimSetup(Screen):
if (config.Nims[self.nim.slotid].diseqcMode.value == 4):
self.createPositionerSetup(self.nim, self.list)
elif config.Nims[self.nim.slotid].configMode.value == 1: # linked tuner
if (config.Nims[self.nim.slotid].diseqcMode.value == 4):
self.createPositionerSetup(self.nim, self.list)
elif config.Nims[self.nim.slotid].configMode.value == 1: # linked tuner
- self.list.append(getConfigListEntry(_("Linked to"), config.Nims[self.nim.slotid].linkedTo))
+ #self.list.append(getConfigListEntry(_("Linked to"), config.Nims[self.nim.slotid].linkedTo))
+ pass
elif config.Nims[self.nim.slotid].configMode.value == 2: # advanced mode
print "FIXME: implement advanced mode"
elif config.Nims[self.nim.slotid].configMode.value == 2: # advanced mode
print "FIXME: implement advanced mode"
@@
-64,12
+65,20
@@
class NimSetup(Screen):
self.createSetup()
def keyLeft(self):
self.createSetup()
def keyLeft(self):
+ if self["config"].getCurrent()[0] == _("Configmode"):
+ if self.nim.slotid == 0:
+ return
self["config"].handleKey(config.key["prevElement"])
self.newConfig()
def keyRight(self):
#forbid to enable advanced mode until its ready
self["config"].handleKey(config.key["prevElement"])
self.newConfig()
def keyRight(self):
#forbid to enable advanced mode until its ready
- #if self["config"].getCurrent()[0] != _("Configmode"):
+ #perhaps its better to use an own element here
+ #this suckz .. how enable advanced config?
+ if self["config"].getCurrent()[0] == _("Configmode"):
+ if self.nim.slotid == 0:
+ return
+
self["config"].handleKey(config.key["nextElement"])
self.newConfig()
self["config"].handleKey(config.key["nextElement"])
self.newConfig()
@@
-78,10
+87,13
@@
class NimSetup(Screen):
if (self["config"].getCurrent()[1].parent.enabled == True):
self["config"].handleKey(config.key[str(number)])
if (self["config"].getCurrent()[1].parent.enabled == True):
self["config"].handleKey(config.key[str(number)])
- def
keySave
(self):
+ def
run
(self):
for x in self["config"].list:
x[1].save()
nimmanager.sec.update()
for x in self["config"].list:
x[1].save()
nimmanager.sec.update()
+
+ def keySave(self):
+ self.run()
self.close()
def keyCancel(self):
self.close()
def keyCancel(self):
@@
-89,9
+101,10
@@
class NimSetup(Screen):
x[1].cancel()
self.close()
x[1].cancel()
self.close()
- def __init__(self, session,
nim
):
+ def __init__(self, session,
slotid
):
Screen.__init__(self, session)
Screen.__init__(self, session)
- self.nim = nim
+
+ self.nim = nimmanager.nimList()[slotid][1]
self["actions"] = NumberActionMap(["SetupActions"],
{
self["actions"] = NumberActionMap(["SetupActions"],
{
@@
-131,5
+144,5
@@
class NimSelection(Screen):
def okbuttonClick(self):
selection = self["nimlist"].getCurrent()
if selection[1].nimType != -1: #unknown/empty
def okbuttonClick(self):
selection = self["nimlist"].getCurrent()
if selection[1].nimType != -1: #unknown/empty
- self.session.open(NimSetup, selection[1])
+ self.session.open(NimSetup, selection[1]
.slotid
)
\ No newline at end of file
\ No newline at end of file