diff options
Diffstat (limited to 'lib/python/Components')
45 files changed, 62 insertions, 135 deletions
diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py index 67fad7bc..d3224fd7 100644 --- a/lib/python/Components/AVSwitch.py +++ b/lib/python/Components/AVSwitch.py @@ -1,5 +1,4 @@ from config import config, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean -import os from enigma import eAVSwitch class AVSwitch: diff --git a/lib/python/Components/BlinkingPixmap.py b/lib/python/Components/BlinkingPixmap.py index fef80620..492f14e1 100644 --- a/lib/python/Components/BlinkingPixmap.py +++ b/lib/python/Components/BlinkingPixmap.py @@ -1,5 +1,5 @@ -from Pixmap import * -from ConditionalWidget import * +from Pixmap import PixmapConditional +from ConditionalWidget import BlinkingWidgetConditional, BlinkingWidget class BlinkingPixmap(BlinkingWidget): def __init__(self): diff --git a/lib/python/Components/Button.py b/lib/python/Components/Button.py index f1acb99d..25346b42 100644 --- a/lib/python/Components/Button.py +++ b/lib/python/Components/Button.py @@ -1,6 +1,6 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableText import VariableText from enigma import eButton diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py index a7a5e483..14216cf1 100644 --- a/lib/python/Components/ChoiceList.py +++ b/lib/python/Components/ChoiceList.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from MenuList import MenuList from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, eListbox, gFont, loadPNG diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py index 9a6031e6..ddd6ffb1 100644 --- a/lib/python/Components/Clock.py +++ b/lib/python/Components/Clock.py @@ -1,6 +1,6 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableText import VariableText from enigma import eTimer, eLabel diff --git a/lib/python/Components/ConditionalWidget.py b/lib/python/Components/ConditionalWidget.py index 7d35d956..f826c296 100644 --- a/lib/python/Components/ConditionalWidget.py +++ b/lib/python/Components/ConditionalWidget.py @@ -1,4 +1,4 @@ -from GUIComponent import * +from GUIComponent import GUIComponent from enigma import eTimer class ConditionalWidget(GUIComponent): diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py index 534459e4..7ed6031a 100644 --- a/lib/python/Components/ConfigList.py +++ b/lib/python/Components/ConfigList.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from config import KEY_LEFT, KEY_RIGHT, KEY_0, KEY_DELETE, KEY_OK, KEY_TIMEOUT, ConfigElement from Components.ActionMap import NumberActionMap from enigma import eListbox, eListboxPythonConfigContent, eTimer diff --git a/lib/python/Components/DiskInfo.py b/lib/python/Components/DiskInfo.py index ba04ea49..07a6aa4b 100644 --- a/lib/python/Components/DiskInfo.py +++ b/lib/python/Components/DiskInfo.py @@ -1,5 +1,5 @@ -from GUIComponent import * -from VariableText import * +from GUIComponent import GUIComponent +from VariableText import VariableText from os import statvfs from enigma import eLabel diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index 4a182322..23d77846 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -1,10 +1,9 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from enigma import eEPGCache, eListbox, eListboxPythonMultiContent, gFont, loadPNG, \ RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_HALIGN_CENTER, RT_VALIGN_CENTER -from re import * from time import localtime, time from ServiceReference import ServiceReference from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index 3b02817c..ae171c30 100644 --- a/lib/python/Components/FileList.py +++ b/lib/python/Components/FileList.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent import re from os import path as os_path, listdir diff --git a/lib/python/Components/GUISkin.py b/lib/python/Components/GUISkin.py index fc8f38cb..0fb94214 100644 --- a/lib/python/Components/GUISkin.py +++ b/lib/python/Components/GUISkin.py @@ -1,4 +1,4 @@ -from GUIComponent import * +from GUIComponent import GUIComponent from skin import applyAllAttributes from Tools.CList import CList diff --git a/lib/python/Components/Header.py b/lib/python/Components/Header.py index 6f085c15..e69de29b 100644 --- a/lib/python/Components/Header.py +++ b/lib/python/Components/Header.py @@ -1,17 +0,0 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableText import * - -from enigma import eLabel - -class Header(VariableText, HTMLComponent, GUIComponent): - - def __init__(self, message): - GUIComponent.__init__(self) - VariableText.__init__(self) - self.setText(message) - - def produceHTML(self): - return "<h2>" + self.getText() + "</h2>\n" - - GUI_WIDGET = eLabel diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py index 99bd536d..07bbdd2a 100644 --- a/lib/python/Components/HelpMenuList.py +++ b/lib/python/Components/HelpMenuList.py @@ -1,4 +1,4 @@ -from GUIComponent import * +from GUIComponent import GUIComponent from enigma import eListboxPythonMultiContent, eListbox, gFont diff --git a/lib/python/Components/Input.py b/lib/python/Components/Input.py index b30a74e4..e0a7f449 100644 --- a/lib/python/Components/Input.py +++ b/lib/python/Components/Input.py @@ -1,6 +1,6 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableText import VariableText from enigma import eLabel diff --git a/lib/python/Components/Label.py b/lib/python/Components/Label.py index 4d90badc..7e61275b 100644 --- a/lib/python/Components/Label.py +++ b/lib/python/Components/Label.py @@ -1,8 +1,8 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableText import VariableText -from ConditionalWidget import * +from ConditionalWidget import ConditionalWidget, BlinkingWidget, BlinkingWidgetConditional from enigma import eLabel diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py index ec0000c9..a728aef7 100644 --- a/lib/python/Components/MediaPlayer.py +++ b/lib/python/Components/MediaPlayer.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from MenuList import MenuList diff --git a/lib/python/Components/MenuList.py b/lib/python/Components/MenuList.py index dcbe7c1a..876300bd 100644 --- a/lib/python/Components/MenuList.py +++ b/lib/python/Components/MenuList.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from enigma import eListboxPythonStringContent, eListbox diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py index 45a34fb9..d43b5106 100644 --- a/lib/python/Components/MovieList.py +++ b/lib/python/Components/MovieList.py @@ -1,4 +1,4 @@ -from GUIComponent import * +from GUIComponent import GUIComponent from Tools.FuzzyDate import FuzzyTime from ServiceReference import ServiceReference from Components.MultiContent import MultiContentEntryText diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py index a8c75907..6fbd9994 100644 --- a/lib/python/Components/Network.py +++ b/lib/python/Components/Network.py @@ -1,5 +1,3 @@ -from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigMAC - import os import re from socket import * diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 70ce4dbe..22c99520 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -7,15 +7,9 @@ from enigma import eDVBSatelliteEquipmentControl as secClass, \ eDVBSatelliteRotorParameters as rotorParam, \ eDVBResourceManager -import xml.dom.minidom -from xml.dom import EMPTY_NAMESPACE -from skin import elementsWithTag -from Tools import XMLTools - from xml.sax import make_parser from xml.sax.handler import ContentHandler -from Tools.BoundFunction import boundFunction from time import localtime, mktime from datetime import datetime diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py index bf971813..8c8a3305 100644 --- a/lib/python/Components/ParentalControl.py +++ b/lib/python/Components/ParentalControl.py @@ -1,6 +1,5 @@ from Components.config import config, ConfigSubsection, ConfigSelection, ConfigPIN, ConfigYesNo, ConfigSubList, ConfigInteger -from Components.Input import Input -from Screens.InputBox import InputBox, PinInput +from Screens.InputBox import PinInput from Screens.MessageBox import MessageBox from Tools.BoundFunction import boundFunction from ServiceReference import ServiceReference diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py index db8fd8e2..f5185550 100644 --- a/lib/python/Components/ParentalControlList.py +++ b/lib/python/Components/ParentalControlList.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from MenuList import MenuList from Components.ParentalControl import parentalControl diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py index 27f15171..6e02cce9 100644 --- a/lib/python/Components/PerServiceDisplay.py +++ b/lib/python/Components/PerServiceDisplay.py @@ -1,6 +1,6 @@ -from GUIComponent import * -from VariableText import * -from VariableValue import * +from GUIComponent import GUIComponent +from VariableText import VariableText +from VariableValue import VariableValue from enigma import iPlayableService from enigma import eLabel, eSlider, eTimer diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py index 07a71748..3a3bef1e 100644 --- a/lib/python/Components/PluginList.py +++ b/lib/python/Components/PluginList.py @@ -1,12 +1,12 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from MenuList import MenuList from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest -from enigma import loadPNG, eListboxPythonMultiContent, RT_HALIGN_LEFT, eListbox, gFont +from enigma import loadPNG, eListboxPythonMultiContent, eListbox, gFont def PluginEntryComponent(plugin): res = [ plugin ] diff --git a/lib/python/Components/ProgressBar.py b/lib/python/Components/ProgressBar.py index f18c4672..d97ac832 100644 --- a/lib/python/Components/ProgressBar.py +++ b/lib/python/Components/ProgressBar.py @@ -1,6 +1,6 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableValue import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableValue import VariableValue from enigma import eSlider diff --git a/lib/python/Components/RecordingConfig.py b/lib/python/Components/RecordingConfig.py index 6a3bfb68..d3a0daf2 100644 --- a/lib/python/Components/RecordingConfig.py +++ b/lib/python/Components/RecordingConfig.py @@ -1,5 +1,4 @@ from config import ConfigInteger, ConfigYesNo, ConfigSubsection, config -import os def InitRecordingConfig(): config.recording = ConfigSubsection(); diff --git a/lib/python/Components/Renderer/Listbox.py b/lib/python/Components/Renderer/Listbox.py index a1f89377..ef8206af 100644 --- a/lib/python/Components/Renderer/Listbox.py +++ b/lib/python/Components/Renderer/Listbox.py @@ -1,7 +1,4 @@ -from Components.VariableText import VariableText from Renderer import Renderer -from Tools.Event import Event - from enigma import eListbox # the listbox renderer is the listbox, but no listbox content. diff --git a/lib/python/Components/ScrollLabel.py b/lib/python/Components/ScrollLabel.py index 85e176f6..aa5163b8 100644 --- a/lib/python/Components/ScrollLabel.py +++ b/lib/python/Components/ScrollLabel.py @@ -1,6 +1,6 @@ import skin -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from enigma import eLabel, eWidget, eSlider, fontRenderClass, ePoint, eSize class ScrollLabel(HTMLComponent, GUIComponent): diff --git a/lib/python/Components/ServiceEventTracker.py b/lib/python/Components/ServiceEventTracker.py index 99c02faa..20460436 100644 --- a/lib/python/Components/ServiceEventTracker.py +++ b/lib/python/Components/ServiceEventTracker.py @@ -1,5 +1,3 @@ -from enigma import pNavigation - class ServiceEventTracker: """Tracks service events into a screen""" diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py index 7dfcd05d..b255cd99 100644 --- a/lib/python/Components/ServiceList.py +++ b/lib/python/Components/ServiceList.py @@ -1,11 +1,11 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from enigma import loadPNG, eListboxServiceContent, eListbox, eServiceCenter, eServiceReference, gFont, eRect from string import upper -from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS +from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE class ServiceList(HTMLComponent, GUIComponent): MODE_NORMAL = 0 diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py index d812fddb..09498713 100644 --- a/lib/python/Components/ServiceScan.py +++ b/lib/python/Components/ServiceScan.py @@ -1,4 +1,4 @@ -from enigma import eComponentScan, eDVBFrontendParametersSatellite, eDVBFrontendParametersCable, eDVBFrontendParametersTerrestrial +from enigma import eComponentScan class ServiceScan: diff --git a/lib/python/Components/SetupDevices.py b/lib/python/Components/SetupDevices.py index 546d04a7..71fb1e47 100644 --- a/lib/python/Components/SetupDevices.py +++ b/lib/python/Components/SetupDevices.py @@ -1,4 +1,4 @@ -from config import config, ConfigSlider, ConfigSelection, ConfigSubsection, ConfigOnOff, ConfigText +from config import config, ConfigSelection, ConfigSubsection, ConfigOnOff, ConfigText from Components.Timezones import timezones from Components.Language import language diff --git a/lib/python/Components/Slider.py b/lib/python/Components/Slider.py index b8144bb5..a36a573a 100644 --- a/lib/python/Components/Slider.py +++ b/lib/python/Components/Slider.py @@ -1,7 +1,6 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableValue import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableValue import VariableValue from enigma import eSlider diff --git a/lib/python/Components/Sources/Clock.py b/lib/python/Components/Sources/Clock.py index 4833ddde..4c4b41e6 100644 --- a/lib/python/Components/Sources/Clock.py +++ b/lib/python/Components/Sources/Clock.py @@ -1,4 +1,3 @@ -from Tools.Event import Event from Components.Element import cached from enigma import eTimer import time diff --git a/lib/python/Components/Sources/CurrentService.py b/lib/python/Components/Sources/CurrentService.py index 8e582d55..acc624a2 100644 --- a/lib/python/Components/Sources/CurrentService.py +++ b/lib/python/Components/Sources/CurrentService.py @@ -3,8 +3,6 @@ from enigma import iPlayableService from Source import Source from Components.Element import cached -from time import time - class CurrentService(PerServiceBase, Source): def __init__(self, navcore): Source.__init__(self) diff --git a/lib/python/Components/Sources/EventInfo.py b/lib/python/Components/Sources/EventInfo.py index 72d5f18d..a4bc874f 100644 --- a/lib/python/Components/Sources/EventInfo.py +++ b/lib/python/Components/Sources/EventInfo.py @@ -1,10 +1,8 @@ from Components.PerServiceDisplay import PerServiceBase from Components.Element import cached -from Tools.Event import Event from enigma import iPlayableService from Source import Source -from time import time class EventInfo(PerServiceBase, Source, object): NOW = 0 diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py index 1af03f95..5b7e5b0c 100644 --- a/lib/python/Components/Sources/FrontendStatus.py +++ b/lib/python/Components/Sources/FrontendStatus.py @@ -1,5 +1,5 @@ from Source import Source -from enigma import eTimer, iFrontendInformation +from enigma import eTimer class FrontendStatus(Source): def __init__(self, service_source = None, frontend_source = None): diff --git a/lib/python/Components/Sources/List.py b/lib/python/Components/Sources/List.py index e141da59..d7221296 100644 --- a/lib/python/Components/Sources/List.py +++ b/lib/python/Components/Sources/List.py @@ -1,5 +1,4 @@ from Source import Source -from Tools.Event import Event from Components.Element import cached class List(Source, object): diff --git a/lib/python/Components/Sources/StaticText.py b/lib/python/Components/Sources/StaticText.py index 2f8f0e18..6f775c44 100644 --- a/lib/python/Components/Sources/StaticText.py +++ b/lib/python/Components/Sources/StaticText.py @@ -1,5 +1,4 @@ from Source import Source -from Components.Element import cached class StaticText(Source): # filter is a function which filters external, untrusted strings diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py index c732e947..e31a0f4a 100644 --- a/lib/python/Components/TimerList.py +++ b/lib/python/Components/TimerList.py @@ -1,11 +1,10 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from Tools.FuzzyDate import FuzzyTime -import time from enigma import eListboxPythonMultiContent, eListbox, gFont, loadPNG, \ - RT_HALIGN_CENTER, RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_VALIGN_CENTER + RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_VALIGN_CENTER from timer import TimerEntry from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py index 35e78de0..50daa2f1 100644 --- a/lib/python/Components/TimerSanityCheck.py +++ b/lib/python/Components/TimerSanityCheck.py @@ -1,4 +1,3 @@ -from Components.NimManager import nimmanager from time import localtime class TimerSanityCheck: diff --git a/lib/python/Components/VariableText.py b/lib/python/Components/VariableText.py index bb8b5fe3..d20e5193 100644 --- a/lib/python/Components/VariableText.py +++ b/lib/python/Components/VariableText.py @@ -1,5 +1,3 @@ -import skin - class VariableText(object): """VariableText can be used for components which have a variable text, based on any widget with setText call""" diff --git a/lib/python/Components/VariableValue.py b/lib/python/Components/VariableValue.py index 288de01a..7fde0af1 100644 --- a/lib/python/Components/VariableValue.py +++ b/lib/python/Components/VariableValue.py @@ -1,5 +1,3 @@ -import skin - class VariableValue(object): """VariableValue can be used for components which have a variable value (like eSlider), based on any widget with setValue call""" diff --git a/lib/python/Components/VolumeBar.py b/lib/python/Components/VolumeBar.py index c51bdb19..1ada3c69 100644 --- a/lib/python/Components/VolumeBar.py +++ b/lib/python/Components/VolumeBar.py @@ -1,10 +1,8 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableValue import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableValue import VariableValue from enigma import eSlider -from enigma import eLabel class VolumeBar(VariableValue, HTMLComponent, GUIComponent): def __init__(self): diff --git a/lib/python/Components/components.py b/lib/python/Components/components.py index 87159bf6..e69de29b 100644 --- a/lib/python/Components/components.py +++ b/lib/python/Components/components.py @@ -1,23 +0,0 @@ -import time -import sys - -import HTMLComponent -import HTMLSkin -import GUISkin -import GUIComponent -import VariableValue -import Clock -import Button -import Label -import Header -import VolumeBar -import ProgressBar -import MenuList -import config -import ConfigList -import ServiceList -import ServiceScan -import ActionMap -import PerServiceDisplay -import EventInfo -import ServiceName |