Merge branch 'master' of git.opendreambox.org:/git/enigma2

4 files changed, 24 insertions, 13 deletions

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
 
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)
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 = [