X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FOldSoftwareUpdate%2Fplugin.py;h=8f9757f2ba3c47e3104ab9d06a65fdeb54f8f3b3;hp=51a3fb399e88fa4827531f30feb2f2aec4ad3f68;hb=841bc3b1be82929ebed8d18ea16c08690aa3c42e;hpb=f677fd9a66325bcc27a97b5fca55f34d83cfbac9

diff --git a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
old mode 100644
new mode 100755
index 51a3fb3..8f9757f
--- a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
@@ -1,20 +1,16 @@
-from enigma import *
+from enigma import RT_HALIGN_LEFT, RT_VALIGN_CENTER, eListboxPythonMultiContent, eListbox, eTimer, gFont
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
-from Components.ActionMap import ActionMap, NumberActionMap
+from Components.ActionMap import ActionMap
 from Components.ScrollLabel import ScrollLabel
-from Components.Label import Label
-from Components.GUIComponent import *
-from Components.MenuList import MenuList
-from Components.Input import Input
-from Screens.Console import Console
+from Components.GUIComponent import GUIComponent
 from Plugins.Plugin import PluginDescriptor
 
-import os
+from os import popen
 
 class Upgrade(Screen):
 	skin = """
-		<screen position="100,100" size="550,400" title="IPKG upgrade..." >
+		<screen position="100,100" size="550,400" title="opkg upgrade..." >
 			<widget name="text" position="0,0" size="550,400" font="Regular;15" />
 		</screen>"""
 		
@@ -34,16 +30,16 @@ class Upgrade(Screen):
 		
 		self.update = True
 		self.delayTimer = eTimer()
-		self.delayTimer.timeout.get().append(self.doUpdateDelay)
+		self.delayTimer.callback.append(self.doUpdateDelay)
 		
 	def go(self):
 		if self.update:
-			self.session.openWithCallback(self.doUpdate, MessageBox, _("Do you want to update your Dreambox?\nAfter pressing OK, please wait!"))		
+			self.session.openWithCallback(self.doUpdate, MessageBox, _("Do you want to update your STB?\nAfter pressing OK, please wait!"))		
 		else:
 			self.close()
 	
 	def doUpdateDelay(self):
-		lines = os.popen("ipkg update && ipkg upgrade -force-defaults -force-overwrite", "r").readlines()
+		lines = popen("opkg update && opkg upgrade -force-defaults -force-overwrite", "r").readlines()
 		string = ""
 		for x in lines:
 			string += x
@@ -58,15 +54,6 @@ class Upgrade(Screen):
 		else:
 			self.close()
 
-RT_HALIGN_LEFT = 0
-RT_HALIGN_RIGHT = 1
-RT_HALIGN_CENTER = 2
-RT_HALIGN_BLOCK = 4
-
-RT_VALIGN_TOP = 0
-RT_VALIGN_CENTER = 8
-RT_VALIGN_BOTTOM = 16
-
 def PacketEntryComponent(packet):
 	res = [ packet ]
 	
@@ -100,7 +87,7 @@ class PacketList(GUIComponent):
 
 class Ipkg(Screen):
 	skin = """
-		<screen position="100,100" size="550,400" title="IPKG upgrade..." >
+		<screen position="100,100" size="550,400" title="opkg upgrade..." >
 			<widget name="list" position="0,0" size="550,400" scrollbarMode="showOnDemand" />
 		</screen>"""
 		
@@ -122,13 +109,13 @@ class Ipkg(Screen):
 		
 
 	def fillPacketList(self):
-		lines = os.popen("ipkg list", "r").readlines()
+		lines = popen("opkg list", "r").readlines()
 		packetlist = []
 		for x in lines:
 			split = x.split(' - ')
 			packetlist.append([split[0].strip(), split[1].strip()])
 		
-		lines = os.popen("ipkg list_installed", "r").readlines()
+		lines = popen("opkg list_installed", "r").readlines()
 		
 		installedlist = {}
 		for x in lines:
@@ -146,12 +133,12 @@ class Ipkg(Screen):
 		
 	def go(self):
 		if self.update:
-			self.session.openWithCallback(self.doUpdate, MessageBox, _("Do you want to update your Dreambox?\nAfter pressing OK, please wait!"))		
+			self.session.openWithCallback(self.doUpdate, MessageBox, _("Do you want to update your STB?\nAfter pressing OK, please wait!"))		
 		else:
 			self.close()
 	
 	def doUpdateDelay(self):
-		lines = os.popen("ipkg update && ipkg upgrade", "r").readlines()
+		lines = popen("opkg update && opkg upgrade", "r").readlines()
 		string = ""
 		for x in lines:
 			string += x
@@ -166,12 +153,12 @@ class Ipkg(Screen):
 		else:
 			self.close()
 
-def UpgradeMain(session):
+def UpgradeMain(session, **kwargs):
 	session.open(Upgrade)
 
-def IpkgMain(session):
+def IpkgMain(session, **kwargs):
 	session.open(Ipkg)
 
-def Plugins():
+def Plugins(**kwargs):
 	return [PluginDescriptor(name="Old Softwareupdate", description="Updates your receiver's software", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=UpgradeMain),
-			PluginDescriptor(name="IPKG", description="IPKG frotend", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=IpkgMain)]
+			PluginDescriptor(name="opkg", description="opkg frontend", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=IpkgMain)]