X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fenigma2%2Fenigma2%2Fenigma2_vuplus_skin.patch;h=c7e78dd37ae278809b927301c0a2069526c3f618;hb=HEAD;hp=78c5f8e7963ed462840ac039df843ea502e1874b;hpb=0e6c5d97c12ae5eb100dc835a2ec6df30c9ebb95;p=vuplus_openvuplus
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
index 78c5f8e..c7e78dd 100644
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
@@ -1,5 +1,5 @@
diff --git a/configure.ac b/configure.ac
-index f11245a..87be088 100644
+index 332fc7a..ef30e71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,6 +134,16 @@ data/skin_default/menu/Makefile
@@ -81,10 +81,10 @@ index 0000000..20f24d9
+ *.png
diff --git a/data/750S/skin.xml b/data/750S/skin.xml
new file mode 100644
-index 0000000..356191e
+index 0000000..242a848
--- /dev/null
+++ b/data/750S/skin.xml
-@@ -0,0 +1,2841 @@
+@@ -0,0 +1,2894 @@
+
+
+
diff --git a/data/Makefile.am b/data/Makefile.am
index 0eaa082..869a16e 100644
@@ -2998,10 +3051,10 @@ index 0000000..9d4f458
+ *.png
diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml
new file mode 100644
-index 0000000..ccf3ae3
+index 0000000..c82df12
--- /dev/null
+++ b/data/Vu_HD/skin.xml
-@@ -0,0 +1,3377 @@
+@@ -0,0 +1,3494 @@
+
+
+
+
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
@@ -6393,15 +6563,15 @@ index 2f7e7c7..f81801a 100644
+ MyriadPro-Semibold.otf \
+ MyriadPro-SemiboldIt.otf
diff --git a/data/skin.xml b/data/skin.xml
-index ccd8eb7..9233610 100755
+index bbf4dd0..b99bdce 100755
--- a/data/skin.xml
+++ b/data/skin.xml
-@@ -150,11 +150,10 @@
+@@ -148,10 +148,10 @@
--
@@ -6486,29 +6656,28 @@ index fd33298..d8c1982 100644
png_destroy_read_struct(&png_ptr, &info_ptr,&end_info);
fclose(fp);
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
-index 688fe50..7bc66dc 100755
+index 688fe50..86a8e0c 100755
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -2,6 +2,8 @@ from Tools.Profile import profile
from Screen import Screen
from Components.Button import Button
-+# ikseong
++
+from Components.Label import Label
from Components.ServiceList import ServiceList
from Components.ActionMap import NumberActionMap, ActionMap, HelpableActionMap
from Components.MenuList import MenuList
-@@ -731,6 +733,9 @@ class ChannelSelectionBase(Screen):
+@@ -731,6 +733,8 @@ class ChannelSelectionBase(Screen):
self["key_yellow"] = Button(_("Provider"))
self["key_blue"] = Button(_("Favourites"))
-+ # ikseong
+ self["etitle"] = Label(_('Channel Selection'))
+
self["list"] = ServiceList()
self.servicelist = self["list"]
-@@ -876,25 +881,51 @@ class ChannelSelectionBase(Screen):
+@@ -876,25 +880,51 @@ class ChannelSelectionBase(Screen):
pos = titleStr.find(']')
if pos == -1:
pos = titleStr.find(')')
@@ -6526,7 +6695,7 @@ index 688fe50..7bc66dc 100755
- if end_ref is not None:
- if Len > 2:
- titleStr += '/../'
-+ # ikseong
++
+ if config.skin.primary_skin.value =="750S/skin.xml":
+ if pos != -1:
+ titleStr = titleStr[:pos+1]
@@ -6579,29 +6748,26 @@ index 688fe50..7bc66dc 100755
def moveUp(self):
self.servicelist.moveUp()
diff --git a/lib/python/Screens/FixedMenu.py b/lib/python/Screens/FixedMenu.py
-index 0122346..c877a19 100644
+index 0122346..39b48ac 100644
--- a/lib/python/Screens/FixedMenu.py
+++ b/lib/python/Screens/FixedMenu.py
-@@ -20,3 +20,10 @@ class FixedMenu(Screen):
+@@ -20,3 +20,8 @@ class FixedMenu(Screen):
})
self["title"] = StaticText(title)
-+ # ikseong
+ self["thistory"] = StaticText(title)
+ self["title0"] = StaticText('')
+ self["title1"] = StaticText('')
+ self["title2"] = StaticText('')
-+ #
+
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
-index 2a8801c..20403d8 100755
+index 2a8801c..fe5bcf0 100755
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
-@@ -22,6 +22,28 @@ from Screens.Setup import Setup, getSetupTitle
+@@ -22,6 +22,27 @@ from Screens.Setup import Setup, getSetupTitle
# read the menu
mdom = xml.etree.cElementTree.parse(resolveFilename(SCOPE_SKIN, 'menu.xml'))
-+# ikseong make menu title
+class title_History:
+ def __init__(self):
+ self.thistory = ''
@@ -6622,22 +6788,20 @@ index 2a8801c..20403d8 100755
+ self.thistory = result[0] + '> '
+
+t_history = title_History()
-+#
++
class boundFunction:
def __init__(self, fnc, *args):
self.fnc = fnc
-@@ -237,9 +259,41 @@ class Menu(Screen):
+@@ -237,9 +258,39 @@ class Menu(Screen):
a = a and _(a)
if a is None:
a = _(parent.get("text", "").encode("UTF-8"))
-+ # ikseong - enter Main menu
+ else:
+ t_history.reset()
+
self["title"] = StaticText(a)
self.menu_title = a
-+ # ikseong make menu title
+ self["thistory"] = StaticText(t_history.thistory)
+ history_len = len(t_history.thistory)
+ self["title0"] = StaticText('')
@@ -6668,24 +6832,20 @@ index 2a8801c..20403d8 100755
def keyNumberGlobal(self, number):
print "menu keyNumber:", number
# Calculate index
-@@ -250,9 +304,15 @@ class Menu(Screen):
+@@ -250,9 +301,11 @@ class Menu(Screen):
self.okbuttonClick()
def closeNonRecursive(self):
-+ # ikseong for menu title
+ t_history.reducehistory()
-+ #
self.close(False)
def closeRecursive(self):
-+ # ikseong for menu title
+ t_history.reset()
-+ #
self.close(True)
def createSummary(self):
diff --git a/skin.py b/skin.py
-index 19da203..f191530 100755
+index 19da203..e627ff8 100755
--- a/skin.py
+++ b/skin.py
@@ -50,7 +50,7 @@ def loadSkin(name, scope = SCOPE_SKIN):
@@ -6697,11 +6857,10 @@ index 19da203..f191530 100755
profile("LoadSkin")
try:
-@@ -133,6 +133,36 @@ def loadPixmap(path, desktop):
+@@ -133,6 +133,34 @@ def loadPixmap(path, desktop):
raise SkinError("pixmap file %s not found!" % (path))
return ptr
-+# ikseong
+from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, \
+ getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent
+pngcache = []
@@ -6723,23 +6882,22 @@ index 19da203..f191530 100755
+# print value
+ ptr = loadPixmap(value, desktop)
+ pngcache.append((value,ptr))
-+# ikseong
++
+try:
+ if config.skin.primary_skin.value == "750S/skin.xml" or config.skin.primary_skin.value == "Vu_HD/skin.xml":
+ cachemenu()
+except:
+ print "fail cache main menu"
-+#
+
def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1))):
# and set attributes
try:
-@@ -151,7 +181,15 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1)
+@@ -151,7 +179,15 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1)
elif attrib == 'itemHeight':
guiObject.setItemHeight(int(value))
elif attrib in ("pixmap", "backgroundPixmap", "selectionPixmap"):
- ptr = loadPixmap(value, desktop) # this should already have been filename-resolved.
-+#ikseong
++
+ global pngcache
+ ptr = None
+ for cvalue, cptr in pngcache:
@@ -6747,7 +6905,7 @@ index 19da203..f191530 100755
+ ptr=cptr
+ if ptr is None:
+ ptr = loadPixmap(value, desktop) # this should already have been filename-resolved.
-+#
++
if attrib == "pixmap":
guiObject.setPixmap(ptr)
elif attrib == "backgroundPixmap":