git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_387_small_spinner_fix'
[enigma2.git]
/
lib
/
python
/
Screens
/
Satconfig.py
diff --git
a/lib/python/Screens/Satconfig.py
b/lib/python/Screens/Satconfig.py
index d5249b99941512c0e27370b625b27e51b315b326..156f778014f0c81dfb56b3019512eb8bf455df45 100644
(file)
--- a/
lib/python/Screens/Satconfig.py
+++ b/
lib/python/Screens/Satconfig.py
@@
-10,11
+10,12
@@
from Components.config import getConfigListEntry, config, ConfigNothing, ConfigS
from Components.Sources.List import List
from Screens.MessageBox import MessageBox
from Screens.ChoiceBox import ChoiceBox
from Components.Sources.List import List
from Screens.MessageBox import MessageBox
from Screens.ChoiceBox import ChoiceBox
+from Screens.ServiceStopScreen import ServiceStopScreen
from time import mktime, localtime
from datetime import datetime
from time import mktime, localtime
from datetime import datetime
-class NimSetup(Screen, ConfigListScreen):
+class NimSetup(Screen, ConfigListScreen
, ServiceStopScreen
):
def createSimpleSetup(self, list, mode):
nim = self.nimConfig
if mode == "single":
def createSimpleSetup(self, list, mode):
nim = self.nimConfig
if mode == "single":
@@
-346,6
+347,7
@@
class NimSetup(Screen, ConfigListScreen):
new_configured_sats = nimmanager.getConfiguredSats()
self.unconfed_sats = old_configured_sats - new_configured_sats
self.satpos_to_remove = None
new_configured_sats = nimmanager.getConfiguredSats()
self.unconfed_sats = old_configured_sats - new_configured_sats
self.satpos_to_remove = None
+ self.restoreService(_("Zap back to service before tuner setup?"))
self.deleteConfirmed((None, "no"))
def deleteConfirmed(self, confirmed):
self.deleteConfirmed((None, "no"))
def deleteConfirmed(self, confirmed):
@@
-375,12
+377,13
@@
class NimSetup(Screen, ConfigListScreen):
if confirmed[1] == "yestoall" or confirmed[1] == "notoall":
self.deleteConfirmed(confirmed)
break
if confirmed[1] == "yestoall" or confirmed[1] == "notoall":
self.deleteConfirmed(confirmed)
break
- if not self.satpos_to_remove:
- self.close()
def __init__(self, session, slotid):
Screen.__init__(self, session)
self.list = [ ]
def __init__(self, session, slotid):
Screen.__init__(self, session)
self.list = [ ]
+
+ ServiceStopScreen.__init__(self)
+ self.stopService()
ConfigListScreen.__init__(self, self.list)
ConfigListScreen.__init__(self, self.list)
@@
-405,6
+408,12
@@
class NimSetup(Screen, ConfigListScreen):
ConfigListScreen.keyRight(self)
self.newConfig()
ConfigListScreen.keyRight(self)
self.newConfig()
+ def keyCancel(self):
+ if self["config"].isChanged():
+ self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?"))
+ else:
+ self.restoreService(_("Zap back to service before tuner setup?"))
+
def saveAll(self):
if self.nim.isCompatible("DVB-S"):
# reset connectedTo to all choices to properly store the default value
def saveAll(self):
if self.nim.isCompatible("DVB-S"):
# reset connectedTo to all choices to properly store the default value
@@
-424,7
+433,7
@@
class NimSetup(Screen, ConfigListScreen):
x[1].cancel()
# we need to call saveAll to reset the connectedTo choices
self.saveAll()
x[1].cancel()
# we need to call saveAll to reset the connectedTo choices
self.saveAll()
- self.
close(
)
+ self.
restoreService(_("Zap back to service before tuner setup?")
)
def nothingConnectedShortcut(self):
if type(self["config"].getCurrent()[1]) is ConfigSatlist:
def nothingConnectedShortcut(self):
if type(self["config"].getCurrent()[1]) is ConfigSatlist: