git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some parental control improvements (made by Tode)
[enigma2.git]
/
lib
/
python
/
Components
/
config.py
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index d15c232ba1c259cbcac07c97289117bd4bfbfe1c..471b59ec55f5c21396461638ad41db74abe2b02a 100755
(executable)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-1,6
+1,6
@@
from enigma import getPrevAsciiCode
from Tools.NumericalTextInput import NumericalTextInput
from enigma import getPrevAsciiCode
from Tools.NumericalTextInput import NumericalTextInput
-from Tools.Directories import resolveFilename, SCOPE_CONFIG
+from Tools.Directories import resolveFilename, SCOPE_CONFIG
, fileExists
from Components.Harddisk import harddiskmanager
from copy import copy as copy_copy
from os import path as os_path
from Components.Harddisk import harddiskmanager
from copy import copy as copy_copy
from os import path as os_path
@@
-1034,13
+1034,13
@@
class ConfigSelectionNumber(ConfigSelection):
step += stepwidth
ConfigSelection.__init__(self, choices, default)
step += stepwidth
ConfigSelection.__init__(self, choices, default)
-
+
def getValue(self):
def getValue(self):
- return int(
self.text
)
+ return int(
ConfigSelection.getValue(self)
)
def setValue(self, val):
def setValue(self, val):
-
self.text = str(val
)
-
+
ConfigSelection.setValue(self, str(val)
)
+
def handleKey(self, key):
if not self.wraparound:
if key == KEY_RIGHT:
def handleKey(self, key):
if not self.wraparound:
if key == KEY_RIGHT:
@@
-1050,8
+1050,6
@@
class ConfigSelectionNumber(ConfigSelection):
if self.choices.index(self.value) == 0:
return
ConfigSelection.handleKey(self, key)
if self.choices.index(self.value) == 0:
return
ConfigSelection.handleKey(self, key)
-
-
class ConfigNumber(ConfigText):
def __init__(self, default = 0):
class ConfigNumber(ConfigText):
def __init__(self, default = 0):
@@
-1140,6
+1138,9
@@
class ConfigDirectory(ConfigText):
else:
return ConfigText.getMulti(self, selected)
else:
return ConfigText.getMulti(self, selected)
+ def onSelect(self, session):
+ self.allmarked = (self.value != "")
+
# a slider.
class ConfigSlider(ConfigElement):
def __init__(self, default = 0, increment = 1, limits = (0, 100)):
# a slider.
class ConfigSlider(ConfigElement):
def __init__(self, default = 0, increment = 1, limits = (0, 100)):
@@
-1184,24
+1185,12
@@
class ConfigSatlist(ConfigSelection):
def __init__(self, list, default = None):
if default is not None:
default = str(default)
def __init__(self, list, default = None):
if default is not None:
default = str(default)
- self._satList = list
- choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list]
-
- ConfigSelection.__init__(self, choices = choices, default = default)
+ ConfigSelection.__init__(self, choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list], default = default)
- # use this function to get the orbital position, don't rely on .index
def getOrbitalPosition(self):
if self.value == "":
return None
return int(self.value)
def getOrbitalPosition(self):
if self.value == "":
return None
return int(self.value)
-
- def getSatList(self):
- return self._satList
-
- def getSat(self):
- return self.satList[self.index]
-
- satList = property(getSatList)
orbital_position = property(getOrbitalPosition)
orbital_position = property(getOrbitalPosition)
@@
-1297,7
+1286,6
@@
class ConfigLocations(ConfigElement):
self.default = default
self.locations = []
self.mountpoints = []
self.default = default
self.locations = []
self.mountpoints = []
- harddiskmanager.on_partition_list_change.append(self.mountpointsChanged)
self.value = default[:]
def setValue(self, value):
self.value = default[:]
def setValue(self, value):
@@
-1334,7
+1322,7
@@
class ConfigLocations(ConfigElement):
locations = [[x, None, False, False] for x in tmp]
self.refreshMountpoints()
for x in locations:
locations = [[x, None, False, False] for x in tmp]
self.refreshMountpoints()
for x in locations:
- if
os_path.e
xists(x[0]):
+ if
fileE
xists(x[0]):
x[1] = self.getMountpoint(x[0])
x[2] = True
self.locations = locations
x[1] = self.getMountpoint(x[0])
x[2] = True
self.locations = locations
@@
-1353,20
+1341,11
@@
class ConfigLocations(ConfigElement):
return False
return self.tostring([x[0] for x in locations]) != sv
return False
return self.tostring([x[0] for x in locations]) != sv
- def mountpointsChanged(self, action, dev):
- print "Mounts changed: ", action, dev
- mp = dev.mountpoint+"/"
- if action == "add":
- self.addedMount(mp)
- elif action == "remove":
- self.removedMount(mp)
- self.refreshMountpoints()
-
def addedMount(self, mp):
for x in self.locations:
if x[1] == mp:
x[2] = True
def addedMount(self, mp):
for x in self.locations:
if x[1] == mp:
x[2] = True
- elif x[1] == None and
os_path.e
xists(x[0]):
+ elif x[1] == None and
fileE
xists(x[0]):
x[1] = self.getMountpoint(x[0])
x[2] = True
x[1] = self.getMountpoint(x[0])
x[2] = True
@@
-1376,7
+1355,7
@@
class ConfigLocations(ConfigElement):
x[2] = False
def refreshMountpoints(self):
x[2] = False
def refreshMountpoints(self):
- self.mountpoints = [p.mountpoint
+ "/"
for p in harddiskmanager.getMountedPartitions() if p.mountpoint != "/"]
+ self.mountpoints = [p.mountpoint for p in harddiskmanager.getMountedPartitions() if p.mountpoint != "/"]
self.mountpoints.sort(key = lambda x: -len(x))
def checkChangedMountpoints(self):
self.mountpoints.sort(key = lambda x: -len(x))
def checkChangedMountpoints(self):