Index: ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/control
===================================================================
--- ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/control	(revision 10827)
+++ ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/control	(revision 11129)
@@ -1,11 +1,13 @@
 Package: enigma2-plugin-browsers-zaphistorybrowser
 Version: 1.2
-Architecture: sh4
 OE: Zap History Browser 1.2 mod by MC_Ohr, Civer
 Section: browsers
 Priority: optional
 Maintainer: AAF-Forum
-Description: This plugin shows last channels visited for quck zapping.
+Architecture: sh4
+Description: This plugin shows last channels visited for quick zapping.
 Homepage: http://www.aaf-digital.info
 Depends:
 Source: http://www.aaf-digital.info
+
+
Index: ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/postinst
===================================================================
--- ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/postinst	(revision 10827)
+++ ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/postinst	(revision 11129)
@@ -1,4 +1,4 @@
 #!/bin/sh
-TMP=/tmp/.zaphistorybrowser
+TMP=/tmp/.browsers
 PLUGINDIR=/usr/lib/enigma2/python/Plugins/Extensions/
 
Index: ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/postrm
===================================================================
--- ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/postrm	(revision 10827)
+++ ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/postrm	(revision 11129)
@@ -1,4 +1,4 @@
 #!/bin/sh
-TMP=/tmp/.zaphistorybrowser
+TMP=/tmp/browsers
 PLUGINDIR=/usr/lib/enigma2/python/Plugins/Extensions/zaphistorybrowser
 rm -r $PLUGINDIR > /dev/null 2>&1
Index: ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/preinst
===================================================================
--- ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/preinst	(revision 10827)
+++ ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/preinst	(revision 11129)
@@ -1,5 +1,5 @@
 #!/bin/sh
 #
-TMP=/tmp/.skin
+TMP=/tmp/.browsers
 echo "syncing disk"
 sync
Index: ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/prerm
===================================================================
--- ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/prerm	(revision 10827)
+++ ipk/source/browsers_zaphistorybrowser_1_2/CONTROL/prerm	(revision 11129)
@@ -1,4 +1,4 @@
 #!/bin/sh
-TMP=/tmp/.zaphistorybrowser
+TMP=/tmp/.browsers
 echo "syncing disk"
 sync
