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_140_move_WirelessLan_and__NetworkWizard_to_Enigma2' into experimental
[enigma2.git]
/
lib
/
python
/
Plugins
/
SystemPlugins
/
OldSoftwareUpdate
/
plugin.py
diff --git
a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
index 51a3fb399e88fa4827531f30feb2f2aec4ad3f68..c72163820b97cb7050ecb12831385a81102af8c0 100644
(file)
--- a/
lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
+++ b/
lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
@@
-1,16
+1,12
@@
-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 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.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
from Plugins.Plugin import PluginDescriptor
-import os
+from os import popen
class Upgrade(Screen):
skin = """
class Upgrade(Screen):
skin = """
@@
-34,7
+30,7
@@
class Upgrade(Screen):
self.update = True
self.delayTimer = eTimer()
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:
def go(self):
if self.update:
@@
-43,7
+39,7
@@
class Upgrade(Screen):
self.close()
def doUpdateDelay(self):
self.close()
def doUpdateDelay(self):
- lines =
os.
popen("ipkg update && ipkg upgrade -force-defaults -force-overwrite", "r").readlines()
+ lines = popen("ipkg update && ipkg upgrade -force-defaults -force-overwrite", "r").readlines()
string = ""
for x in lines:
string += x
string = ""
for x in lines:
string += x
@@
-58,15
+54,6
@@
class Upgrade(Screen):
else:
self.close()
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 ]
def PacketEntryComponent(packet):
res = [ packet ]
@@
-122,13
+109,13
@@
class Ipkg(Screen):
def fillPacketList(self):
def fillPacketList(self):
- lines =
os.
popen("ipkg list", "r").readlines()
+ lines = popen("ipkg list", "r").readlines()
packetlist = []
for x in lines:
split = x.split(' - ')
packetlist.append([split[0].strip(), split[1].strip()])
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("ipkg list_installed", "r").readlines()
installedlist = {}
for x in lines:
installedlist = {}
for x in lines:
@@
-151,7
+138,7
@@
class Ipkg(Screen):
self.close()
def doUpdateDelay(self):
self.close()
def doUpdateDelay(self):
- lines =
os.
popen("ipkg update && ipkg upgrade", "r").readlines()
+ lines = popen("ipkg update && ipkg upgrade", "r").readlines()
string = ""
for x in lines:
string += x
string = ""
for x in lines:
string += x
@@
-166,12
+153,12
@@
class Ipkg(Screen):
else:
self.close()
else:
self.close()
-def UpgradeMain(session):
+def UpgradeMain(session
, **kwargs
):
session.open(Upgrade)
session.open(Upgrade)
-def IpkgMain(session):
+def IpkgMain(session
, **kwargs
):
session.open(Ipkg)
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),
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="IPKG", description="IPKG fro
n
tend", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=IpkgMain)]