git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also show SNR in dB in PositionerSetup
[enigma2.git]
/
lib
/
python
/
Plugins
/
SystemPlugins
/
SoftwareUpdate
/
plugin.py
diff --git
a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
index c71ffdbb59ab77015de26c1aab0a6cc6afcb5b05..8127514cbe8d94af86dc7d266d58c6389478d572 100644
(file)
--- a/
lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
+++ b/
lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
@@
-4,7
+4,6
@@
from Components.Input import Input
from Components.Ipkg import IpkgComponent
from Components.Label import Label
from Components.MenuList import MenuList
from Components.Ipkg import IpkgComponent
from Components.Label import Label
from Components.MenuList import MenuList
-from Components.ScrollLabel import ScrollLabel
from Components.Slider import Slider
from Plugins.Plugin import PluginDescriptor
from Screens.Console import Console
from Components.Slider import Slider
from Plugins.Plugin import PluginDescriptor
from Screens.Console import Console
@@
-91,12
+90,16
@@
class IPKGSource(Screen):
self["text"] = Input(sources[0], maxSize=False, type=Input.TEXT)
self["text"] = Input(sources[0], maxSize=False, type=Input.TEXT)
- self["actions"] = NumberActionMap(["WizardActions", "InputActions"],
+ self["actions"] = NumberActionMap(["WizardActions", "InputActions"
, "TextEntryActions", "KeyboardInputActions"
],
{
"ok": self.go,
"back": self.close,
"left": self.keyLeft,
"right": self.keyRight,
{
"ok": self.go,
"back": self.close,
"left": self.keyLeft,
"right": self.keyRight,
+ "home": self.keyHome,
+ "end": self.keyEnd,
+ "deleteForward": self.deleteForward,
+ "deleteBackward": self.deleteBackward,
"1": self.keyNumberGlobal,
"2": self.keyNumberGlobal,
"3": self.keyNumberGlobal,
"1": self.keyNumberGlobal,
"2": self.keyNumberGlobal,
"3": self.keyNumberGlobal,
@@
-121,6
+124,18
@@
class IPKGSource(Screen):
def keyRight(self):
self["text"].right()
def keyRight(self):
self["text"].right()
+ def keyHome(self):
+ self["text"].home()
+
+ def keyEnd(self):
+ self["text"].end()
+
+ def keyDeleteForward(self):
+ self["text"].delete()
+
+ def keyDeleteBackward(self):
+ self["text"].deleteBackward()
+
def keyNumberGlobal(self, number):
print "pressed", number
self["text"].number(number)
def keyNumberGlobal(self, number):
print "pressed", number
self["text"].number(number)
@@
-253,7
+268,7
@@
class UpdatePlugin(Screen):
self.activity = 0
self.activityTimer = eTimer()
self.activity = 0
self.activityTimer = eTimer()
- self.activityTimer.
timeout.get()
.append(self.doActivityTimer)
+ self.activityTimer.
callback
.append(self.doActivityTimer)
self.activityTimer.start(100, False)
self.ipkg = IpkgComponent()
self.activityTimer.start(100, False)
self.ipkg = IpkgComponent()
@@
-291,6
+306,12
@@
class UpdatePlugin(Screen):
elif event == IpkgComponent.EVENT_CONFIGURING:
self.package.setText(param)
self.status.setText(_("Configuring"))
elif event == IpkgComponent.EVENT_CONFIGURING:
self.package.setText(param)
self.status.setText(_("Configuring"))
+ elif event == IpkgComponent.EVENT_MODIFIED:
+ self.session.openWithCallback(
+ self.modificationCallback,
+ MessageBox,
+ _("A configuration file (%s) was modified since Installation.\nDo you want to keep your version?") % (param)
+ )
elif event == IpkgComponent.EVENT_ERROR:
self.error += 1
elif event == IpkgComponent.EVENT_DONE:
elif event == IpkgComponent.EVENT_ERROR:
self.error += 1
elif event == IpkgComponent.EVENT_DONE:
@@
-316,7
+337,10
@@
class UpdatePlugin(Screen):
self.status.setText(_("Error") + " - " + error)
#print event, "-", param
pass
self.status.setText(_("Error") + " - " + error)
#print event, "-", param
pass
-
+
+ def modificationCallback(self, res):
+ self.ipkg.write(res and "N" or "Y")
+
def exit(self):
if not self.ipkg.isRunning():
if self.packages != 0 and self.error == 0:
def exit(self):
if not self.ipkg.isRunning():
if self.packages != 0 and self.error == 0: