diff -Nru vdr-tft-pearlhd-0.3.1/debian/changelog vdr-tft-pearlhd-0.3.1/debian/changelog --- vdr-tft-pearlhd-0.3.1/debian/changelog 2010-01-23 15:50:09.000000000 +0000 +++ vdr-tft-pearlhd-0.3.1/debian/changelog 2010-03-04 09:04:26.000000000 +0000 @@ -1,3 +1,9 @@ +vdr-tft-pearlhd (0.3.1-4yavdr1) karmic; urgency=low + + * added mapovi changes http://vdrportal.de/board/thread.php?threadid=93838 + + -- Holger Schvestka Thu, 04 Mar 2010 10:03:32 +0100 + vdr-tft-pearlhd (0.3.1-3tvt1) karmic; urgency=low * moved skin folder from pearlhd to PearlHD diff -Nru vdr-tft-pearlhd-0.3.1/debian/patches/00list vdr-tft-pearlhd-0.3.1/debian/patches/00list --- vdr-tft-pearlhd-0.3.1/debian/patches/00list 2009-08-04 21:56:29.000000000 +0100 +++ vdr-tft-pearlhd-0.3.1/debian/patches/00list 2010-03-04 09:09:30.000000000 +0000 @@ -1 +1,2 @@ 01_epgimagepath +02_clausmuus diff -Nru vdr-tft-pearlhd-0.3.1/debian/patches/02_clausmuus.dpatch vdr-tft-pearlhd-0.3.1/debian/patches/02_clausmuus.dpatch --- vdr-tft-pearlhd-0.3.1/debian/patches/02_clausmuus.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ vdr-tft-pearlhd-0.3.1/debian/patches/02_clausmuus.dpatch 2010-03-04 09:11:28.000000000 +0000 @@ -0,0 +1,184 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_clausmuus.dpatch by +## http://vdrportal.de/board/thread.php?threadid=93838 +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad vdr-tft-pearlhd-0.3.1~/PearlHD.theme vdr-tft-pearlhd-0.3.1/PearlHD.theme +--- vdr-tft-pearlhd-0.3.1~/PearlHD.theme 2010-01-23 16:51:45.000000000 +0100 ++++ vdr-tft-pearlhd-0.3.1/PearlHD.theme 2010-03-04 10:08:31.662435049 +0100 +@@ -57,16 +57,16 @@ + + + [Volume] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +- Volumebar size=14,red=57, green=120, blue=159,x=75,y=150,width=650,height=150,bg_transparent=128,transparent=0,permanent=no,delay=4; +- Volumebar text=percent,red=57, green=120, blue=159,size=27,x=100,y=200,width=100,height=100,bg_transparent=0,transparent=0,permanent=no,delay=4; +- Volumebar x=100,y=170,width=600,height=40,switch=yes,red=57, green=120, blue=159,bg_red=160, bg_green=196, bg_blue=218,permanent=no,delay=4; +- VolumeMuteSymbol x=478,y=268,pathON=symbols/mute_on_avp.png,pathOFF=symbols/mute_off_avp.png,permanent=no,delay=4; ++// Volumebar size=14,red=57, green=120, blue=159,x=75,y=150,width=650,height=150,bg_transparent=128,transparent=0,permanent=no,delay=4; ++// Volumebar text=percent,red=57, green=120, blue=159,size=27,x=100,y=200,width=100,height=100,bg_transparent=0,transparent=0,permanent=no,delay=4; ++ Volumebar x=000,y=580,width=800,height=20,switch=yes,red=57, green=120, blue=159,bg_red=160, bg_green=196, bg_blue=218,permanent=no,delay=4; ++// VolumeMuteSymbol x=478,y=268,pathON=symbols/mute_on_avp.png,pathOFF=symbols/mute_off_avp.png,permanent=no,delay=4; ++ + +- + [OSD-Messages] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Message x=135,y=173,width=530,height=280,size=44,lines=4,dots=yes,red=0,green=0,blue=255,bg_x=0,bg_y=0,path=backgrounds/bg-message.jpg,delay=5; + +- ++ + [StandardHeader] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Defaults font=VDRSymbolsSans,size=27,red=255,green=255,blue=255,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0; + Text x=75,y=88,size=30,dots=yes,text={presentChannelNumber}. {presentChannelName},align=left,width=395,height=53,lines=1; +@@ -79,7 +79,7 @@ + + [StandardFooter] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Defaults font=VDRSymbolsSans,size=20,red=175,green=175,blue=175,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0; +- Image x=650,y=460,width=75,height=75,fit=yes,bg_transparent=100,aspect_ratio=yes,path=hqlogos/{presentChannelName}.png,on_click=Menu; ++// Image x=650,y=460,width=75,height=75,fit=yes,bg_transparent=100,aspect_ratio=yes,path=hqlogos/{presentChannelName}.png,on_click=Menu; + Text text={time/%H:%M} Uhr,x=75,y=470,width=300,height=100,red=255,green=255,blue=255,size=34; + Text text={time/%A. %d.%m.},x=335,y=487,width=300,height=100,size=22; + +@@ -156,7 +156,7 @@ + var varEventId = 0; + Defaults font=VDRSymbolsSans,size=27,red=255,green=255,blue=255,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0; + Background path=backgrounds/bg-tv.jpg; +- ++ + Text text={presentTitle},x=75,y=175,width=600,height=80,size=37,lines=1,dots=yes; + Text condition="{presentSubtitle}" != "",text={presentSubtitle},x=75,y=242,width=600,height=20,size=20,lines=1,dots=yes; + Text condition="{presentSubtitle}",text={presentStartTime/%H:%M} - {followingStartTime/%H:%M},x=75,y=470,width=600,height=45,size=20; +@@ -228,6 +228,7 @@ + // :{varImagesPath_1}{followingTitle}.jpg,fit=yes,aspect_ratio=yes; + #ifdef MOUSE_BUTTONS + Include=MouseButtons; ++ Image x=754,y=510,width=40,height=40,bg_width=40,delay=150,path=menu/mouse_btn/btn_xbmc_white.png,on_click=User2; + #endif + Include=Volume; + Include=StandardHeader; +@@ -486,7 +487,7 @@ + [Menu] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Include=MenuCommon; + Defaults menu_x=95,menu_y=173,menu_height=375,menu_width=600,font=VDRSymbolsSans,size=22,red=57, green=120, blue=159,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0,height=50; +- MenuNavigationArea x=95,y=170,width=600,height=350,on_dblclick=Ok; ++ MenuNavigationArea x=95,y=173,width=600,height=375,on_click=Ok; + Text x=75,y=88,dots=yes,text={menuTitle},width=600,height=53,lines=1,bg_transparent=0,red=255,green=255,blue=255,size=30; + + // Workaround +@@ -504,7 +505,7 @@ + [MenuTimers] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Include=MenuCommon; + Defaults menu_x=90,menu_y=173,menu_height=375,menu_width=600,font=VDRSymbolsSans,size=22,red=57, green=120, blue=159,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0,height=50; +- MenuNavigationArea y=90,x=50,width=800,height=425,on_dblclick=Ok; ++ MenuNavigationArea x=90,y=173,width=600,height=375,on_dblclick=Ok; + + Text x=75,y=88,dots=yes,text={menuTitle},width=600,height=53,lines=1,bg_transparent=0,red=255,green=255,blue=255,size=30; + // Workaround +@@ -533,7 +534,7 @@ + [MenuSetupPlugins] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Include=MenuCommon; + Defaults menu_x=90,menu_y=173,menu_height=375,menu_width=600,font=VDRSymbolsSans,size=22,red=57, green=120, blue=159,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0,height=50; +- MenuNavigationArea y=90,x=50,width=800,height=425,on_dblclick=Ok; ++ MenuNavigationArea x=90,y=173,width=600,height=375,on_dblclick=Ok; + + Text x=75,y=88,dots=yes,text={menuTitle},width=600,height=53,lines=1,bg_transparent=0,red=255,green=255,blue=255,size=30; + // Workaround +@@ -550,7 +551,7 @@ + [MenuSetupPage] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Include=MenuCommon; + Defaults menu_x=90,menu_y=173,menu_height=375,menu_width=600,font=VDRSymbolsSans,size=22,red=57, green=120, blue=159,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0,height=50; +- MenuNavigationArea y=90,x=50,width=800,height=425,on_dblclick=Ok; ++ MenuNavigationArea x=90,y=173,width=600,height=375,on_dblclick=Ok; + + Text x=75,y=88,dots=yes,text={menuTitle},width=600,height=53,lines=1,bg_transparent=0,red=255,green=255,blue=255,size=30; + // Workaround +@@ -569,7 +570,7 @@ + [MenuRecordings] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Include=MenuCommon; + Defaults menu_x=90,menu_y=173,menu_height=375,menu_width=600,font=VDRSymbolsSans,size=22,red=57, green=120, blue=159,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0,height=50; +- MenuNavigationArea y=175,x=75,width=600,height=430,on_dblclick=Ok; ++ MenuNavigationArea x=90,y=173,width=600,height=375,on_dblclick=Ok; + + Text x=75,y=88,dots=yes,text={menuTitle},width=600,height=53,lines=1,bg_transparent=0,red=255,green=255,blue=255,size=30; + // Workaround +@@ -596,7 +597,7 @@ + [MenuExtRecordings] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Include=MenuCommon; + Defaults menu_x=90,menu_y=173,menu_height=375,menu_width=600,font=VDRSymbolsSans,size=22,red=57, green=120, blue=159,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0,height=50; +- MenuNavigationArea y=175,x=75,width=600,height=430,on_dblclick=Ok; ++ MenuNavigationArea x=90,y=173,width=600,height=375,on_dblclick=Ok; + + Text x=75,y=88,dots=yes,text={menuTitle},width=600,height=53,lines=1,bg_transparent=0,red=255,green=255,blue=255,size=30; + // Workaround +@@ -623,7 +624,7 @@ + [MenuChannels] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Include=MenuCommon; + Defaults menu_x=90,menu_y=173,menu_height=375,menu_width=600,font=VDRSymbolsSans,size=22,red=57, green=120, blue=159,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0,height=50; +- MenuNavigationArea y=90,x=50,width=800,height=425,on_dblclick=Ok; ++ MenuNavigationArea x=90,y=173,width=600,height=375,on_dblclick=Ok; + + Text x=75,y=88,dots=yes,text={menuTitle},width=600,height=53,lines=1,bg_transparent=0,red=255,green=255,blue=255,size=30; + //HG +@@ -651,7 +652,7 @@ + [MenuEpgsSchedule] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Include=MenuCommon; + Defaults menu_x=90,menu_y=173,menu_height=375,menu_width=600,font=VDRSymbolsSans,size=22,red=57, green=120, blue=159,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0,height=50; +- MenuNavigationArea y=170,x=1,width=800,height=365,on_dblclick=Ok; ++ MenuNavigationArea x=90,y=173,width=600,height=375,on_dblclick=Ok; + + + Text x=75,y=70,size=16,width=620,height=90,text={selectedRowEventDescription},red=255,green=255,blue=255; +@@ -701,7 +702,7 @@ + [MenuEpgsWhatsOnElse] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Include=MenuCommon; + Defaults menu_x=90,menu_y=173,menu_height=375,menu_width=600,font=VDRSymbolsSans,size=22,red=57, green=120, blue=159,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0,height=50; +- MenuNavigationArea y=175,x=75,width=600,height=430,on_dblclick=Ok; ++ MenuNavigationArea x=90,y=173,width=600,height=375,on_dblclick=Ok; + + //Text x=75,y=88,dots=yes,text={menuTitle},width=600,height=53,lines=1,bg_transparent=0,red=255,green=255,blue=255,size=30; + Text x=75,y=70,size=16,width=620,height=90,text={selectedRowEventDescription},red=255,green=255,blue=255; +@@ -746,7 +747,7 @@ + [MenuEpgsWhatsOnNow] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Include=MenuCommon; + Defaults menu_x=90,menu_y=173,menu_height=375,menu_width=600,font=VDRSymbolsSans,size=22,red=57, green=120, blue=159,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0,height=50; +- MenuNavigationArea y=175,x=75,width=600,height=430,on_dblclick=Ok; ++ MenuNavigationArea x=90,y=173,width=600,height=375,on_dblclick=Ok; + + //Text x=75,y=88,dots=yes,text={menuTitle},width=600,height=53,lines=1,bg_transparent=0,red=255,green=255,blue=255,size=30; + Text x=75,y=70,size=16,width=620,height=90,text={selectedRowEventDescription},red=255,green=255,blue=255; +@@ -805,7 +806,6 @@ + [MenuArghDirector] ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Include=MenuCommon; + Defaults menu_y=90,menu_height=430,font=VDRSymbolsSans,size=20,red=255,green=255,blue=255,bg_red=0,bg_green=0,bg_blue=0,bg_transparent=0; +- // define the MenuNavigationArea + MenuNavigationArea y=90,x=1,width=800,height=430,on_dblclick=Ok; + + // Workaround +@@ -866,8 +866,8 @@ + Text text={eventStartTime/%a %d.%m},x=90,y=60,size=20,width=170,height=30,red=255,green=255,blue=255; + Text text={eventStartTime/%H:%M},x=90,y=100,size=20,width=80,height=30,red=255,green=255,blue=255; + Text text=-{eventEndTime/%H:%M},x=175,y=100,size=20,width=90,height=30,red=255,green=255,blue=255; +- Text text={eventTitle},x=285,y=60,width=500,height=40,red=255,green=255,blue=255; +- Text text={eventSubtitle},x=285,y=100,size=18,width=450,height=65,lines=2,red=255,green=255,blue=255; ++ Text text={eventTitle},x=285,y=60,width=450,height=40,lines=1,dots=yes,red=255,green=255,blue=255; ++ Text text={eventSubtitle},x=285,y=100,size=18,width=450,height=40,lines=1,red=255,green=255,blue=255; + //Image x=600,y=60,width=200,height=125, path={varEPGimagesPath_1}{eventID}.png: {varEPGimagesPath_2}{eventID}.png: {varEPGimagesPath_3}{eventID}.png: {varImagesPath_1}{eventTitle}.jpg: backgrounds/filmspule_tr.png, fit=yes,aspect_ratio=yes; + Text text={eventDescription},start_line={varStartLine},x=90,y=165,width=600,height=360,size=20,red=255,green=255,blue=255,whipe_res=28,on_up=varStartLine--,on_down=varStartLine++; + #ifdef MOUSE_BUTTONS +@@ -928,8 +928,14 @@ + Defaults bg_transparent=0,foreground=yes,red=57, green=120, blue=159; + + Image x=003,y=510,width=40,height=40,bg_width=40,delay=150,path=menu/mouse_btn/btn_keyb_white.png,on_click=varTouchMenu:0:1; ++ Image x=003,y=460,width=40,height=40,bg_width=40,delay=150,path=menu/mouse_btn/btn_menu_white.png,on_click=Menu; + +- ++ MenuButtonBackgroundRed condition={varHideColorButtons} = 1,x=7,y=555,width=192,height=43,pathON=menu/button-red.png,on_click=Red; ++ MenuButtonBackgroundGreen condition={varHideColorButtons} = 1,x=205,y=555,width=192,height=43,pathON=menu/button-green.png,on_click=Green; ++ MenuButtonBackgroundYellow condition={varHideColorButtons} = 1,x=403,y=555,width=192,height=43,pathON=menu/button-yellow.png,on_click=Yellow; ++ MenuButtonBackgroundBlue condition={varHideColorButtons} = 1,x=601,y=555,width=192,height=43,pathON=menu/button-blue.png,on_click=Blue; ++ ++ + //Basisblock + //{varHideColorButtons} = 0 -> Farbtasten anzeigen + //{varHideColorButtons} = 1 -> Farbtasten nicht anzeigen