X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bae4b8c8df551c8a32ce9611ad1691ccb405791a..2a885ae564bd51910fac4cb2f134c7349019df68:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index a6d84489..bd97948f 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -1,9 +1,11 @@
+from enigma import eDVBDB
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.ConfigList import ConfigListScreen
 from Components.MenuList import MenuList
 from Components.NimManager import nimmanager
 from Components.config import getConfigListEntry, config, ConfigNothing
+from Screens.MessageBox import MessageBox
 
 from time import mktime, localtime
 from datetime import datetime
@@ -139,7 +141,7 @@ class NimSetup(Screen, ConfigListScreen):
 	def run(self):
 		if self.have_advanced and self.nim.config_mode == "advanced":
 			self.fillAdvancedList()
-		for x in self["config"].list:
+		for x in self.list:
 			if x in [self.turnFastEpochBegin, self.turnFastEpochEnd]:
 				# workaround for storing only hour*3600+min*60 value in configfile
 				# not really needed.. just for cosmetics..
@@ -147,7 +149,37 @@ class NimSetup(Screen, ConfigListScreen):
 				dt = datetime(1970, 1, 1, tm.tm_hour, tm.tm_min)
 				x[1].value = int(mktime(dt.timetuple()))
 			x[1].save()
+
+		old_configured_sats = nimmanager.getConfiguredSats()
 		nimmanager.sec.update()
+		new_configured_sats = nimmanager.getConfiguredSats()
+		self.unconfed_sats = old_configured_sats - new_configured_sats
+		self.satpos_to_remove = None
+		self.deleteConfirmed(False)
+
+	def deleteConfirmed(self, confirmed):
+		if confirmed:
+			eDVBDB.getInstance().removeServices(-1, -1, -1, self.satpos_to_remove)
+
+		if self.satpos_to_remove is not None:
+			self.unconfed_sats.remove(self.satpos_to_remove)
+
+		self.satpos_to_remove = None
+		for orbpos in self.unconfed_sats:
+			self.satpos_to_remove = orbpos
+			orbpos = self.satpos_to_remove
+			try:
+				# why we need this cast?
+				sat_name = str(nimmanager.getSatDescription(orbpos))
+			except:
+				if orbpos > 1800: # west
+					orbpos = 3600 - orbpos
+					h = _("W")
+				else:
+					h = _("E")
+				sat_name = ("%d.%d" + h) % (orbpos / 10, orbpos % 10)
+			self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Delete no more configured satellite\n%s?") %(sat_name))
+			break
 
 	def fillListWithAdvancedSatEntrys(self, Sat):
 		currLnb = self.nimConfig.advanced.lnb[int(Sat.lnb.value)]