diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/keymap.xml | 12 | ||||
| -rwxr-xr-x | data/radio.mvi | bin | 0 -> 74876 bytes | |||
| -rw-r--r-- | data/rass_logo.png | 0 | ||||
| -rw-r--r-- | data/rass_page1.png | 0 | ||||
| -rw-r--r-- | data/rass_page2.png | 0 | ||||
| -rw-r--r-- | data/rass_page3.png | 0 | ||||
| -rw-r--r-- | data/rass_page4.png | 0 | ||||
| -rw-r--r-- | data/skin.xml | 77 | ||||
| -rw-r--r-- | data/skin_default.xml | 79 |
10 files changed, 108 insertions, 62 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index c866eacd..ed26ec5c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,4 +5,4 @@ SUBDIRS = countries fonts defaults extensions installdir = $(DATADIR)/enigma2 install_DATA = \ - *.xml *.png encoding.conf + *.xml *.png encoding.conf radio.mvi diff --git a/data/keymap.xml b/data/keymap.xml index 835c5218..5c0cb54b 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -300,6 +300,18 @@ <key id="KEY_TEXT" mapto="startTeletext" flags="m" /> </map> + <map context="InfobarRdsActions"> + <key id="KEY_TEXT" mapto="startRassInteractive" flags="m" /> + </map> + + <map context="RassInteractiveActions"> + <key id="KEY_LEFT" mapto="prevSubPage" flags="mr" /> + <key id="KEY_RIGHT" mapto="nextSubPage" flags="mr" /> + <key id="KEY_UP" mapto="prevPage" flags="mr" /> + <key id="KEY_DOWN" mapto="nextPage" flags="mr" /> + <key id="KEY_EXIT" mapto="exit" flags="m" /> + </map> + <map context="ChannelSelectBaseActions"> <key id="KEY_RED" mapto="showAllServices" flags="m" /> <key id="KEY_GREEN" mapto="showSatellites" flags="m" /> diff --git a/data/radio.mvi b/data/radio.mvi Binary files differnew file mode 100755 index 00000000..bbd8016e --- /dev/null +++ b/data/radio.mvi diff --git a/data/rass_logo.png b/data/rass_logo.png new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/data/rass_logo.png diff --git a/data/rass_page1.png b/data/rass_page1.png new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/data/rass_page1.png diff --git a/data/rass_page2.png b/data/rass_page2.png new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/data/rass_page2.png diff --git a/data/rass_page3.png b/data/rass_page3.png new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/data/rass_page3.png diff --git a/data/rass_page4.png b/data/rass_page4.png new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/data/rass_page4.png diff --git a/data/skin.xml b/data/skin.xml index 36f73255..cf2d2c73 100644 --- a/data/skin.xml +++ b/data/skin.xml @@ -45,18 +45,13 @@ <font filename="ae_AlMateen.ttf" name="Replacement" scale="90" replacement="1" /> </fonts> - <screen name="InfoBar" flags="wfNoBorder" position="0,330" size="720,198" title="InfoBar" backgroundColor="transparent" > - - <widget source="RadioText" render="Label" position="50,0" size="620,50" font="LCD;25" backgroundColor="transparent"> - <convert type="RadioText">RadioText</convert> - </widget> - - <ePixmap position="0,50" zPosition="-1" size="720,148" pixmap="info-bg.png" /> + <screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,148" title="InfoBar" backgroundColor="transparent" > + <ePixmap position="0,0" zPosition="-1" size="720,148" pixmap="info-bg.png" /> <!-- not used in this skin yet --> - <widget name="NimA" position="0,50" size="0,0" /> - <widget name="NimB" position="0,50" size="0,0" /> - <widget name="NimA_Active" position="0,50" size="0,0" /> - <widget name="NimB_Active" position="0,50" size="0,0" /> + <widget name="NimA" position="0,0" size="0,0" /> + <widget name="NimB" position="0,0" size="0,0" /> + <widget name="NimA_Active" position="0,0" size="0,0" /> + <widget name="NimB_Active" position="0,0" size="0,0" /> <!-- 'teletext available' <widget source="CurrentService" render="Pixmap" pixmap="format.png" position="613,40" size="28,15"> @@ -66,113 +61,113 @@ --> <!-- ............................................................................. --> - <eLabel text="SNR:" position="195,50" size="40,22" font="Regular;15" transparent="1" /> - <eLabel text="AGC:" position="275,50" size="40,22" font="Regular;15" transparent="1" /> - <eLabel text="BER:" position="355,50" size="40,22" font="Regular;15" transparent="1" /> + <eLabel text="SNR:" position="195,0" size="40,22" font="Regular;15" transparent="1" /> + <eLabel text="AGC:" position="275,0" size="40,22" font="Regular;15" transparent="1" /> + <eLabel text="BER:" position="355,0" size="40,22" font="Regular;15" transparent="1" /> - <widget source="FrontendStatus" render="Label" position="232,50" size="40,22" font="Regular;15" transparent="1" > + <widget source="FrontendStatus" render="Label" position="232,0" size="40,22" font="Regular;15" transparent="1" > <convert type="FrontendInfo">SNR</convert> </widget> - <widget source="FrontendStatus" render="Label" position="314,50" size="40,22" font="Regular;15" transparent="1" > + <widget source="FrontendStatus" render="Label" position="314,0" size="40,22" font="Regular;15" transparent="1" > <convert type="FrontendInfo">AGC</convert> </widget> - <widget source="FrontendStatus" render="Label" position="392,50" size="53,22" font="Regular;15" transparent="1" > + <widget source="FrontendStatus" render="Label" position="392,0" size="53,22" font="Regular;15" transparent="1" > <convert type="FrontendInfo">BER</convert> </widget> - <widget source="FrontendStatus" render="Progress" position="447,51" size="88,6" pixmap="rtgbar.png" > + <widget source="FrontendStatus" render="Progress" position="447,1" size="88,6" pixmap="rtgbar.png" > <convert type="FrontendInfo">SNR</convert> </widget> - <widget source="FrontendStatus" render="Progress" position="447,58" size="88,6" pixmap="rtgbar.png" > + <widget source="FrontendStatus" render="Progress" position="447,8" size="88,6" pixmap="rtgbar.png" > <convert type="FrontendInfo">AGC</convert> </widget> - <widget source="FrontendStatus" render="Progress" position="447,65" size="88,6" > + <widget source="FrontendStatus" render="Progress" position="447,15" size="88,6" > <convert type="FrontendInfo">BER</convert> </widget> - <widget name="BlinkingPoint" pixmap="record.png" position="430,81" zPosition="2" size="58,25" alphatest="on" /> + <widget name="BlinkingPoint" pixmap="record.png" position="430,31" zPosition="2" size="58,25" alphatest="on" /> <!-- show 'is crypted' icon when service is crypted. --> - <widget source="CurrentService" render="Pixmap" pixmap="crypt.png" position="570,90" size="12,15" > + <widget source="CurrentService" render="Pixmap" pixmap="crypt.png" position="570,40" size="12,15" > <convert type="ServiceInfo">IsCrypted</convert> <convert type="ConditionalShowHide" /> </widget> <!-- show 'multichannel' icon when service has multichannel audio. --> - <widget source="CurrentService" render="Pixmap" pixmap="dolby.png" position="585,90" size="25,15"> + <widget source="CurrentService" render="Pixmap" pixmap="dolby.png" position="585,40" size="25,15"> <convert type="ServiceInfo">IsMultichannel</convert> <convert type="ConditionalShowHide" /> </widget> - <widget source="CurrentService" render="Pixmap" pixmap="format.png" position="613,90" size="28,15"> + <widget source="CurrentService" render="Pixmap" pixmap="format.png" position="613,40" size="28,15"> <convert type="ServiceInfo">IsWidescreen</convert> <convert type="ConditionalShowHide" /> </widget> - <widget source="CurrentService" render="Label" position="69,76" size="427,34" font="Regular;22" backgroundColor="#101258" > + <widget source="CurrentService" render="Label" position="69,26" size="427,34" font="Regular;22" backgroundColor="#101258" > <convert type="ServiceName">Name</convert> <!-- <convert type="ServiceName">Provider</convert> --> </widget> - <widget source="CurrentTime" render="Label" position="575,60" size="90,30" backgroundColor="dark" font="Regular;19" > + <widget source="CurrentTime" render="Label" position="575,10" size="90,30" backgroundColor="dark" font="Regular;19" > <convert type="ClockToText">WithSeconds</convert> </widget> - <widget source="Event_Now" render="Label" position="210,118" size="60,22" font="Regular;20" backgroundColor="dark"> + <widget source="Event_Now" render="Label" position="210,68" size="60,22" font="Regular;20" backgroundColor="dark"> <convert type="EventTime">StartTime</convert> <convert type="ClockToText">Default</convert> </widget> - <widget source="Event_Next" render="Label" position="210,148" size="60,22" font="Regular;20" backgroundColor="dark"> + <widget source="Event_Next" render="Label" position="210,98" size="60,22" font="Regular;20" backgroundColor="dark"> <convert type="EventTime">StartTime</convert> <convert type="ClockToText">Default</convert> </widget> - <widget source="Event_Now" render="Label" position="273,118" size="282,22" font="Regular;20" backgroundColor="dark"> + <widget source="Event_Now" render="Label" position="273,68" size="282,22" font="Regular;20" backgroundColor="dark"> <convert type="EventName">Name</convert> </widget> - <widget source="Event_Next" render="Label" position="273,148" size="282,22" font="Regular;20" backgroundColor="dark"> + <widget source="Event_Next" render="Label" position="273,98" size="282,22" font="Regular;20" backgroundColor="dark"> <convert type="EventName">Name</convert> </widget> - <widget source="Event_Now" render="Label" position="555,118" size="100,26" font="Regular;22" backgroundColor="dark" halign="right"> + <widget source="Event_Now" render="Label" position="555,68" size="100,26" font="Regular;22" backgroundColor="dark" halign="right"> <convert type="EventTime">Remaining</convert> <convert type="RemainingToText">InMinutes</convert> </widget> - <widget source="Event_Next" render="Label" position="555,148" size="100,26" font="Regular;22" backgroundColor="dark" halign="right"> + <widget source="Event_Next" render="Label" position="555,98" size="100,26" font="Regular;22" backgroundColor="dark" halign="right"> <convert type="EventTime">Duration</convert> <convert type="ClockToText">InMinutes</convert> </widget> - <widget source="Event_Now" render="Progress" position="304,110" size="121,8" zPosition="1"> + <widget source="Event_Now" render="Progress" position="304,60" size="121,8" zPosition="1"> <convert type="EventTime">Progress</convert> </widget> <!-- red button: is recording possible? --> - <widget source="RecordingPossible" render="Pixmap" pixmap="button_red.png" position="210,182" size="27,12" > + <widget source="RecordingPossible" render="Pixmap" pixmap="button_red.png" position="210,132" size="27,12" > <convert type="ConditionalShowHide" /> </widget> - <widget source="RecordingPossible" render="FixedLabel" text="Record" position="240,180" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1"> + <widget source="RecordingPossible" render="FixedLabel" text="Record" position="240,130" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1"> <convert type="ConditionalShowHide" /> </widget> - <widget source="CurrentService" render="Pixmap" pixmap="button_green.png" position="320,182" size="27,12" > + <widget source="CurrentService" render="Pixmap" pixmap="button_green.png" position="320,132" size="27,12" > <convert type="ServiceInfo">SubservicesAvailable</convert> <convert type="ConditionalShowHide" /> </widget> - <widget source="CurrentService" render="FixedLabel" text="Subservices" position="350,180" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1" > + <widget source="CurrentService" render="FixedLabel" text="Subservices" position="350,130" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1" > <convert type="ServiceInfo">SubservicesAvailable</convert> <convert type="ConditionalShowHide" /> </widget> - <widget source="TimeshiftPossible" render="Pixmap" pixmap="button_yellow.png" position="430,182" size="27,12" > + <widget source="TimeshiftPossible" render="Pixmap" pixmap="button_yellow.png" position="430,132" size="27,12" > <convert type="ConditionalShowHide" /> </widget> - <widget source="TimeshiftPossible" render="FixedLabel" text="Timeshift" position="460,180" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1" > + <widget source="TimeshiftPossible" render="FixedLabel" text="Timeshift" position="460,130" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1" > <convert type="ConditionalShowHide" /> </widget> - <widget source="ExtensionsAvailable" render="Pixmap" pixmap="button_blue.png" position="540,182" size="27,12" > + <widget source="ExtensionsAvailable" render="Pixmap" pixmap="button_blue.png" position="540,132" size="27,12" > <convert type="ConditionalShowHide" /> </widget> - <widget source="ExtensionsAvailable" render="FixedLabel" text="Extensions" position="570,180" size="95,22" font="Regular;14" backgroundColor="blue" transparent="1" > + <widget source="ExtensionsAvailable" render="FixedLabel" text="Extensions" position="570,130" size="95,22" font="Regular;14" backgroundColor="blue" transparent="1" > <convert type="ConditionalShowHide" /> </widget> </screen> diff --git a/data/skin_default.xml b/data/skin_default.xml index 4bdc5c16..65e810d9 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -3,8 +3,7 @@ <font filename="lcd.ttf" name="LCD" scale="100" /> </fonts> - <screen name="Standby" flags="wfNoBorder" position="0,0" size="720,576" title="Standby"> - </screen> + <screen name="Standby" flags="wfNoBorder" position="0,0" size="720,576" title="Standby" /> <screen name="Menu" position="210,150" size="300,285" title="Main menu"> <widget name="title" position="10,10" size="280,35" font="Regular;23" /> <!--<widget name="menu" position="10,55" size="280,150" font="Regular;23" />--> @@ -18,8 +17,7 @@ <screen name="ChannelContextMenu" position="210,150" size="300,250" title="Channellist menu"> <widget name="menu" position="10,10" size="300,230" scrollbarMode="showOnDemand" /> </screen> - <screen name="Scart" position="0,0" size="720,576"> - </screen> + <screen name="Scart" position="0,0" size="720,576" /> <screen name="MediaPlayer" position="104,83" size="512,442" title="MediaPlayer"> <eLabel position="11,9" zPosition="1" size="359,78" backgroundColor="#182C40" /> <widget name="artisttext" position="13,11" zPosition="3" size="65,17" font="Regular;16" valign="top" foregroundColor="#cccccc" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-2,-2"/> @@ -75,7 +73,7 @@ <widget name="model" position="20,10" size="380,25" font="Regular;23" /> <widget name="capacity" position="20,40" size="380,25" font="Regular;23" /> <widget name="bus" position="20,70" size="380,25" font="Regular;23" /> - <widget name="initialize" position="150,120" zPosition="1" size="120,30" pixmap="init.png" transparent="1" alphatest="on" /> + <widget name="initialize" position="150,120" zPosition="1" size="120,30" pixmap="init.png" transparent="1" alphatest="on" /> <widget name="initializetext" position="150,120" size="120,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" /> </screen> <screen name="Setup" position="90,148" size="540,280" title="Setup"> @@ -248,41 +246,43 @@ <widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" /> <widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" /> <widget name="list" position="0,45" size="560,196" scrollbarMode="showOnDemand" /> - <widget source="RadioText" render="Label" position="0,241" size="560,66" font="LCD;25" > - <convert type="RadioText">RadioText</convert> + <widget source="RdsDecoder" render="Label" position="0,241" size="560,66" font="LCD;25" > + <convert type="RdsInfo">RadioText</convert> </widget> </screen> <screen name="RadioInfoBar" position="90,420" size="560,105" zPosition="-1"> <widget source="CurrentService" render="Label" position="0,0" size="390,26" font="Regular;22" backgroundColor="dark" > <convert type="ServiceName">Name</convert> </widget> - <widget name="BlinkingPoint" pixmap="record.png" position="400,0" zPosition="2" size="58,25" /> <widget source="CurrentTime" render="Label" position="465,0" size="95,28" font="Regular;22" backgroundColor="dark" > <convert type="ClockToText">WithSeconds</convert> </widget> <widget source="Event_Now" render="Progress" position="465,27" size="90,9" zPosition="1" borderWidth="2" > <convert type="EventTime">Progress</convert> </widget> - <widget source="Event_Now" render="Label" position="0,44" size="60,22" font="Regular;20" backgroundColor="dark" > - <convert type="EventTime">StartTime</convert> - <convert type="ClockToText">Default</convert> + <widget source="RdsDecoder" render="Pixmap" pixmap="rass_logo.png" position="0,27" size="50,21" > + <convert type="RdsInfo">RasInteractiveAvailable</convert> + <convert type="ConditionalShowHide" /> </widget> - <widget source="Event_Next" render="Label" position="0,74" size="60,22" font="Regular;20" backgroundColor="dark" > + <widget source="Event_Now" render="Label" position="0,49" size="60,22" font="Regular;20" backgroundColor="dark" > <convert type="EventTime">StartTime</convert> <convert type="ClockToText">Default</convert> </widget> - <widget source="Event_Now" render="Label" position="80,44" size="380,22" font="Regular;20" backgroundColor="dark" > - <convert type="EventName">Name</convert> - </widget> - <widget source="Event_Next" render="Label" position="80,74" size="380,22" font="Regular;20" backgroundColor="dark" > + <widget source="Event_Now" render="Label" position="80,49" size="380,22" font="Regular;20" backgroundColor="dark" > <convert type="EventName">Name</convert> </widget> - - <widget source="Event_Now" render="Label" position="470,44" size="150,22" font="Regular;20" backgroundColor="dark" > + <widget source="Event_Now" render="Label" position="470,49" size="150,22" font="Regular;20" backgroundColor="dark" > <convert type="EventTime">Remaining</convert> <convert type="RemainingToText">InMinutes</convert> </widget> - <widget source="Event_Next" render="Label" position="470,74" size="150,22" font="Regular;20" backgroundColor="dark" > + <widget source="Event_Next" render="Label" position="80,79" size="380,22" font="Regular;20" backgroundColor="dark" > + <convert type="EventName">Name</convert> + </widget> + <widget source="Event_Next" render="Label" position="0,79" size="60,22" font="Regular;20" backgroundColor="dark" > + <convert type="EventTime">StartTime</convert> + <convert type="ClockToText">Default</convert> + </widget> + <widget source="Event_Next" render="Label" position="470,79" size="150,22" font="Regular;20" backgroundColor="dark" > <convert type="EventTime">Duration</convert> <convert type="ClockToText">InMinutes</convert> </widget> @@ -331,11 +331,50 @@ <screen name="PictureInPicture" position="400,60" size="240,192" zPosition="-1" flags="wfNoBorder" > <widget name="video" position="0,0" size="240,192" /> </screen> - <screen name="SubtitleDisplay" position="0,0" size="720,568" zPosition="-1" flags="wfNoBorder" > + + <screen name="SubtitleDisplay" position="0,0" size="720,568" zPosition="-1" flags="wfNoBorder" /> + + <colors> + <color name="rds_bg" value="#77ffffff" /> + <color name="rds_fg" value="#000000" /> + <color name="rds_text_bg" value="#003258" /> + </colors> + + <screen name="RdsInfoDisplay" backgroundColor="transparent" position="0,0" size="720,568" zPosition="-2" flags="wfNoBorder" > + <widget name="RadioText" backgroundColor="rds_text_bg" position="50,481" size="620,29" font="Regular;21" noWrap="1" shadowOffset="-2,-2" shadowColor="transpBlack" /> + <widget name="RtpText" backgroundColor="rds_text_bg" position="50,510" size="620,29" font="Regular;21" halign="right" noWrap="1" shadowOffset="-2,-2" shadowColor="transpBlack" /> + <widget name="RassLogo" pixmap="rass_logo.png" position="50,445" size="50,21" /> </screen> + + <screen name="RassInteractive" backgroundColor="rds_bg" position="50,180" size="100,275" flags="wfNoBorder" > + <ePixmap pixmap="rass_logo.png" position="0,0" size="100,21" /> + <eLabel text="Index" position="36,25" size="60,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <eLabel text="0" position="5,25" size="16,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <widget name="Marker" position="21,25" size="16,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <eLabel text="1" position="5,50" size="16,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <widget name="subpages_1" position="35,50" size="36,20" alphatest="on" /> + <eLabel text="2" position="5,75" size="16,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <widget name="subpages_2" position="35,75" size="36,20" alphatest="on" /> + <eLabel text="3" position="5,100" size="16,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <widget name="subpages_3" position="35,100" size="36,20" alphatest="on" /> + <eLabel text="4" position="5,125" size="16,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <widget name="subpages_4" position="35,125" size="36,20" alphatest="on" /> + <eLabel text="5" position="5,150" size="16,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <widget name="subpages_5" position="35,150" size="36,20" alphatest="on" /> + <eLabel text="6" position="5,175" size="16,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <widget name="subpages_6" position="35,175" size="36,20" alphatest="on" /> + <eLabel text="7" position="5,200" size="16,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <widget name="subpages_7" position="35,200" size="36,20" alphatest="on" /> + <eLabel text="8" position="5,225" size="16,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <widget name="subpages_8" position="35,225" size="36,20" alphatest="on" /> + <eLabel text="9" position="5,250" size="16,25" font="Regular;21" foregroundColor="rds_fg" backgroundColor="rds_bg" /> + <widget name="subpages_9" position="35,250" size="36,20" alphatest="on" /> + </screen> + <screen name="PiPSetup" backgroundColor="transparent" position="70,400" size="600,150" title="PiPSetup" flags="wfNoBorder"> <widget name="text" position="0,0" size="600,150" font="Regular;23" /> </screen> + <screen name="MovieSelection" position="90,78" size="560,455" title="Select a movie"> <widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" /> <widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" /> |
