convert to new skin system

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index cd1596816f740b83577d5f211ed38e383d8a82c6..905d4558ffb37956f55edf93fed8792eb479aa9a 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -9,9 +9,7 @@ from Components.config import config, configElement, ConfigSubsection, configTex
 from Screens.FixedMenu import FixedMenu
 from Tools.NumericalTextInput import NumericalTextInput
 from Components.NimManager import nimmanager
 from Screens.FixedMenu import FixedMenu
 from Tools.NumericalTextInput import NumericalTextInput
 from Components.NimManager import nimmanager

-from Components.ServiceName import ServiceName

 from Components.Sources.Clock import Clock
 from Components.Sources.Clock import Clock

-from Components.EventInfo import EventInfo

 from Components.Input import Input
 from Screens.InputBox import InputBox
 from ServiceReference import ServiceReference
 from Components.Input import Input
 from Screens.InputBox import InputBox
 from ServiceReference import ServiceReference

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index ca126eda07360d4a2cb27a6f4d4e83f2da9c79de..372fad28f47d196320daa12968dfbe37e841fc25 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -7,8 +7,6 @@ from Screens.Ci import CiHandler
 from ServiceReference import ServiceReference
 
 from Components.Sources.Clock import Clock
 from ServiceReference import ServiceReference
 
 from Components.Sources.Clock import Clock

-from Components.Date import DateLabel
-from Components.ProviderName import ProviderName

 from Components.ActionMap import ActionMap, HelpableActionMap
 from Components.config import currentConfigSelectionElement, config
 
 from Components.ActionMap import ActionMap, HelpableActionMap
 from Components.config import currentConfigSelectionElement, config
 

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index f6f50b6dc30223e39d966dba0287fde456310e58..dd5aadecbe5fe3e7d1860c5bd6830634eaa9563e 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -3,7 +3,6 @@ from ChannelSelection import ChannelSelection, BouquetSelector
 from Components.ActionMap import ActionMap, HelpableActionMap
 from Components.ActionMap import NumberActionMap
 from Components.BlinkingPixmap import BlinkingPixmapConditional
 from Components.ActionMap import ActionMap, HelpableActionMap
 from Components.ActionMap import NumberActionMap
 from Components.BlinkingPixmap import BlinkingPixmapConditional

-from Components.Clock import Clock

 from Components.Harddisk import harddiskmanager
 from Components.Input import Input
 from Components.Label import *
 from Components.Harddisk import harddiskmanager
 from Components.Input import Input
 from Components.Label import *


@@ -15,6 +14,7 @@ from Components.Sources.CurrentService import CurrentService
 from Components.Sources.EventInfo import EventInfo
 from Components.Sources.FrontendStatus import FrontendStatus
 from Components.Sources.Boolean import Boolean
 from Components.Sources.EventInfo import EventInfo
 from Components.Sources.FrontendStatus import FrontendStatus
 from Components.Sources.Boolean import Boolean

+from Components.Sources.Clock import Clock

 from Components.TimerList import TimerEntryComponent
 from Components.config import config, configElement, ConfigSubsection, configSequence, configElementBoolean, configSelection, configElement_nonSave, getConfigListEntry
 from Components.config import configfile, configsequencearg
 from Components.TimerList import TimerEntryComponent
 from Components.config import config, configElement, ConfigSubsection, configSequence, configElementBoolean, configSelection, configElement_nonSave, getConfigListEntry
 from Components.config import configfile, configsequencearg


@@ -1543,14 +1543,18 @@ class InfoBarCueSheetSupport:
 class InfoBarSummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">
 class InfoBarSummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">

-               <widget name="Clock" position="50,46" size="82,18" font="Regular;16" />
-               <widget name="CurrentService" position="0,4" size="132,42" font="Regular;18" />
+               <widget source="CurrentTime" render="Label" position="50,46" size="82,18" font="Regular;16" >
+                       <convert type="ClockToText">WithSeconds</convert>
+               </widget>
+               <widget source="CurrentService" render="Label" position="0,4" size="132,42" font="Regular;18" >
+                       <convert type="ServiceName">Name</convert>
+               </widget>

        </screen>"""
 
        def __init__(self, session, parent):
                Screen.__init__(self, session)
                self["CurrentService"] = CurrentService(self.session.nav)
        </screen>"""
 
        def __init__(self, session, parent):
                Screen.__init__(self, session)
                self["CurrentService"] = CurrentService(self.session.nav)

