X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/574f425cc1ebece0aa5f09fb77a8cb7ad0310a1f..ac2878879847f965225e0f72c22ad17b513c16e6:/lib/python/Screens/Setup.py?ds=sidebyside
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
old mode 100644
new mode 100755
index 7226562f..61e6fdd7
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -3,8 +3,8 @@ from Components.ActionMap import NumberActionMap
from Components.config import config, ConfigNothing
from Components.SystemInfo import SystemInfo
from Components.ConfigList import ConfigListScreen
-from Components.Label import Label
-from Components.Pixmap import Pixmap
+from Components.Sources.StaticText import StaticText
+from enigma import eEnv
import xml.etree.cElementTree
@@ -15,7 +15,7 @@ try:
setupfile = file('data/setup.xml', 'r')
except:
# if not found in the current path, we use the global datadir-path
- setupfile = file('/usr/share/enigma2/setup.xml', 'r')
+ setupfile = file(eEnv.resolve('${datadir}/enigma2/setup.xml'), 'r')
setupdom = xml.etree.cElementTree.parse(setupfile)
setupfile.close()
@@ -27,26 +27,21 @@ class SetupError(Exception):
return self.msg
class SetupSummary(Screen):
- skin = """
-
-
-
-
- """
def __init__(self, session, parent):
+
Screen.__init__(self, session, parent = parent)
- self["SetupTitle"] = Label(_(parent.setup_title))
- self["SetupEntry"] = Label("")
- self["SetupValue"] = Label("")
+ self["SetupTitle"] = StaticText(_(parent.setup_title))
+ self["SetupEntry"] = StaticText("")
+ self["SetupValue"] = StaticText("")
self.onShow.append(self.addWatcher)
self.onHide.append(self.removeWatcher)
-
+
def addWatcher(self):
self.parent.onChangedEntry.append(self.selectionChanged)
self.parent["config"].onSelectionChanged.append(self.selectionChanged)
self.selectionChanged()
-
+
def removeWatcher(self):
self.parent.onChangedEntry.remove(self.selectionChanged)
self.parent["config"].onSelectionChanged.remove(self.selectionChanged)
@@ -77,7 +72,6 @@ class Setup(ConfigListScreen, Screen):
def __init__(self, session, setup):
Screen.__init__(self, session)
-
# for the skin: first try a setup_, then Setup
self.skinName = ["setup_" + setup, "Setup" ]
@@ -88,13 +82,9 @@ class Setup(ConfigListScreen, Screen):
self.refill(list)
#check for list.entries > 0 else self.close
- self["title"] = Label(_(self.setup_title))
+ self["key_red"] = StaticText(_("Cancel"))
+ self["key_green"] = StaticText(_("OK"))
- self["oktext"] = Label(_("OK"))
- self["canceltext"] = Label(_("Cancel"))
- self["ok"] = Pixmap()
- self["cancel"] = Pixmap()
-
self["actions"] = NumberActionMap(["SetupActions"],
{
"cancel": self.keyCancel,
@@ -104,6 +94,10 @@ class Setup(ConfigListScreen, Screen):
ConfigListScreen.__init__(self, list, session = session, on_change = self.changedEntry)
self.changedEntry()
+ self.onLayoutFinish.append(self.layoutFinished)
+
+ def layoutFinished(self):
+ self.setTitle(_(self.setup_title))
# for summary:
def changedEntry(self):