diff options
Diffstat (limited to 'lib/python/Screens')
37 files changed, 56 insertions, 121 deletions
diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py index 6658bb1a..2c7d98f5 100644 --- a/lib/python/Screens/About.py +++ b/lib/python/Screens/About.py @@ -3,7 +3,6 @@ from Components.ActionMap import ActionMap from Components.Label import Label from Components.Harddisk import Harddisk from Components.NimManager import nimmanager -from Components.MenuList import MenuList from Components.About import about from Tools.DreamboxHardware import getFPVersion diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index eb6f9059..0fe625bb 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -7,7 +7,6 @@ from Components.ServiceEventTracker import ServiceEventTracker from EpgSelection import EPGSelection from enigma import eServiceReference, eEPGCache, eServiceCenter, eTimer, eDVBDB, iPlayableService, iServiceInformation from Components.config import config, ConfigSubsection, ConfigText -from Screens.FixedMenu import FixedMenu from Tools.NumericalTextInput import NumericalTextInput from Components.NimManager import nimmanager from Components.Sources.Clock import Clock @@ -21,13 +20,11 @@ from Screens.ServiceInfo import ServiceInfo from Screens.RdsDisplay import RassInteractive from ServiceReference import ServiceReference from Tools.BoundFunction import boundFunction -from re import * +from re import compile from os import remove FLAG_SERVICE_NEW_FOUND = 64 #define in lib/dvb/idvb.h as dxNewFound = 64 -import xml.dom.minidom - class BouquetSelector(Screen): def __init__(self, session, bouquets, selectedFunc, enableWrapAround=False): Screen.__init__(self, session) diff --git a/lib/python/Screens/ChoiceBox.py b/lib/python/Screens/ChoiceBox.py index b1d74ad5..0436f66d 100644 --- a/lib/python/Screens/ChoiceBox.py +++ b/lib/python/Screens/ChoiceBox.py @@ -1,8 +1,6 @@ from Screens.Screen import Screen -from Screens.MessageBox import MessageBox from Components.ActionMap import NumberActionMap from Components.Label import Label -from Components.MenuList import MenuList from Components.ChoiceList import ChoiceEntryComponent, ChoiceList class ChoiceBox(Screen): diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py index b6f315b4..46b07794 100644 --- a/lib/python/Screens/Ci.py +++ b/lib/python/Screens/Ci.py @@ -1,15 +1,12 @@ -from Screen import * -from Components.MenuList import MenuList +from Screen import Screen from Components.ActionMap import ActionMap from Components.ActionMap import NumberActionMap -from Components.Header import Header -from Components.Button import Button from Components.Label import Label from Components.config import config, ConfigSubsection, ConfigSelection, ConfigSubList, getConfigListEntry, KEY_LEFT, KEY_RIGHT, KEY_0, ConfigNothing, ConfigPIN from Components.ConfigList import ConfigList -from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPythonConfigContent +from enigma import eTimer, eDVBCI_UI MAX_NUM_CI = 4 diff --git a/lib/python/Screens/Console.py b/lib/python/Screens/Console.py index 03b0249b..c2e1688d 100644 --- a/lib/python/Screens/Console.py +++ b/lib/python/Screens/Console.py @@ -1,6 +1,6 @@ from enigma import eConsoleAppContainer from Screens.Screen import Screen -from Components.ActionMap import ActionMap, NumberActionMap +from Components.ActionMap import ActionMap from Components.ScrollLabel import ScrollLabel class Console(Screen): diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py index 3103bfa7..9ceb42cf 100644 --- a/lib/python/Screens/EpgSelection.py +++ b/lib/python/Screens/EpgSelection.py @@ -3,21 +3,16 @@ from Components.config import config, ConfigClock from Components.Button import Button from Components.Pixmap import Pixmap from Components.Label import Label -from Components.EpgList import * +from Components.EpgList import EPGList from Components.ActionMap import ActionMap -from Components.ScrollLabel import ScrollLabel from Screens.EventView import EventViewSimple from TimeDateInput import TimeDateInput from enigma import eServiceReference -from Screens.FixedMenu import FixedMenu from RecordTimer import RecordTimerEntry, parseEvent -from TimerEdit import TimerEditList from TimerEntry import TimerEntry from ServiceReference import ServiceReference from time import localtime, time -import xml.dom.minidom - mepg_config_initialized = False class EPGSelection(Screen): diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py index 8504165d..7746b135 100644 --- a/lib/python/Screens/EventView.py +++ b/lib/python/Screens/EventView.py @@ -4,10 +4,9 @@ from Components.Button import Button from Components.Label import Label from Components.ScrollLabel import ScrollLabel from enigma import eEPGCache, eTimer, eServiceReference -from ServiceReference import ServiceReference from RecordTimer import RecordTimerEntry, parseEvent from TimerEntry import TimerEntry -from time import localtime, asctime +from time import localtime class EventViewBase: def __init__(self, Event, Ref, callback=None, similarEPGCB=None): diff --git a/lib/python/Screens/HelpMenu.py b/lib/python/Screens/HelpMenu.py index 7bd52122..e6eab6b4 100644 --- a/lib/python/Screens/HelpMenu.py +++ b/lib/python/Screens/HelpMenu.py @@ -1,16 +1,8 @@ from Screen import Screen - -from Components.Pixmap import * -from Components.Pixmap import Pixmap -from Components.Pixmap import MovingPixmap +from Components.Pixmap import Pixmap, MovingPixmap from Components.Label import Label -from Components.Slider import Slider from Components.ActionMap import ActionMap from Components.HelpMenuList import HelpMenuList -import string -from xml.sax import make_parser -from xml.sax.handler import ContentHandler -from Components.MenuList import MenuList class HelpMenu(Screen): def __init__(self, session, list): diff --git a/lib/python/Screens/ImageWizard.py b/lib/python/Screens/ImageWizard.py index 461fa318..148eba52 100644 --- a/lib/python/Screens/ImageWizard.py +++ b/lib/python/Screens/ImageWizard.py @@ -1,8 +1,5 @@ from Wizard import Wizard, wizardManager -from Components.Pixmap import * - -from LanguageSelection import LanguageSelection from Tools.Directories import fileExists import os diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index ba31a83a..92be7719 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -10,8 +10,6 @@ from Components.ActionMap import HelpableActionMap from Components.config import config from Components.ServiceEventTracker import ServiceEventTracker -from Tools.Notifications import AddNotificationWithCallback - from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \ InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \ @@ -21,7 +19,7 @@ from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport -from Screens.HelpMenu import HelpableScreen, HelpMenu +from Screens.HelpMenu import HelpableScreen from enigma import iPlayableService diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index ca97b55f..8aeb7677 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -5,10 +5,9 @@ from Components.ActionMap import NumberActionMap from Components.BlinkingPixmap import BlinkingPixmapConditional from Components.Harddisk import harddiskmanager from Components.Input import Input -from Components.Label import * -from Components.Pixmap import Pixmap, PixmapConditional +from Components.Label import Label +from Components.Pixmap import Pixmap from Components.PluginComponent import plugins -from Components.ProgressBar import * from Components.ServiceEventTracker import ServiceEventTracker from Components.Sources.CurrentService import CurrentService from Components.Sources.EventInfo import EventInfo diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py index dbc6d480..81eb2d40 100644 --- a/lib/python/Screens/LanguageSelection.py +++ b/lib/python/Screens/LanguageSelection.py @@ -7,7 +7,7 @@ from Components.Sources.List import List from Tools.Directories import * -from enigma import eListboxPythonMultiContent, loadPNG, eListbox, gFont, RT_HALIGN_LEFT +from enigma import eListboxPythonMultiContent, loadPNG, gFont, RT_HALIGN_LEFT def LanguageEntryComponent(file, name, index): res = [ index ] diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py index 84c75717..a378dafd 100644 --- a/lib/python/Screens/MediaPlayer.py +++ b/lib/python/Screens/MediaPlayer.py @@ -1,18 +1,16 @@ -import os -import time -from enigma import eTimer, iPlayableService, eServiceCenter, iServiceInformation, eSize +for os import path as os_path, os_remove, os_listdir +from time import strftime +from enigma import eTimer, iPlayableService, eServiceCenter, iServiceInformation from Screens.Screen import Screen from Screens.MessageBox import MessageBox from Screens.InputBox import InputBox -from Components.ActionMap import NumberActionMap, ActionMap, HelpableActionMap +from Components.ActionMap import NumberActionMap, HelpableActionMap from Components.Label import Label -from Components.Input import Input from Components.Pixmap import Pixmap from Components.Label import Label -from Components.FileList import FileEntryComponent, FileList -from Components.MediaPlayer import PlayList, PlaylistEntryComponent -from Plugins.Plugin import PluginDescriptor -from Tools.Directories import resolveFilename, SCOPE_MEDIA, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_SKIN_IMAGE +from Components.FileList import FileList +from Components.MediaPlayer import PlayList +from Tools.Directories import resolveFilename, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_SKIN_IMAGE from Components.ServicePosition import ServicePositionGauge from Components.ServiceEventTracker import ServiceEventTracker from Components.Playlist import PlaylistIOInternal, PlaylistIOM3U, PlaylistIOPLS @@ -20,7 +18,6 @@ from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarC from ServiceReference import ServiceReference from Screens.ChoiceBox import ChoiceBox from Screens.HelpMenu import HelpableScreen -from bisect import insort import random class MyPlayList(PlayList): @@ -237,9 +234,9 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup # Get rid of this...by finding the first "/" # FIXME: this should be fixed in the servicemp3.cpp handler filename = filename[filename.find("/"):] - path = os.path.dirname(filename) + path = os_path.dirname(filename) pngname = path + "/" + "folder.png" - if not os.path.exists(pngname): + if not os_path.exists(pngname): pngname = resolveFilename(SCOPE_SKIN_IMAGE, "no_coverArt.png") if self.coverArtFileName != pngname: self.coverArtFileName = pngname @@ -347,7 +344,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup if r is None: return text = r.getPath() - self["currenttext"].setText(os.path.basename(text)) + self["currenttext"].setText(os_path.basename(text)) if self.currList == "playlist": t = self.playlist.getSelection() @@ -419,7 +416,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup elif choice[1] == "copyfiles": self.stopEntry() self.playlist.clear() - self.copyDirectory(os.path.dirname(self.filelist.getSelection()[0].getPath()) + "/", recursive = False) + self.copyDirectory(os_path.dirname(self.filelist.getSelection()[0].getPath()) + "/", recursive = False) self.playServiceRefEntry(self.filelist.getServiceRef()) elif choice[1] == "playlist": self.switchToPlayList() @@ -484,7 +481,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup if name is not None: name = name.strip() if name == "": - name = time.strftime("%y%m%d_%H%M%S") + name = strftime("%y%m%d_%H%M%S") name += ".e2pls" self.playlistIOInternal.clear() for x in self.playlist.list: @@ -495,7 +492,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup listpath = [] playlistdir = resolveFilename(SCOPE_PLAYLIST) try: - for i in os.listdir(playlistdir): + for i in os_listdir(playlistdir): listpath.append((i,playlistdir + i)) except IOError,e: print "Error while scanning subdirs ",e @@ -515,7 +512,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup listpath = [] playlistdir = resolveFilename(SCOPE_PLAYLIST) try: - for i in os.listdir(playlistdir): + for i in os_listdir(playlistdir): listpath.append((i,playlistdir + i)) except IOError,e: print "Error while scanning subdirs ",e @@ -528,7 +525,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup def deleteConfirmed(self, confirmed): if confirmed: - os.remove(self.delname) + os_remove(self.delname) def clear_playlist(self): self.stopEntry() diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py index 34c534b5..1b0ef1a3 100644 --- a/lib/python/Screens/Menu.py +++ b/lib/python/Screens/Menu.py @@ -2,9 +2,7 @@ from Screen import Screen from Components.Sources.List import List from Components.ActionMap import ActionMap from Components.Header import Header -from Components.Button import Button from Components.Label import Label -from Components.ProgressBar import ProgressBar from Components.config import configfile from Components.Sources.Clock import Clock from Components.PluginComponent import plugins @@ -12,8 +10,6 @@ from Components.PluginComponent import plugins from Tools.Directories import resolveFilename, SCOPE_SKIN import xml.dom.minidom -from xml.dom import EMPTY_NAMESPACE -from skin import elementsWithTag from Screens.Setup import Setup, getSetupTitle diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py index 6fb389ce..0133de2a 100644 --- a/lib/python/Screens/MessageBox.py +++ b/lib/python/Screens/MessageBox.py @@ -1,10 +1,9 @@ from Screen import Screen from Components.ActionMap import ActionMap from Components.Label import Label -from Components.Button import Button from Components.Pixmap import Pixmap from Components.MenuList import MenuList -from enigma import eSize, ePoint, eTimer +from enigma import eTimer class MessageBox(Screen): TYPE_YESNO = 0 diff --git a/lib/python/Screens/MinuteInput.py b/lib/python/Screens/MinuteInput.py index d804570f..53e33735 100644 --- a/lib/python/Screens/MinuteInput.py +++ b/lib/python/Screens/MinuteInput.py @@ -1,11 +1,6 @@ from Screen import Screen from Components.ActionMap import NumberActionMap -from Components.Label import Label -from Components.Button import Button -from Components.Pixmap import Pixmap -from Components.MenuList import MenuList from Components.Input import Input -from enigma import eSize, ePoint class MinuteInput(Screen): def __init__(self, session, basemins = 5): diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py index ab36adda..d345bddb 100644 --- a/lib/python/Screens/MovieSelection.py +++ b/lib/python/Screens/MovieSelection.py @@ -1,6 +1,5 @@ from Screen import Screen from Components.Button import Button -from Components.ServiceList import ServiceList from Components.ActionMap import ActionMap from Components.MovieList import MovieList from Components.DiskInfo import DiskInfo diff --git a/lib/python/Screens/Mute.py b/lib/python/Screens/Mute.py index 12ffbb31..f64be901 100644 --- a/lib/python/Screens/Mute.py +++ b/lib/python/Screens/Mute.py @@ -1,5 +1,4 @@ from Screen import Screen -from Components.VolumeBar import VolumeBar class Mute(Screen): def __init__(self, session): diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py index a2b15e93..9514e7fd 100644 --- a/lib/python/Screens/NetworkSetup.py +++ b/lib/python/Screens/NetworkSetup.py @@ -1,11 +1,11 @@ from Screen import Screen from Components.ActionMap import ActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.config import config, getConfigListEntry from Components.Network import iNetwork from Components.Label import Label from Components.MenuList import MenuList -from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigNothing +from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigNothing from Components.PluginComponent import plugins from Plugins.Plugin import PluginDescriptor diff --git a/lib/python/Screens/ParentalControlSetup.py b/lib/python/Screens/ParentalControlSetup.py index c0561b5d..f39afed0 100644 --- a/lib/python/Screens/ParentalControlSetup.py +++ b/lib/python/Screens/ParentalControlSetup.py @@ -1,17 +1,15 @@ from Screen import Screen -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.ActionMap import NumberActionMap from Components.config import config, getConfigListEntry, ConfigNothing, NoSave, ConfigPIN -from Components.ServiceList import ServiceList from Components.ParentalControlList import ParentalControlEntryComponent, ParentalControlList from Components.ParentalControl import parentalControl from Screens.ChoiceBox import ChoiceBox from Screens.MessageBox import MessageBox -from Screens.InputBox import InputBox, Input, PinInput +from Screens.InputBox import PinInput from Screens.ChannelSelection import service_types_tv from Tools.BoundFunction import boundFunction -from ServiceReference import ServiceReference -from enigma import eServiceCenter, eServiceReference, eTimer +from enigma import eServiceCenter, eTimer from operator import itemgetter class ProtectedScreen: diff --git a/lib/python/Screens/PiPSetup.py b/lib/python/Screens/PiPSetup.py index 67c5b84b..d7d0e167 100644 --- a/lib/python/Screens/PiPSetup.py +++ b/lib/python/Screens/PiPSetup.py @@ -1,9 +1,6 @@ from Screens.Screen import Screen -from Screens.MessageBox import MessageBox from Components.ActionMap import NumberActionMap from Components.Label import Label -from Components.MenuList import MenuList -from Components.ChoiceList import ChoiceEntryComponent, ChoiceList # this is not so great. MAX_X = 720 diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py index b3360b61..5459ccce 100644 --- a/lib/python/Screens/PluginBrowser.py +++ b/lib/python/Screens/PluginBrowser.py @@ -2,11 +2,9 @@ from Screen import Screen from enigma import eConsoleAppContainer, loadPNG -from Components.MenuList import MenuList from Components.ActionMap import ActionMap from Components.PluginComponent import plugins from Components.PluginList import * -from Components.config import config from Components.Label import Label from Screens.MessageBox import MessageBox from Screens.Console import Console diff --git a/lib/python/Screens/RdsDisplay.py b/lib/python/Screens/RdsDisplay.py index 4190b945..9b60fae9 100644 --- a/lib/python/Screens/RdsDisplay.py +++ b/lib/python/Screens/RdsDisplay.py @@ -1,6 +1,5 @@ -from enigma import iPlayableService, loadPNG, iRdsDecoder, ePoint, gRGB +from enigma import iPlayableService, loadPNG, iRdsDecoder from Screens.Screen import Screen -from Components.Sources.RdsDecoder import RdsDecoder from Components.ActionMap import NumberActionMap from Components.ServiceEventTracker import ServiceEventTracker from Components.Pixmap import Pixmap diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 29219721..644d1d96 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -1,6 +1,6 @@ from Screen import Screen from Components.ActionMap import ActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.MenuList import MenuList from Components.NimManager import nimmanager from Components.config import getConfigListEntry, config, ConfigNothing diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 351b421b..6bdedc87 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -1,9 +1,9 @@ from Screen import Screen -from ServiceScan import * +from ServiceScan import ServiceScan from Components.config import config, ConfigSubsection, ConfigSelection, \ - ConfigYesNo, ConfigInteger, getConfigListEntry, ConfigSlider, ConfigSatlist, ConfigEnableDisable + ConfigYesNo, ConfigInteger, getConfigListEntry, ConfigSlider, ConfigEnableDisable from Components.ActionMap import NumberActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.NimManager import nimmanager, getConfigSatlist from Components.Label import Label from Screens.MessageBox import MessageBox diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py index cfcb5284..ed61d9d6 100644 --- a/lib/python/Screens/Screen.py +++ b/lib/python/Screens/Screen.py @@ -1,8 +1,7 @@ -from Components.HTMLSkin import * -from Components.GUISkin import * +from Components.HTMLSkin import HTMLSkin +from Components.GUISkin import GUISkin from Components.Sources.Source import Source - -import sys +from Components.GUIComponent import GUIComponent class Screen(dict, HTMLSkin, GUISkin): diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py index 83cdcd5f..01cfc61a 100644 --- a/lib/python/Screens/ServiceInfo.py +++ b/lib/python/Screens/ServiceInfo.py @@ -1,9 +1,8 @@ -from Components.HTMLComponent import * -from Components.GUIComponent import * +from Components.HTMLComponent import HTMLComponent +from Components.GUIComponent import GUIComponent from Screen import Screen from Components.ActionMap import ActionMap from Components.Label import Label -from Components.MenuList import MenuList from ServiceReference import ServiceReference from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation, eServiceCenter diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py index 432d8245..f6fb09bd 100644 --- a/lib/python/Screens/Setup.py +++ b/lib/python/Screens/Setup.py @@ -1,12 +1,11 @@ from Screen import Screen from Components.ActionMap import NumberActionMap -from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_OK -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.config import config +from Components.ConfigList import ConfigListScreen from Components.Label import Label from Components.Pixmap import Pixmap import xml.dom.minidom -from xml.dom import EMPTY_NAMESPACE from skin import elementsWithTag from Tools import XMLTools diff --git a/lib/python/Screens/SleepTimerEdit.py b/lib/python/Screens/SleepTimerEdit.py index f582ff22..f724bc5f 100644 --- a/lib/python/Screens/SleepTimerEdit.py +++ b/lib/python/Screens/SleepTimerEdit.py @@ -5,8 +5,6 @@ from Components.Input import Input from Components.Label import Label from Components.Pixmap import Pixmap from Components.config import config -from SleepTimer import SleepTimerEntry -import time class SleepTimerEdit(Screen): def __init__(self, session): diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py index a4ba6042..b572bd80 100644 --- a/lib/python/Screens/Standby.py +++ b/lib/python/Screens/Standby.py @@ -2,7 +2,7 @@ from Screen import Screen from Components.ActionMap import ActionMap from Components.config import config from Components.AVSwitch import AVSwitch -from enigma import eDVBVolumecontrol, eDBoxLCD, eServiceReference +from enigma import eDVBVolumecontrol, eDBoxLCD from Components.Sources.Clock import Clock inStandby = None diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py index b67ca9d4..1734d734 100644 --- a/lib/python/Screens/StartWizard.py +++ b/lib/python/Screens/StartWizard.py @@ -1,6 +1,6 @@ from Wizard import Wizard, wizardManager -from Components.Pixmap import * +from Components.Pixmap import Pixmap, MovingPixmap from Components.config import config, ConfigBoolean, configfile from LanguageSelection import LanguageSelection diff --git a/lib/python/Screens/Subtitles.py b/lib/python/Screens/Subtitles.py index ac2937ff..e3cdd71a 100644 --- a/lib/python/Screens/Subtitles.py +++ b/lib/python/Screens/Subtitles.py @@ -1,8 +1,7 @@ from Screen import Screen from Components.ActionMap import ActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.config import config, getConfigListEntry, ConfigNothing -from Components.Label import Label from Tools.ISO639 import LanguageCodes diff --git a/lib/python/Screens/TimeDateInput.py b/lib/python/Screens/TimeDateInput.py index c50d8195..7f940909 100644 --- a/lib/python/Screens/TimeDateInput.py +++ b/lib/python/Screens/TimeDateInput.py @@ -1,8 +1,7 @@ from Screen import Screen -from Components.config import * -from Components.ActionMap import ActionMap, NumberActionMap -from Components.ConfigList import ConfigList, ConfigListScreen -from Components.Button import Button +from Components.config import ConfigClock, ConfigDateTime, getConfigListEntry +from Components.ActionMap import NumberActionMap +from Components.ConfigList import ConfigListScreen from Components.Label import Label from Components.Pixmap import Pixmap import time diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index babf28fe..08bc12b3 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -1,6 +1,5 @@ from Components.ActionMap import ActionMap from Components.Button import Button -from Components.Label import Label from Components.MenuList import MenuList from Components.TimerList import TimerList, TimerEntryComponent from Components.TimerSanityCheck import TimerSanityCheck @@ -11,7 +10,7 @@ from Screens.MessageBox import MessageBox from ServiceReference import ServiceReference from TimerEntry import TimerEntry, TimerLog from Tools.BoundFunction import boundFunction -from time import * +from time import time class TimerEditList(Screen): def __init__(self, session): diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index a54358f5..cc43a9af 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -1,15 +1,13 @@ from Screen import Screen import ChannelSelection from ServiceReference import ServiceReference -from Components.config import ConfigSelection, ConfigText, ConfigSubList, ConfigSubsection, ConfigDateTime, ConfigClock, ConfigYesNo, getConfigListEntry -from Components.ActionMap import ActionMap, NumberActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.config import ConfigSelection, ConfigText, ConfigSubList, ConfigDateTime, ConfigClock, ConfigYesNo, getConfigListEntry +from Components.ActionMap import NumberActionMap +from Components.ConfigList import ConfigListScreen from Components.MenuList import MenuList from Components.Button import Button -from Components.NimManager import nimmanager from Components.Label import Label from Components.Pixmap import Pixmap -from Screens.MessageBox import MessageBox from Screens.ChoiceBox import ChoiceBox from RecordTimer import AFTEREVENT from enigma import eEPGCache diff --git a/lib/python/Screens/TutorialWizard.py b/lib/python/Screens/TutorialWizard.py index bab07f20..c90ed365 100644 --- a/lib/python/Screens/TutorialWizard.py +++ b/lib/python/Screens/TutorialWizard.py @@ -1,9 +1,7 @@ from Wizard import Wizard, wizardManager from Components.config import ConfigBoolean, config -from Components.Pixmap import * - -from LanguageSelection import LanguageSelection +from Components.Pixmap import MovingPixmap config.misc.firstruntutorial = ConfigBoolean(default = True) diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py index bd458273..1900e9a4 100644 --- a/lib/python/Screens/Wizard.py +++ b/lib/python/Screens/Wizard.py @@ -6,8 +6,7 @@ from Screens.HelpMenu import HelpableScreen from Components.config import config from Components.Label import Label from Components.Slider import Slider -from Components.ActionMap import HelpableActionMap, NumberActionMap -from Components.Pixmap import * +from Components.ActionMap import NumberActionMap from Components.MenuList import MenuList from Components.ConfigList import ConfigList |