From 7a421f3ff2dad0150148880a71d6542ab87589bd Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 13 Feb 2009 19:45:39 +0100 Subject: fix typo --- lib/python/Screens/TimerEdit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/python/Screens') diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index cdff4c5b..6499ef50 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -273,7 +273,7 @@ class TimerEditList(Screen): else: success = True else: - succsess = True + success = True if success: print "Sanity check passed" self.session.nav.RecordTimer.timeChanged(entry) -- cgit v1.2.3 From 2b80914bdd9aada1797f450bbb9089f6d9bb5740 Mon Sep 17 00:00:00 2001 From: ghost Date: Sat, 14 Feb 2009 14:56:17 +0100 Subject: make factory reset description translatable --- data/menu.xml | 13 +++++-------- lib/python/Screens/FactoryReset.py | 9 +++++++++ lib/python/Screens/Makefile.am | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 lib/python/Screens/FactoryReset.py (limited to 'lib/python/Screens') diff --git a/data/menu.xml b/data/menu.xml index 7dc764ac..56b3ee65 100644 --- a/data/menu.xml +++ b/data/menu.xml @@ -82,20 +82,17 @@ self.session.open(DefaultWizard, silent = False) - -from Screens.MessageBox import MessageBox + +from Screens.FactoryReset import FactoryReset def msgClosed(ret): if ret: from os import system, _exit system("rm -R /etc/enigma2") system("cp -R /usr/share/enigma2/defaults /etc/enigma2") _exit(0) - -self.session.openWithCallback(msgClosed, MessageBox, _("When you do a factory reset, you will lose ALL your configuration data\n" - "(including bouquets, services, satellite data ...)\n" - "After completion of factory reset, your receiver will restart automatically!\n\n" - "Really do a factory reset?"), MessageBox.TYPE_YESNO) - +self.session.openWithCallback(msgClosed, FactoryReset) + + diff --git a/lib/python/Screens/FactoryReset.py b/lib/python/Screens/FactoryReset.py new file mode 100644 index 00000000..ce5aaeb3 --- /dev/null +++ b/lib/python/Screens/FactoryReset.py @@ -0,0 +1,9 @@ +from Screens.MessageBox import MessageBox + +class FactoryReset(MessageBox): + def __init__(self, session): + MessageBox.__init__(self, session, _("When you do a factory reset, you will lose ALL your configuration data\n" + "(including bouquets, services, satellite data ...)\n" + "After completion of factory reset, your receiver will restart automatically!\n\n" + "Really do a factory reset?"), MessageBox.TYPE_YESNO) + self.skinName = "MessageBox" \ No newline at end of file diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am index 00204a94..ca67f73d 100755 --- a/lib/python/Screens/Makefile.am +++ b/lib/python/Screens/Makefile.am @@ -14,5 +14,5 @@ install_PYTHON = \ SubtitleDisplay.py SubservicesQuickzap.py ParentalControlSetup.py NumericalTextInputHelpDialog.py \ SleepTimerEdit.py Ipkg.py RdsDisplay.py Globals.py DefaultWizard.py \ SessionGlobals.py LocationBox.py WizardLanguage.py TaskView.py Rc.py VirtualKeyBoard.py \ - TextBox.py + TextBox.py FactoryReset.py -- cgit v1.2.3 From 40181f9c63bd5fb1f4b7f24e1ab18caf19fb598b Mon Sep 17 00:00:00 2001 From: ghost Date: Sun, 15 Feb 2009 14:42:44 +0100 Subject: use LoadPixmap with cached instead of global loadPNG (to optimize enigma2 startup time) --- lib/python/Screens/VirtualKeyBoard.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'lib/python/Screens') diff --git a/lib/python/Screens/VirtualKeyBoard.py b/lib/python/Screens/VirtualKeyBoard.py index 53970ab8..5dc1a090 100755 --- a/lib/python/Screens/VirtualKeyBoard.py +++ b/lib/python/Screens/VirtualKeyBoard.py @@ -5,19 +5,10 @@ from Components.Label import Label from Components.Pixmap import Pixmap from Components.MenuList import MenuList from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest -from enigma import eListboxPythonMultiContent, gFont, loadPNG, RT_HALIGN_CENTER, RT_VALIGN_CENTER +from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_CENTER, RT_VALIGN_CENTER from Screen import Screen from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE - -key_backspace = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_backspace.png")) -key_bg = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_bg.png")) -key_clr = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_clr.png")) -key_esc = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_esc.png")) -key_ok = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_ok.png")) -key_sel = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_sel.png")) -key_shift = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift.png")) -key_shift_sel = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift_sel.png")) -key_space = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_space.png")) +from Tools.LoadPixmap import LoadPixmap class VirtualKeyBoardList(MenuList): def __init__(self, list, enableWrapAround=False): @@ -26,6 +17,16 @@ class VirtualKeyBoardList(MenuList): self.l.setItemHeight(45) def VirtualKeyBoardEntryComponent(keys, selectedKey,shiftMode=False): + key_backspace = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_backspace.png")) + key_bg = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_bg.png")) + key_clr = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_clr.png")) + key_esc = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_esc.png")) + key_ok = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_ok.png")) + key_sel = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_sel.png")) + key_shift = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift.png")) + key_shift_sel = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift_sel.png")) + key_space = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_space.png")) + res = [ (keys) ] x = 0 @@ -116,6 +117,7 @@ class VirtualKeyBoard(Screen): [u"Q", u"W", u"E", u"R", u"T", u"Z", u"U", u"I", u"O", u"P", u"É", u"*"], [u"A", u"S", u"D", u"F", u"G", u"H", u"J", u"K", u"L", u"Ö", u"Ä", u"'"], [u">", u"Y", u"X", u"C", u"V", u"B", u"N", u"M", u";", u":", u"_", u"CLEAR"], + [u"SHIFT", u"SPACE", u"?", u"\\", u"Å", u"OK"]] else: self.keys_list = [ -- cgit v1.2.3