diff options
Diffstat (limited to 'data')
21 files changed, 424 insertions, 7 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 84a59897..67f2ad25 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = countries fonts defaults extensions skin_default +SUBDIRS = countries fonts defaults extensions skin_default dm800se dist_pkgdata_DATA = \ defaultsatlists.xml \ diff --git a/data/defaults/Dream/Makefile.am b/data/defaults/Dream/Makefile.am index 31ba1c69..cda55835 100644 --- a/data/defaults/Dream/Makefile.am +++ b/data/defaults/Dream/Makefile.am @@ -4,10 +4,12 @@ installdir = $(pkgdatadir)/defaults/Dream dist_install_DATA = \ bouquets.tv \ + dm800se.info \ dm500hd.info \ dm7025.info \ dm8000.info \ dm800.info \ + settings.800se \ settings.500hd \ settings.7025 \ settings.800 \ diff --git a/data/defaults/Dream/dm800se.info b/data/defaults/Dream/dm800se.info new file mode 100644 index 00000000..6974b120 --- /dev/null +++ b/data/defaults/Dream/dm800se.info @@ -0,0 +1,26 @@ +<default> + <prerequisites> + <!-- hardware can occur more than once --> + <hardware type="dm800se" /> + </prerequisites> + + <info> + <author>Dream Multimedia GmbH</author> + <name>Dream Multimedia Default</name> + </info> + + <!-- available types: "directories" --> + <files type="directories"> + <!--file type="skin" directory="test_skin/" flag="default" name="Default Skin" /--> + <file type="config" name="settings.800se" /> + <!--file type="services" name="lamedb.192"> + <prerequisites> + <bcastsystem type="DVB-S" /> + <satellite type="192" /> + </prerequisites> + </file--> + <file type="favourites" directory="" name="bouquets.tv" /> + <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" /> + <!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /--> + </files> +</default> diff --git a/data/defaults/Dream/settings.800se b/data/defaults/Dream/settings.800se new file mode 100644 index 00000000..ae2963bb --- /dev/null +++ b/data/defaults/Dream/settings.800se @@ -0,0 +1 @@ +config.misc.rcused=1
\ No newline at end of file diff --git a/data/dm800se/Makefile.am b/data/dm800se/Makefile.am new file mode 100644 index 00000000..11eb2d00 --- /dev/null +++ b/data/dm800se/Makefile.am @@ -0,0 +1,4 @@ +installdir = $(pkgdatadir)/dm800se + +dist_install_DATA = \ + skin.xml diff --git a/data/dm800se/skin.xml b/data/dm800se/skin.xml new file mode 100644 index 00000000..e5ff26cd --- /dev/null +++ b/data/dm800se/skin.xml @@ -0,0 +1,366 @@ +<skin> + <!-- Screwed Stone II skin (skin.xml) /Nemesis --> + <output id="0"> + <resolution xres="720" yres="576" bpp="32" /> + </output> + <!-- Colors (#AARRGGBB) --> + <colors> + <color name="white" value="#ffffff" /> + <color name="black" value="#000000" /> + <color name="dark" value="#25062748" /> + <color name="menu" value="#25062748" /> + <color name="red" value="#f23d21" /> + <color name="green" value="#389416" /> + <color name="blue" value="#0064c7" /> + <color name="yellow" value="#bab329" /> + <color name="transparent" value="#ffffffff" /> + <color name="transpBlack" value="#80000000" /> + <color name="transpWhite" value="#80ffffff" /> + <color name="background" value="#25062748" /> + <color name="foreground" value="#ffffff" /> + </colors> + + <!-- Main screen colors (id=0 Framebuffer) --> + <windowstyle type="skinned" id="0"> + <title offset="33,14" font="Regular;20" /> + <color name="Background" color="#25062748" /> + <color name="LabelForeground" color="#ffffff" /> + <color name="ListboxBackground" color="#25062748" /> + <color name="ListboxForeground" color="#ffffff" /> + <color name="ListboxSelectedBackground" color="#254f7497" /> + <color name="ListboxSelectedForeground" color="#ffffff" /> + <color name="ListboxMarkedBackground" color="#ff0000" /> + <color name="ListboxMarkedForeground" color="#ffffff" /> + <color name="ListboxMarkedAndSelectedBackground" color="#800000" /> + <color name="ListboxMarkedAndSelectedForeground" color="#ffffff" /> + <color name="WindowTitleForeground" color="#ffffff" /> + <color name="WindowTitleBackground" color="#25062748" /> + <!-- Main screen border png's --> + <borderset name="bsWindow"> + <pixmap pos="bpTopLeft" filename="skin_default/b_tl.png" /> + <pixmap pos="bpTop" filename="skin_default/b_t.png" /> + <pixmap pos="bpTopRight" filename="skin_default/b_tr.png" /> + <pixmap pos="bpLeft" filename="skin_default/b_l.png" /> + <pixmap pos="bpRight" filename="skin_default/b_r.png" /> + <pixmap pos="bpBottomLeft" filename="skin_default/b_bl.png" /> + <pixmap pos="bpBottom" filename="skin_default/b_b.png" /> + <pixmap pos="bpBottomRight" filename="skin_default/b_br.png" /> + </borderset> + </windowstyle> + <!-- Main screen colors (id=1 LCD) --> + <windowstyle type="skinned" id="1"> + <color name="Background" color="#000000" /> + <color name="LabelForeground" color="#ffffff" /> + <color name="ListboxBackground" color="#000000" /> + <color name="ListboxForeground" color="#ffffff" /> + <color name="ListboxSelectedBackground" color="#000000" /> + <color name="ListboxSelectedForeground" color="#ffffff" /> + <color name="ListboxMarkedBackground" color="#000000" /> + <color name="ListboxMarkedForeground" color="#ffffff" /> + <color name="ListboxMarkedAndSelectedBackground" color="#000000" /> + <color name="ListboxMarkedAndSelectedForeground" color="#ffffff" /> + <color name="WindowTitleForeground" color="#ffffff" /> + <color name="WindowTitleBackground" color="#000000" /> + </windowstyle> + <!-- Fonts --> + <fonts> + <!-- <font filename="md_khmurabi_10.ttf" name="Regular" scale="90" /> --> + <font filename="nmsbd.ttf" name="Regular" scale="90" /> + <font filename="lcd.ttf" name="LCD" scale="100" /> + <font filename="ae_AlMateen.ttf" name="Replacement" scale="90" replacement="1" /> + <font filename="tuxtxt.ttf" name="Console" scale="100" /> + </fonts> + <!-- Subtitle effects --> + <subtitles> + <sub name="Subtitle_TTX" font="Regular;30" shadowColor="#40101010" shadowOffset="3,3" /> + <sub name="Subtitle_Regular" font="Regular;30" foregroundColor="#DCDCDC" shadowColor="#40101010" shadowOffset="3,3" /> + <sub name="Subtitle_Bold" font="Replacement;30" foregroundColor="#DCDCDC" shadowColor="#40101010" shadowOffset="3,3" /> + <sub name="Subtitle_Italic" font="Regular;30" foregroundColor="#DCAAAA" shadowColor="#40101010" shadowOffset="3,3" /> + <!-- omitting foregroundColor attribute will enable auto-assignment of color --> + </subtitles> + <!-- Main infobar --> + <screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent"> + <!-- Background --> + <ePixmap position="0,0" zPosition="-1" size="720,160" pixmap="skin_default/info-bg.png" /> + <ePixmap position="27,73" size="665,71" pixmap="skin_default/screws.png" alphatest="on" transparent="1" /> + <!-- Signal Quality --> + <eLabel text="SNR" position="205,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" /> + <widget source="session.FrontendStatus" render="Label" position="242,3" size="80,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1"> + <convert type="FrontendInfo">SNRdB</convert> + </widget> + <!-- Bit error rate --> + <eLabel text="BER" position="317,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" noWrap="1" /> + <widget source="session.FrontendStatus" render="Label" position="355,3" size="43,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" noWrap="1"> + <convert type="FrontendInfo">BER</convert> + </widget> + <!-- Channellogo (Picon) --> + <widget source="session.CurrentService" render="Picon" position="49,4" zPosition="1" size="70,53" alphatest="on"> + <convert type="ServiceName">Reference</convert> + </widget> + <!-- Service name --> + <widget source="session.CurrentService" render="Label" position="130,30" size="360,27" font="Regular;21" valign="center" halign="right" noWrap="1" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> + <convert type="ServiceName">Name</convert> + </widget> + <!-- Time --> + <ePixmap pixmap="skin_default/icons/clock.png" position="600,23" size="14,14" alphatest="on" /> + <widget source="global.CurrentTime" render="Label" position="615,21" size="55,24" font="Regular;21" halign="right" backgroundColor="#4e5a74" transparent="1"> + <convert type="ClockToText">Default</convert> + </widget> + <!-- tuners in use? --> + <widget source="session.FrontendInfo" render="Pixmap" position="142,6" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on"> + <convert type="FrontendInfo">NUMBER</convert> + <convert type="ValueRange">0,0</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="session.FrontendInfo" render="Pixmap" position="142,19" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on"> + <convert type="FrontendInfo">NUMBER</convert> + <convert type="ValueRange">1,1</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="session.FrontendInfo" render="Pixmap" position="142,32" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on"> + <convert type="FrontendInfo">NUMBER</convert> + <convert type="ValueRange">2,2</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="session.FrontendInfo" render="Pixmap" position="142,45" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on"> + <convert type="FrontendInfo">NUMBER</convert> + <convert type="ValueRange">3,3</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="session.TunerInfo" render="FixedLabel" text="A" position="129,4" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1"> + <convert type="TunerInfo">TunerUseMask</convert> + <convert type="ValueBitTest">1</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="session.TunerInfo" render="FixedLabel" text="B" position="129,17" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1"> + <convert type="TunerInfo">TunerUseMask</convert> + <convert type="ValueBitTest">2</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="session.TunerInfo" render="FixedLabel" text="C" position="129,30" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1"> + <convert type="TunerInfo">TunerUseMask</convert> + <convert type="ValueBitTest">4</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="session.TunerInfo" render="FixedLabel" text="D" position="129,43" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1"> + <convert type="TunerInfo">TunerUseMask</convert> + <convert type="ValueBitTest">8</convert> + <convert type="ConditionalShowHide" /> + </widget> + <!-- Crypt icon (encrypted service?) --> + <ePixmap position="563,48" zPosition="0" size="107,15" pixmap="skin_default/icons/icons_off.png" /> + <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/icon_crypt.png" position="563,48" zPosition="1" size="12,16" alphatest="on"> + <convert type="ServiceInfo">IsCrypted</convert> + <convert type="ConditionalShowHide" /> + </widget> + <!-- Teletext icon (is teletext available?) --> + <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/icon_txt.png" position="580,48" zPosition="1" size="26,16" alphatest="on"> + <convert type="ServiceInfo">HasTelext</convert> + <convert type="ConditionalShowHide" /> + </widget> + <!-- Videoformat icon (16:9?) --> + <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/icon_format.png" position="611,48" zPosition="1" size="29,16" alphatest="on"> + <convert type="ServiceInfo">IsWidescreen</convert> + <convert type="ConditionalShowHide" /> + </widget> + <!-- Audio icon (is there multichannel audio?) --> + <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/icon_dolby.png" position="645,48" zPosition="1" size="26,16" alphatest="on"> + <convert type="ServiceInfo">IsMultichannel</convert> + <convert type="ConditionalShowHide" /> + </widget> + <!-- Progressbar (current event duration)--> + <ePixmap pixmap="skin_default/progress_bg.png" position="48,77" size="84,7" transparent="1" alphatest="on" /> + <widget source="session.Event_Now" render="Progress" pixmap="skin_default/progress_small.png" position="50,78" zPosition="1" size="80,5" transparent="1"> + <convert type="EventTime">Progress</convert> + </widget> + <!-- Blinking pixmap (recording in progress?) --> + <ePixmap pixmap="skin_default/icons/icon_rec_off.png" position="561,21" size="34,21" /> + <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/icon_rec.png" position="561,21" zPosition="1" size="34,21"> + <convert type="ConditionalShowHide">Blink</convert> + </widget> + <!-- Event (now) --> + <ePixmap pixmap="skin_default/icons/icon_event.png" position="182,78" size="15,10" alphatest="on" /> + <widget source="session.Event_Now" render="Label" position="205,73" size="60,24" font="Regular;20" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> + <convert type="EventTime">StartTime</convert> + <convert type="ClockToText">Default</convert> + </widget> + <widget source="session.Event_Now" render="Label" position="265,73" size="320,24" font="Regular;20" noWrap="1" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> + <convert type="EventName">Name</convert> + </widget> + <widget source="session.Event_Now" render="Label" position="585,73" size="85,24" font="Regular;20" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" halign="right" transparent="1"> + <convert type="EventTime">Remaining</convert> + <convert type="RemainingToText">InMinutes</convert> + </widget> + <!-- Event (next) --> + <widget source="session.Event_Next" render="Label" position="205,97" size="60,24" font="Regular;20" backgroundColor="#071f38" foregroundColor="#c3c3c9" transparent="1"> + <convert type="EventTime">StartTime</convert> + <convert type="ClockToText">Default</convert> + </widget> + <widget source="session.Event_Next" render="Label" position="265,97" size="320,24" font="Regular;20" noWrap="1" backgroundColor="#071f38" foregroundColor="#c3c3c9" transparent="1"> + <convert type="EventName">Name</convert> + </widget> + <widget source="session.Event_Next" render="Label" position="585,97" size="85,24" font="Regular;20" backgroundColor="#071f38" foregroundColor="#c3c3c9" halign="right" transparent="1"> + <convert type="EventTime">Duration</convert> + <convert type="ClockToText">InMinutes</convert> + </widget> + <!-- Red button (is recording possible?) --> + <ePixmap pixmap="skin_default/buttons/button_red_off.png" position="212,130" size="15,16" alphatest="on" /> + <widget source="RecordingPossible" render="Pixmap" pixmap="skin_default/buttons/button_red.png" position="212,130" zPosition="1" size="15,16" alphatest="on"> + <convert type="ConditionalShowHide" /> + </widget> + <!--eLabel text="Record" position="232,130" size="80,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" /--> + <widget source="ShowRecordOnRed" render="FixedLabel" text="Record" position="232,130" zPosition="1" size="80,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1"> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="RecordingPossible" render="FixedLabel" text="Record" position="232,130" zPosition="1" size="80,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> + <convert type="ConditionalShowHide" /> + </widget> + <!-- Green button (is subservices available?) --> + <ePixmap pixmap="skin_default/buttons/button_green_off.png" position="315,130" size="15,16" alphatest="on" /> + <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/buttons/button_green.png" position="315,130" zPosition="1" size="15,16" alphatest="on"> + <convert type="ServiceInfo">SubservicesAvailable</convert> + <convert type="ConditionalShowHide" /> + </widget> + <eLabel text="Subservices" position="335,130" size="100,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" /> + <widget source="session.CurrentService" render="FixedLabel" text="Subservices" position="335,130" zPosition="1" size="100,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> + <convert type="ServiceInfo">SubservicesAvailable</convert> + <convert type="ConditionalShowHide" /> + </widget> + <!-- Yellow button (is timeshift possible?) --> + <ePixmap pixmap="skin_default/buttons/button_yellow_off.png" position="440,130" size="15,16" alphatest="on" /> + <widget source="TimeshiftPossible" render="Pixmap" pixmap="skin_default/buttons/button_yellow.png" position="440,130" zPosition="1" size="15,16" alphatest="on"> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="ShowTimeshiftOnYellow" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" shadowOffset="-1,-1" transparent="1"> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="TimeshiftPossible" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> + <convert type="ConditionalShowHide" /> + </widget> + + <!-- Yellow button (used for audio on boxes with new rc?) --> + <widget source="ShowAudioOnYellow" render="Pixmap" pixmap="skin_default/buttons/button_yellow.png" position="440,130" zPosition="1" size="15,16" alphatest="on"> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="ShowAudioOnYellow" render="FixedLabel" text="Audio" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> + <convert type="ConditionalShowHide" /> + </widget> + <!-- Blue button (is extensions available?) --> + <ePixmap pixmap="skin_default/buttons/button_blue_off.png" position="545,130" size="15,16" alphatest="on" /> + <widget source="ExtensionsAvailable" render="Pixmap" pixmap="skin_default/buttons/button_blue.png" position="545,130" zPosition="1" size="15,16" alphatest="on"> + <convert type="ConditionalShowHide" /> + </widget> + <eLabel text="Extensions" position="565,130" size="110,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" /> + <widget source="ExtensionsAvailable" render="FixedLabel" text="Extensions" position="565,130" zPosition="1" size="110,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> + <convert type="ConditionalShowHide" /> + </widget> + </screen> + <!-- Main menu --> + <screen name="menu_mainmenu" position="center,center" size="380,285" title="Main menu"> + <widget source="title" render="Label" position="170,10" size="200,35" font="Regular;23" /> + <widget source="menu" render="Listbox" position="170,55" size="200,225" scrollbarMode="showOnDemand"> + <convert type="StringList" /> + </widget> + <widget source="menu" render="Pixmap" pixmap="skin_default/menu/shutdown.png" position="20,20" size="128,128" alphatest="on"> + <convert type="MenuEntryCompare">standby_restart_list</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="menu" render="Pixmap" pixmap="skin_default/menu/setup.png" position="20,20" size="128,128" alphatest="on"> + <convert type="MenuEntryCompare">setup_selection</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="menu" render="Pixmap" pixmap="skin_default/menu/plugins.png" position="20,20" size="128,128" alphatest="on"> + <convert type="MenuEntryCompare">plugin_selection</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="menu" render="Pixmap" pixmap="skin_default/menu/information.png" position="20,20" size="128,128" alphatest="on"> + <convert type="MenuEntryCompare">info_screen</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="menu" render="Pixmap" pixmap="skin_default/menu/scart.png" position="20,20" size="128,128" alphatest="on"> + <convert type="MenuEntryCompare">scart_switch</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="menu" render="Pixmap" pixmap="skin_default/menu/timer.png" position="20,20" size="128,128" alphatest="on"> + <convert type="MenuEntryCompare">timer_edit</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="menu" render="Pixmap" pixmap="skin_default/menu/media_player.png" position="20,20" size="128,128" alphatest="on"> + <convert type="MenuEntryCompare">media_player</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="menu" render="Pixmap" pixmap="skin_default/menu/dvd_player.png" position="20,20" size="128,128" alphatest="on"> + <convert type="MenuEntryCompare">dvd_player</convert> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="menu" render="Pixmap" pixmap="skin_default/menu/subtitles.png" position="20,20" size="128,128" alphatest="on"> + <convert type="MenuEntryCompare">subtitle_selection</convert> + <convert type="ConditionalShowHide"/> + </widget> + </screen> + <!-- Movieplayer infobar --> + <screen name="MoviePlayer" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent"> + <!-- Background --> + <ePixmap position="0,0" pixmap="skin_default/info-bg_mp.png" zPosition="-1" size="720,160" /> + <ePixmap position="29,40" pixmap="skin_default/screws_mp.png" size="665,104" alphatest="on" /> + <!-- colorbuttons --> + <ePixmap position="48,70" pixmap="skin_default/icons/mp_buttons.png" size="108,13" alphatest="on" /> + <!-- Servicename --> + <ePixmap pixmap="skin_default/icons/icon_event.png" position="207,78" size="15,10" alphatest="on" /> + <widget source="session.CurrentService" render="Label" position="230,73" size="360,40" font="Regular;20" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> + <convert type="ServiceName">Name</convert> + </widget> + <!-- movie length --> + <widget source="session.CurrentService" render="Label" position="580,73" size="90,24" font="Regular;20" halign="right" backgroundColor="#4e5a74" transparent="1"> + <convert type="ServicePosition">Length</convert> + </widget> + <!-- Elapsed time --> + <widget source="session.CurrentService" render="Label" position="205,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> + <convert type="ServicePosition">Position</convert> + </widget> + <!-- Progressbar (movie position)--> + <widget source="session.CurrentService" render="PositionGauge" position="300,133" size="270,10" zPosition="2" pointer="skin_default/position_pointer.png:540,0" transparent="1" foregroundColor="#20224f"> + <convert type="ServicePosition">Gauge</convert> + </widget> + <!-- Remaining time --> + <widget source="session.CurrentService" render="Label" position="576,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1"> + <convert type="ServicePosition">Remaining,Negate</convert> + </widget> + </screen> + + <!-- LCD screen (main) --> + <screen name="InfoBarSummary" position="0,0" size="132,64"> + <widget source="session.CurrentService" render="Label" position="3,0" size="90,25" font="Regular;14" halign="center" valign="center" > + <convert type="ServiceName">Name</convert> + </widget> + <widget source="session.Event_Now" render="Progress" position="8,27" size="80,5" borderWidth="1"> + <convert type="EventTime">Progress</convert> + </widget> + <widget source="global.CurrentTime" render="Label" position="3,32" size="65,32" font="Regular;26" halign="right" valign="top"> + <convert type="ClockToText">Format:%H:%M</convert> + </widget> + <widget source="global.CurrentTime" render="Label" position="70,34" zPosition="1" size="26,30" font="Regular;14" valign="top"> + <convert type="ClockToText">Format:%S</convert> + </widget> + <widget source="session.RecordState" render="FixedLabel" text=" " position="6,30" zPosition="1" size="120,34"> + <convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert> + <convert type="ConditionalShowHide">Blink</convert> + </widget> + </screen> + + <!-- LCD screen (channelselection) --> + <screen name="ChannelSelection_summary" position="0,0" size="132,64"> + <widget source="parent.ServiceEvent" render="Label" position="3,0" size="90,25" font="Regular;14" halign="center" valign="center" > + <convert type="ServiceName">Name</convert> + </widget> + <widget source="parent.ServiceEvent" render="Progress" position="8,27" size="80,5" borderWidth="1"> + <convert type="EventTime">Progress</convert> + </widget> + <widget source="global.CurrentTime" render="Label" position="3,32" size="65,32" font="Regular;26" halign="right" valign="top"> + <convert type="ClockToText">Format:%H:%M</convert> + </widget> + <widget source="global.CurrentTime" render="Label" position="70,34" zPosition="1" size="26,30" font="Regular;14" valign="top"> + <convert type="ClockToText">Format:%S</convert> + </widget> + </screen> +</skin> diff --git a/data/setup.xml b/data/setup.xml index 705eaf33..f5dea734 100644..100755 --- a/data/setup.xml +++ b/data/setup.xml @@ -72,6 +72,7 @@ <item level="2" text="Behavior of 0 key in PiP-mode">config.usage.pip_zero_button</item> <item level="2" text="Alternative services tuner priority">config.usage.alternatives_priority</item> <item level="2" text="Limited character set for recording filenames">config.recording.ascii_filenames</item> + <item level="2" text="Composition of the recording filenames">config.recording.filename_composition</item> </setup> <setup key="harddisk" title="Harddisk setup" > <item level="0" text="Harddisk standby after">config.usage.hdd_standby</item> diff --git a/data/skin_default.xml b/data/skin_default.xml index 396515e9..9fb2fc27 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -616,7 +616,19 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" /> <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" /> <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" /> - <widget name="list" position="5,50" size="550,280" scrollbarMode="showOnDemand" zPosition="10"/> + <widget source="list" render="Listbox" position="5,50" size="550,280" zPosition="10" scrollbarMode="showOnDemand"> + <convert type="TemplatedMultiContent"> <!-- iface, name, description, interfacepng, defaultpng, activepng, divpng --> + {"template": [ + MultiContentEntryText(pos = (85, 6), size = (440, 28), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_TOP, text = 1), # index 1 is the interfacename + MultiContentEntryText(pos = (85, 43), size = (440, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_BOTTOM, text = 2), # index 2 is the description + MultiContentEntryPixmapAlphaTest(pos = (2, 8), size = (54, 54), png = 3), # index 3 is the interface pixmap + MultiContentEntryPixmapAlphaTest(pos = (63, 46), size = (15, 16), png = 4), # index 4 is the default pixmap + ], + "fonts": [gFont("Regular", 28),gFont("Regular", 20)], + "itemHeight": 70 + } + </convert> + </widget> <ePixmap pixmap="skin_default/div-h.png" position="0,340" zPosition="1" size="560,2" /> <widget source="introduction" render="Label" position="0,350" size="560,50" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" /> </screen> diff --git a/data/skin_default/Makefile.am b/data/skin_default/Makefile.am index 6038c2e9..30b04f91 100755 --- a/data/skin_default/Makefile.am +++ b/data/skin_default/Makefile.am @@ -33,8 +33,6 @@ dist_install_DATA = \ expanded-plugins.png \ info-bg_mp.png \ info-bg.png \ - lock.png \ - lockBouquet.png \ mediaplayer_bg.png \ mute.png \ nim_active.png \ @@ -55,8 +53,6 @@ dist_install_DATA = \ timeline-now.png \ timeline.png \ unhandled-key.png \ - unlock.png \ - unlockBouquet.png \ verticalline-plugins.png \ vkey_backspace.png \ vkey_bg.png \ diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am index 8e2052b0..61c00593 100644..100755 --- a/data/skin_default/icons/Makefile.am +++ b/data/skin_default/icons/Makefile.am @@ -32,8 +32,15 @@ dist_install_DATA = \ lock_off.png \ lock_on.png \ lock.png \ + lockBouquet.png \ marker.png \ mp_buttons.png \ + network_wired.png \ + network_wired-active.png \ + network_wired-inactive.png \ + network_wireless.png \ + network_wireless-active.png \ + network_wireless-inactive.png \ plugin.png \ rass_logo.png \ rass_page1.png \ @@ -47,4 +54,6 @@ dist_install_DATA = \ scan-c.png \ scan-s.png \ scan-t.png \ - selectioncross.png + selectioncross.png \ + unlock.png \ + unlockBouquet.png diff --git a/data/skin_default/icons/lock.png b/data/skin_default/icons/lock.png Binary files differindex cfee1ba8..d0ae7f64 100644 --- a/data/skin_default/icons/lock.png +++ b/data/skin_default/icons/lock.png diff --git a/data/skin_default/lockBouquet.png b/data/skin_default/icons/lockBouquet.png Binary files differindex d503dd2b..d503dd2b 100644 --- a/data/skin_default/lockBouquet.png +++ b/data/skin_default/icons/lockBouquet.png diff --git a/data/skin_default/icons/network_wired-active.png b/data/skin_default/icons/network_wired-active.png Binary files differnew file mode 100755 index 00000000..d8efc9c8 --- /dev/null +++ b/data/skin_default/icons/network_wired-active.png diff --git a/data/skin_default/icons/network_wired-inactive.png b/data/skin_default/icons/network_wired-inactive.png Binary files differnew file mode 100755 index 00000000..18f2c70f --- /dev/null +++ b/data/skin_default/icons/network_wired-inactive.png diff --git a/data/skin_default/icons/network_wired.png b/data/skin_default/icons/network_wired.png Binary files differnew file mode 100755 index 00000000..db695ad5 --- /dev/null +++ b/data/skin_default/icons/network_wired.png diff --git a/data/skin_default/icons/network_wireless-active.png b/data/skin_default/icons/network_wireless-active.png Binary files differnew file mode 100755 index 00000000..07a21874 --- /dev/null +++ b/data/skin_default/icons/network_wireless-active.png diff --git a/data/skin_default/icons/network_wireless-inactive.png b/data/skin_default/icons/network_wireless-inactive.png Binary files differnew file mode 100755 index 00000000..5bd69f9d --- /dev/null +++ b/data/skin_default/icons/network_wireless-inactive.png diff --git a/data/skin_default/icons/network_wireless.png b/data/skin_default/icons/network_wireless.png Binary files differnew file mode 100755 index 00000000..629a05a6 --- /dev/null +++ b/data/skin_default/icons/network_wireless.png diff --git a/data/skin_default/unlock.png b/data/skin_default/icons/unlock.png Binary files differindex bd4486e9..bd4486e9 100644 --- a/data/skin_default/unlock.png +++ b/data/skin_default/icons/unlock.png diff --git a/data/skin_default/unlockBouquet.png b/data/skin_default/icons/unlockBouquet.png Binary files differindex c5d146d7..c5d146d7 100644 --- a/data/skin_default/unlockBouquet.png +++ b/data/skin_default/icons/unlockBouquet.png diff --git a/data/skin_default/lock.png b/data/skin_default/lock.png Binary files differdeleted file mode 100644 index d0ae7f64..00000000 --- a/data/skin_default/lock.png +++ /dev/null |