Index: ipk/source/browsers_zaphistorybrowser_1_2/usr/lib/enigma2/python/Plugins/Extensions/zaphistorybrowser/plugin.py
===================================================================
--- ipk/source/browsers_zaphistorybrowser_1_2/usr/lib/enigma2/python/Plugins/Extensions/zaphistorybrowser/plugin.py	(revision 11129)
+++ ipk/source/browsers_zaphistorybrowser_1_2/usr/lib/enigma2/python/Plugins/Extensions/zaphistorybrowser/plugin.py	(revision 11129)
@@ -0,0 +1,136 @@
+##
+## Zap-History Browser
+## by AliAbdul
+## modded by MC_Ohr from AAF-Digital HD Forum
+##
+from Components.ActionMap import ActionMap
+from Components.Label import Label
+from Components.MenuList import MenuList
+from enigma import eServiceCenter
+from Plugins.Plugin import PluginDescriptor
+from Screens.Screen import Screen
+
+#--- Civer start Skindetection----
+from enigma import getDesktop
+
+global HDskin
+global KSskin
+HDskin = False
+KSskin = False
+try:
+	skin_w = getDesktop(0).size().width()
+	if skin_w == 1280:
+		HDskin = True
+		KSskin = False
+	elif skin_w == 1024:
+		HDskin = False
+		KSskin = True
+	else:
+		HDskin = False
+		KSskin = False
+except:
+	HDskin = False
+	KSskin = False
+#--- Civer end Skindetection----
+
+################################################
+
+class ZapHistoryBrowser(Screen):
+#--- Civer start (added skinKS and skinHD)----
+	skin = """
+	<screen position="200,80" size="320,440" title="Zap-History Browser" >
+		<ePixmap pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" transparent="1" alphatest="on" />
+		<ePixmap pixmap="skin_default/buttons/green.png" position="170,0" size="140,40" transparent="1" alphatest="on" />
+		<widget name="key_red" position="10,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#1f771f" transparent="1" />
+		<widget name="key_green" position="170,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#1f771f" transparent="1" />
+		<widget name="list" position="0,40" size="320,400" scrollbarMode="showOnDemand" />
+	</screen>"""
+	
+	skinKS = """
+	<screen position="352,80" size="320,440" title="Zap-History Browser" >
+		<ePixmap pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" transparent="1" alphatest="on" />
+		<ePixmap pixmap="skin_default/buttons/green.png" position="170,0" size="140,40" transparent="1" alphatest="on" />
+		<widget name="key_red" position="10,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#1f771f" transparent="1" />
+		<widget name="key_green" position="170,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#1f771f" transparent="1" />
+		<widget name="list" position="0,40" size="320,400" scrollbarMode="showOnDemand" />
+	</screen>"""
+	
+	skinHD = """
+	<screen position="480,140" size="320,440" title="Zap-History Browser" >
+		<ePixmap pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" transparent="1" alphatest="on" />
+		<ePixmap pixmap="skin_default/buttons/green.png" position="170,0" size="140,40" transparent="1" alphatest="on" />
+		<widget name="key_red" position="10,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#1f771f" transparent="1" />
+		<widget name="key_green" position="170,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#1f771f" transparent="1" />
+		<widget name="list" position="0,40" size="320,400" scrollbarMode="showOnDemand" />
+	</screen>"""
+#--- Civer end (added skinKS and skinHD)----
+
+	def __init__(self, session, servicelist):
+		#---- Civer start skindetection---
+		if HDskin:
+			self.skin = ZapHistoryBrowser.skinHD
+		elif KSskin:
+			self.skin = ZapHistoryBrowser.skinKS
+		else:
+			self.skin = ZapHistoryBrowser.skin
+#---- Civer end skindetection---
+		Screen.__init__(self, session)
+
+		self.servicelist = servicelist
+		self.serviceHandler = eServiceCenter.getInstance()
+
+		self["list"] = MenuList([])
+		self["key_red"] = Label(_("Clear"))
+		self["key_green"] = Label(_("Delete"))
+
+		self["actions"] = ActionMap(["OkCancelActions", "ColorActions"],
+			{
+				"ok": self.zap,
+				"cancel": self.close,
+				"red": self.clear,
+				"green": self.delete
+			}, prio=-1)
+
+		self.onLayoutFinish.append(self.buildList)
+
+	def buildList(self):
+		list = []
+		for x in self.servicelist.history:
+			if len(x) == 2:
+				#print "Single-Bouquet!!!"
+				ref = x[1]
+			else:
+				#print "Multi-Bouquet!!!"
+				ref = x[2]
+			info = self.serviceHandler.info(ref)
+			name = info.getName(ref).replace('\xc2\x86', '').replace('\xc2\x87', '')
+			list.append(name)
+		list.reverse()
+		self["list"].setList(list)
+
+	def zap(self):
+		length = len(self.servicelist.history)
+		if length > 0:
+			self.servicelist.history_pos = (length - self["list"].getSelectionIndex()) - 1
+			self.servicelist.setHistoryPath()
+			self.close()
+
+	def clear(self):
+		for i in range(0, len(self.servicelist.history)):
+			del self.servicelist.history[0]
+		self.buildList()
+
+	def delete(self):
+		length = len(self.servicelist.history)
+		if length > 0:
+			idx = (length - self["list"].getSelectionIndex()) - 1
+			del self.servicelist.history[idx]
+			self.buildList()
+
+################################################
+
+def main(session, servicelist, **kwargs):
+	session.open(ZapHistoryBrowser, servicelist)
+
+def Plugins(**kwargs):
+	return PluginDescriptor(name=_("Zap-History Browser"), where=PluginDescriptor.WHERE_EXTENSIONSMENU, fnc=main)
