git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
21ef246
)
change ConfigDummy to ConfigNothing
author
Stefan Pluecken
<stefan.pluecken@multimedia-labs.de>
Sun, 8 Oct 2006 22:41:18 +0000
(22:41 +0000)
committer
Stefan Pluecken
<stefan.pluecken@multimedia-labs.de>
Sun, 8 Oct 2006 22:41:18 +0000
(22:41 +0000)
lib/python/Components/NimManager.py
patch
|
blob
|
history
lib/python/Components/config.py
patch
|
blob
|
history
lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
patch
|
blob
|
history
lib/python/Screens/Ci.py
patch
|
blob
|
history
lib/python/Screens/Satconfig.py
patch
|
blob
|
history
diff --git
a/lib/python/Components/NimManager.py
b/lib/python/Components/NimManager.py
index 7878b67be24ffd7321aa71ef13b315035c8d4a73..f9b9ff6d55956c3c8152ea54adc20dbcb43946c6 100644
(file)
--- a/
lib/python/Components/NimManager.py
+++ b/
lib/python/Components/NimManager.py
@@
-1,4
+1,4
@@
-from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, Config
Dummy
, ConfigSubDict
+from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, Config
Nothing
, ConfigSubDict
from enigma import eDVBSatelliteEquipmentControl, \
eDVBSatelliteLNBParameters as lnbParam, \
from enigma import eDVBSatelliteEquipmentControl, \
eDVBSatelliteLNBParameters as lnbParam, \
@@
-750,7
+750,7
@@
def InitNimManager(nimmgr):
ucsw.append((str(y), "Input " + str(y)))
nim.advanced.lnb = ConfigSubList()
ucsw.append((str(y), "Input " + str(y)))
nim.advanced.lnb = ConfigSubList()
- nim.advanced.lnb.append(Config
Dummy
())
+ nim.advanced.lnb.append(Config
Nothing
())
for x in range(1, 33):
nim.advanced.lnb.append(ConfigSubsection())
nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb")
for x in range(1, 33):
nim.advanced.lnb.append(ConfigSubsection())
nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb")
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index 75035a78b3f414d3ab746f639b5ea5d274b32adb..343632db225f4ee5ca4be3a07530107e2c41bba6 100644
(file)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-26,6
+26,7
@@
import copy
#
class ConfigElement(object):
def __init__(self):
#
class ConfigElement(object):
def __init__(self):
+
object.__init__(self)
self.saved_value = None
self.save_disabled = False
object.__init__(self)
self.saved_value = None
self.save_disabled = False
@@
-571,7
+572,7
@@
class ConfigSatlist(ConfigSelection):
orbital_position = property(getOrbitalPosition)
# nothing.
orbital_position = property(getOrbitalPosition)
# nothing.
-class Config
Dummy
(ConfigSelection):
+class Config
Nothing
(ConfigSelection):
def __init__(self):
ConfigSelection.__init__(self, choices = [""])
def __init__(self):
ConfigSelection.__init__(self, choices = [""])
diff --git
a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 6cb0c087f0b9012d99b65e4afe23dfff964e62ce..0327a9340e4e8c0e432007ace7d3fca17444e4ce 100644
(file)
--- a/
lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/
lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@
-10,7
+10,7
@@
from Components.TunerInfo import TunerInfo
from Components.ActionMap import ActionMap
from Components.NimManager import nimmanager
from Components.MenuList import MenuList
from Components.ActionMap import ActionMap
from Components.NimManager import nimmanager
from Components.MenuList import MenuList
-from Components.config import Config
Dummy
, ConfigSelection
+from Components.config import Config
Nothing
, ConfigSelection
class PositionerSetup(Screen):
skin = """
class PositionerSetup(Screen):
skin = """
@@
-114,11
+114,11
@@
class PositionerSetup(Screen):
self.statusTimer.start(50, False)
def createConfig(self):
self.statusTimer.start(50, False)
def createConfig(self):
- self.positioner_tune = Config
Dummy
()
- self.positioner_move = Config
Dummy
()
- self.positioner_finemove = Config
Dummy
()
- self.positioner_limits = Config
Dummy
()
- self.positioner_goto0 = Config
Dummy
()
+ self.positioner_tune = Config
Nothing
()
+ self.positioner_move = Config
Nothing
()
+ self.positioner_finemove = Config
Nothing
()
+ self.positioner_limits = Config
Nothing
()
+ self.positioner_goto0 = Config
Nothing
()
storepos = []
for x in range(1,255):
storepos.append(str(x))
storepos = []
for x in range(1,255):
storepos.append(str(x))
diff --git
a/lib/python/Screens/Ci.py
b/lib/python/Screens/Ci.py
index 0c82aa55f325d35181c8e95897b0774a6908bcd9..207a4b034c1e1a3e3a9b9fe91afdc59f07559aa1 100644
(file)
--- a/
lib/python/Screens/Ci.py
+++ b/
lib/python/Screens/Ci.py
@@
-8,7
+8,7
@@
from Components.Label import Label
from Components.HTMLComponent import *
from Components.GUIComponent import *
from Components.HTMLComponent import *
from Components.GUIComponent import *
-from Components.config import config, ConfigSubsection, ConfigSelection, ConfigSubList, getConfigListEntry, KEY_LEFT, KEY_RIGHT, KEY_0, Config
Dummy
+from Components.config import config, ConfigSubsection, ConfigSelection, ConfigSubList, getConfigListEntry, KEY_LEFT, KEY_RIGHT, KEY_0, Config
Nothing
from Components.ConfigList import ConfigList
from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPythonConfigContent
from Components.ConfigList import ConfigList
from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPythonConfigContent
@@
-309,17
+309,17
@@
class CiSelection(Screen):
def appendEntries(self, slot, state):
self.state[slot] = state
def appendEntries(self, slot, state):
self.state[slot] = state
- self.list.append( (_("Reset"), Config
Dummy
(), 0, slot) )
- self.list.append( (_("Init"), Config
Dummy
(), 1, slot) )
+ self.list.append( (_("Reset"), Config
Nothing
(), 0, slot) )
+ self.list.append( (_("Init"), Config
Nothing
(), 1, slot) )
if self.state[slot] == 0: #no module
if self.state[slot] == 0: #no module
- self.list.append( (_("no module found"), Config
Dummy
(), 2, slot) )
+ self.list.append( (_("no module found"), Config
Nothing
(), 2, slot) )
elif self.state[slot] == 1: #module in init
elif self.state[slot] == 1: #module in init
- self.list.append( (_("init module"), Config
Dummy
(), 2, slot) )
+ self.list.append( (_("init module"), Config
Nothing
(), 2, slot) )
elif self.state[slot] == 2: #module ready
#get appname
appname = eDVBCI_UI.getInstance().getAppName(slot)
elif self.state[slot] == 2: #module ready
#get appname
appname = eDVBCI_UI.getInstance().getAppName(slot)
- self.list.append( (appname, Config
Dummy
(), 2, slot) )
+ self.list.append( (appname, Config
Nothing
(), 2, slot) )
self.list.append(getConfigListEntry(_("Multiple service support"), config.ci[slot].canDescrambleMultipleServices))
self.list.append(getConfigListEntry(_("Multiple service support"), config.ci[slot].canDescrambleMultipleServices))
@@
-335,13
+335,13
@@
class CiSelection(Screen):
slotidx += 1 # do not change Init
if state == 0: #no module
slotidx += 1 # do not change Init
if state == 0: #no module
- self.list[slotidx] = (_("no module found"), Config
Dummy
(), 2, slot)
+ self.list[slotidx] = (_("no module found"), Config
Nothing
(), 2, slot)
elif state == 1: #module in init
elif state == 1: #module in init
- self.list[slotidx] = (_("init module"), Config
Dummy
(), 2, slot)
+ self.list[slotidx] = (_("init module"), Config
Nothing
(), 2, slot)
elif state == 2: #module ready
#get appname
appname = eDVBCI_UI.getInstance().getAppName(slot)
elif state == 2: #module ready
#get appname
appname = eDVBCI_UI.getInstance().getAppName(slot)
- self.list[slotidx] = (appname, Config
Dummy
(), 2, slot)
+ self.list[slotidx] = (appname, Config
Nothing
(), 2, slot)
lst = self["entries"]
lst.list = self.list
lst = self["entries"]
lst.list = self.list
diff --git
a/lib/python/Screens/Satconfig.py
b/lib/python/Screens/Satconfig.py
index b6e49112f4d3f6b918c9feb9d74fc276c1beac48..5c4e6903912696a429cd0c739ad87b84d9ce1b0a 100644
(file)
--- a/
lib/python/Screens/Satconfig.py
+++ b/
lib/python/Screens/Satconfig.py
@@
-3,7
+3,7
@@
from Components.ActionMap import ActionMap
from Components.ConfigList import ConfigList, ConfigListScreen
from Components.MenuList import MenuList
from Components.NimManager import nimmanager
from Components.ConfigList import ConfigList, ConfigListScreen
from Components.MenuList import MenuList
from Components.NimManager import nimmanager
-from Components.config import getConfigListEntry, config, Config
Dummy
+from Components.config import getConfigListEntry, config, Config
Nothing
class NimSetup(Screen, ConfigListScreen):
def createSimpleSetup(self, list, mode):
class NimSetup(Screen, ConfigListScreen):
def createSimpleSetup(self, list, mode):
@@
-93,7
+93,7
@@
class NimSetup(Screen, ConfigListScreen):
def fillListWithAdvancedSatEntrys(self, Sat):
currLnb = self.nimConfig.advanced.lnb[int(Sat.lnb.value)]
def fillListWithAdvancedSatEntrys(self, Sat):
currLnb = self.nimConfig.advanced.lnb[int(Sat.lnb.value)]
- if isinstance(currLnb, Config
Dummy
):
+ if isinstance(currLnb, Config
Nothing
):
currLnb = None
self.list.append(getConfigListEntry(_("Voltage mode"), Sat.voltage))
currLnb = None
self.list.append(getConfigListEntry(_("Voltage mode"), Sat.voltage))