-               self["Clock"] = Clock()
+               self["CurrentTime"] = Clock()

 
 class InfoBarSummarySupport:
        def __init__(self):
 
 class InfoBarSummarySupport:
        def __init__(self):

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 4d112abbecec4c2be01d3c9a52fa28699346c915..41818748c1d603a819d73b3e59ec77593937e7f8 100644 (file)
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,4 +1,4 @@
-from Screen import *
+from Screen import Screen

 from Components.Sources.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.Header import Header
 from Components.Sources.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.Header import Header


@@ -6,7 +6,7 @@ from Components.Button import Button
 from Components.Label import Label
 from Components.ProgressBar import ProgressBar
 from Components.config import configfile
 from Components.Label import Label
 from Components.ProgressBar import ProgressBar
 from Components.config import configfile

-from Components.Clock import Clock
+from Components.Sources.Clock import Clock

 
 from Tools.Directories import resolveFilename, SCOPE_SKIN
 
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN
 


@@ -20,11 +20,6 @@ from Screens.Setup import *
 
 from Tools import XMLTools
 
 
 from Tools import XMLTools
 

-# some screens
-def doGlobal(screen):
-       screen["clock"] = Clock()
-
-

 #              <item text="TV-Mode">self.setModeTV()</item>
 #              <item text="Radio-Mode">self.setModeRadio()</item>
 #              <item text="File-Mode">self.setModeFile()</item>
 #              <item text="TV-Mode">self.setModeTV()</item>
 #              <item text="Radio-Mode">self.setModeRadio()</item>
 #              <item text="File-Mode">self.setModeFile()</item>


@@ -80,14 +75,16 @@ class MenuSummary(Screen):
        <screen position="0,0" size="132,64">
                <widget name="MenuTitle" position="0,4" size="132,21" font="Regular;18" />
                <widget name="MenuEntry" position="0,25" size="132,21" font="Regular;16" />
        <screen position="0,0" size="132,64">
                <widget name="MenuTitle" position="0,4" size="132,21" font="Regular;18" />
                <widget name="MenuEntry" position="0,25" size="132,21" font="Regular;16" />

-               <widget name="Clock" position="50,46" size="82,18" font="Regular;16" />
+               <widget source="CurrentTime" render="Label" position="50,46" size="82,18" font="Regular;16" >
+                       <convert type="ClockToText">WithSeconds</convert>
+               </widget>

        </screen>"""
 
        def __init__(self, session, parent):
                Screen.__init__(self, session)
                self["MenuTitle"] = Label(parent.menu_title)
                self["MenuEntry"] = Label("")
        </screen>"""
 
        def __init__(self, session, parent):
                Screen.__init__(self, session)
                self["MenuTitle"] = Label(parent.menu_title)
                self["MenuEntry"] = Label("")

-               self["Clock"] = Clock()
+               self["CurrentTime"] = Clock()

                self.parent = parent
                self.onShow.append(self.addWatcher)
                self.onHide.append(self.removeWatcher)
                self.parent = parent
                self.onShow.append(self.addWatcher)
                self.onHide.append(self.removeWatcher)

diff --git a/lib/python/Screens/SimpleSummary.py b/lib/python/Screens/SimpleSummary.py
index bb3e1e3806615056220021ca550bc3784d951947..f4502a7628bdea84d5a2f3dce951ba9e05adb1cb 100644 (file)
--- a/lib/python/Screens/SimpleSummary.py
+++ b/lib/python/Screens/SimpleSummary.py
@@ -1,14 +1,16 @@
 from Screens.Screen import Screen
 from Screens.Screen import Screen

+from Components.Sources.Clock import Clock

 
 class SimpleSummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">
 
 class SimpleSummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">

-               <widget name="Clock" position="50,46" size="82,18" font="Regular;16" />
+               <widget name="Clock" position="50,46" size="82,18" font="Regular;16">
+                       <convert type="ClockToText">WithSeconds</convert>
+               </widget>

                <widget name="Title" position="0,4" size="132,42" font="Regular;18" />
        </screen>"""
        def __init__(self, session, root_screen):
                from Components.Label import Label
                <widget name="Title" position="0,4" size="132,42" font="Regular;18" />
        </screen>"""
        def __init__(self, session, root_screen):
                from Components.Label import Label

-               from Components.Clock import Clock

                Screen.__init__(self, session)
                self["Clock"] = Clock()
                self["Title"] = Label(root_screen.title)
                Screen.__init__(self, session)
                self["Clock"] = Clock()
                self["Title"] = Label(root_screen.title)