diff options
Diffstat (limited to 'abs/core/linhes-theme')
23 files changed, 2504 insertions, 69 deletions
diff --git a/abs/core/linhes-theme/LHLogo.png b/abs/core/linhes-theme/LHLogo.png Binary files differindex 9ff4fd2..9ff4fd2 100755..100644 --- a/abs/core/linhes-theme/LHLogo.png +++ b/abs/core/linhes-theme/LHLogo.png diff --git a/abs/core/linhes-theme/LHLogoAndText.png b/abs/core/linhes-theme/LHLogoAndText.png Binary files differindex 39504e7..39504e7 100755..100644 --- a/abs/core/linhes-theme/LHLogoAndText.png +++ b/abs/core/linhes-theme/LHLogoAndText.png diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index b30b086..5bbe836 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,21 +1,23 @@ pkgname=linhes-theme pkgver=8.4 -pkgrel=13 +pkgrel=20 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') url="http://linhes.org/" patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' - 'menu-ui-vert.xml.patch' 'notification-ui.xml.patch' - 'schedule-ui.xml.patch' 'qtlook.txt.patch' - 'recordings-ui.xml.patch' 'video-ui.xml.patch') + 'controls-ui.xml.patch' 'menu-ui-vert.xml.patch' + 'music-base.xml.patch' 'music-ui.xml.patch' + 'notification-ui.xml.patch' 'qtlook.txt.patch' + 'recordings-ui.xml.patch' 'schedule-ui.xml.patch' + 'status-ui.xml.patch' 'stream-ui.xml.patch' 'video-ui.xml.patch') #The LinHES theme is based on TintedGlass 4.56 by Harley Peters source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'osd_subtitle.xml' 'bubble_background.png' 'preview.png' 'blank_coverart.png' 'checkmark.png' 'error.png' 'gears.png' 'question.png' 'warning.png' - 'progdetails_page1.html' + 'progdetails_page1.html' 'image-ui.xml' 'LHLogo.png' 'LHLogoAndText.png') install=$pkgname.install @@ -70,8 +72,6 @@ package() { rsync -pL $srcdir/warning.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/preview.png $pkgdir/$THEMEROOT/LinHES/ - #tux_thoughts.png is the thought bubble for the menu descriptions - #rsync -pL $srcdir/tux_thoughts.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/LHLogo.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/LHLogoAndText.png $pkgdir/$THEMEROOT/LinHES/images/ @@ -80,29 +80,33 @@ package() { msg "Modifying yellows and blue to LinHES yellow and blue" #yellow - grep -lr '#d9d900' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#d9d900/\#ebb81c/g" || return 0 + grep -lr '#d9d900' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\#d9d900/\#ebb81c/g" #darkyellow - grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#CCCC29/\#ebb81c/g" || return 0 + grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\#CCCC29/\#ebb81c/g" #blue - grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#3a9ade/\#0072bc/g" || return 0 + grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\#3a9ade/\#0072bc/g" msg "Modifying fonts to Overlock" - grep -lr 'DejaVu Sans' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\DejaVu Sans/\Overlock/g" + grep -lr 'DejaVu Sans' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\DejaVu Sans/\Overlock/g" msg "Updating themeinfo.xml version number" - IFS="." read -a array <<< "$pkgver" - sed -i "s/MAJ_VER/${array[0]}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml - sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml + sed -i "s/MAJ_VER/${pkgver//.}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml + sed -i "s/MIN_VER/${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml } md5sums=('2dca856c2a4d1f959473512c94e43b60' - '196b4d6691e95b87a76a9ed8be31a3d9' - 'f2b9c85519e80843294315a42870e582' - '43b1f213fd392fb07aac503e775e27bc' + '3fc2c8838a9e331a2d19c114760a5acb' + '66dd0365257d88b48ffeec00289e3b22' + 'ed56a335f8523d288609a81c005cab3f' + 'b90b745c72a057c78ebd0b6f2c5530b9' + 'a0ea2d3e386c0b483b31aa1a2703f9eb' + '8f8c27146e11954f60913da6d1fce073' '80bb72994eca59ca6dc9034ac185e7cc' - '22ff4044c8c29560451fb51dcbf4d44e' '9fe3371a8b964a7028126405cfaa330b' - 'ca7efe27ec941e341a555451a48f42ed' - '0d62c91c3c1fe76a4549459741591312' + '537e12f58ae8da81176d8b982ac9c783' + '0a50f8ecd3d73622b31b52b905307c34' + '4d01487b534e45c631734501ec0da501' + '8312aff444945f80a76100696c81cb2e' + '5527190d8dd74e720b9160f851727390' '5a8fb2a5f0e657d52be6f0a6a006ce72' '35d77d91125e46728a30ab23d0903223' 'bfc32b9fa5dca3d46dd6f365ecb449b5' @@ -115,5 +119,6 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60' 'e8ac15e38b3dc99c9e889e439ba356de' 'e8cf0d3a55ba3be47deae55c05432141' '58834fbee0230c713802c61e635cbab0' + '3f600b966bd813dd27f620762ddb3ac8' 'b51ef0cbf8ed2d3a8c1a8257a89aceff' '09ad14842f828b7a8d24070ec8214fe5') diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch index f672114..1f3b71a 100644 --- a/abs/core/linhes-theme/base.xml.patch +++ b/abs/core/linhes-theme/base.xml.patch @@ -1,5 +1,5 @@ ---- base.xml.orig 2016-01-13 18:47:41.473066307 +0000 -+++ base.xml 2016-01-13 01:12:57.516392855 +0000 +--- base.xml.orig 2016-12-13 20:41:54.779274682 +0000 ++++ base.xml 2017-01-12 17:34:48.863983285 +0000 @@ -3,55 +3,55 @@ <mythuitheme> @@ -126,7 +126,18 @@ </fontdef> <fontdef name="basesupersmallgreen" from="basesupersmall"> -@@ -241,55 +241,55 @@ +@@ -200,6 +200,10 @@ + <color>#d97616</color> + </fontdef> + ++ <fontdef name="basemediumorange" from="basemedium"> ++ <color>#d97616</color> ++ </fontdef> ++ + <fontdef name="baseextrasmallpurple" from="baseextrasmall"> + <color>#9898d9</color> + </fontdef> +@@ -241,55 +245,55 @@ </fontdef> <fontdef name="basesupersmallyellow" from="basesupersmall"> @@ -195,7 +206,7 @@ </fontdef> <!-- Base definition of a textarea --> -@@ -305,7 +305,7 @@ +@@ -305,7 +309,7 @@ <font>baseextrasmallverylightgrey</font> <font state="disabled">baseextrasmalllightgrey</font> <font state="error">baseextrasmallred</font> @@ -204,7 +215,7 @@ <font state="normal">baseextrasmallverylightgrey</font> <font state="running">baseextrasmallgreen</font> <cutdown>yes</cutdown> -@@ -317,7 +317,7 @@ +@@ -317,7 +321,7 @@ <font>basesmallerverylightgrey</font> <font state="disabled">basesmallerlightgrey</font> <font state="error">basesmallerred</font> @@ -213,7 +224,7 @@ <font state="normal">basesmallerverylightgrey</font> <font state="running">basesmallergreen</font> <cutdown>yes</cutdown> -@@ -329,7 +329,7 @@ +@@ -329,7 +333,7 @@ <font>basesmallverylightgrey</font> <font state="disabled">basesmalllightgrey</font> <font state="error">basesmallred</font> @@ -222,7 +233,7 @@ <font state="normal">basesmallverylightgrey</font> <font state="running">basesmallgreen</font> <cutdown>yes</cutdown> -@@ -411,7 +411,7 @@ +@@ -411,7 +415,7 @@ <area>283,436,50,11</area> <type>roundbox</type> <fill color="#000000" alpha="200" /> @@ -231,7 +242,7 @@ </shape> <shape name="base_backdrop_line"> -@@ -424,7 +424,7 @@ +@@ -424,7 +428,7 @@ <!-- Base definition of a base popup backdrop --> <shape name="base_popup_backdrop" from="base_backdrop"> @@ -240,7 +251,37 @@ </shape> <!-- Base definition of a heading group --> -@@ -667,10 +667,10 @@ +@@ -535,10 +539,10 @@ + <type>box</type> + <fill style="gradient"> + <gradient direction="horizontal" alpha="50"> +- <stop position="0" color="#d6d6d6" /> +- <stop position="25" color="#d6d6d6" alpha="255" /> +- <stop position="50" color="#d6d6d6" /> +- <stop position="100" color="#d6d6d6" /> ++ <stop position="0" color="#0072bc" /> ++ <stop position="25" color="#0072bc" alpha="255" /> ++ <stop position="50" color="#0072bc" /> ++ <stop position="100" color="#0072bc" /> + </gradient> + </fill> + </shape> +@@ -547,10 +551,10 @@ + <type>box</type> + <fill style="gradient"> + <gradient direction="horizontal" alpha="50"> +- <stop position="0" color="#d6d6d6" /> +- <stop position="50" color="#d6d6d6" /> +- <stop position="75" color="#d6d6d6" alpha="255"/> +- <stop position="100" color="#d6d6d6" /> ++ <stop position="0" color="#0072bc" /> ++ <stop position="50" color="#0072bc" /> ++ <stop position="75" color="#0072bc" alpha="255"/> ++ <stop position="100" color="#0072bc" /> + </gradient> + </fill> + </shape> +@@ -667,10 +671,10 @@ <type>box</type> <fill style="gradient"> <gradient direction="horizontal" alpha="50"> @@ -255,7 +296,7 @@ </gradient> </fill> </shape> -@@ -679,10 +679,10 @@ +@@ -679,10 +683,10 @@ <type>box</type> <fill style="gradient"> <gradient direction="horizontal" alpha="50"> @@ -270,7 +311,37 @@ </gradient> </fill> </shape> -@@ -863,7 +863,7 @@ +@@ -700,10 +704,10 @@ + <type>box</type> + <fill style="gradient"> + <gradient direction="horizontal" alpha="50"> +- <stop position="0" color="#d6d6d6" /> +- <stop position="25" color="#d6d6d6" alpha="255" /> +- <stop position="50" color="#d6d6d6" /> +- <stop position="100" color="#d6d6d6" /> ++ <stop position="0" color="#0072bc" /> ++ <stop position="25" color="#0072bc" alpha="255" /> ++ <stop position="50" color="#0072bc" /> ++ <stop position="100" color="#0072bc" /> + </gradient> + </fill> + </shape> +@@ -712,10 +716,10 @@ + <type>box</type> + <fill style="gradient"> + <gradient direction="horizontal" alpha="50"> +- <stop position="0" color="#d6d6d6" /> +- <stop position="50" color="#d6d6d6" /> +- <stop position="75" color="#d6d6d6" alpha="255"/> +- <stop position="100" color="#d6d6d6" /> ++ <stop position="0" color="#0072bc" /> ++ <stop position="50" color="#0072bc" /> ++ <stop position="75" color="#0072bc" alpha="255"/> ++ <stop position="100" color="#0072bc" /> + </gradient> + </fill> + </shape> +@@ -863,7 +867,7 @@ <type>roundbox</type> <fill color="#1a1a1a" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -279,7 +350,7 @@ </shape> <shape name="select_bar_top_highlight"> <area>0,0,100%,2</area> -@@ -956,7 +956,7 @@ +@@ -956,7 +960,7 @@ <type>roundbox</type> <fill color="#333333" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -288,7 +359,7 @@ </shape> </group> -@@ -967,7 +967,7 @@ +@@ -967,7 +971,7 @@ <type>roundbox</type> <fill color="#1a1a1a" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -297,7 +368,7 @@ </shape> <shape name="select_bar_top_highlight"> <area>0,0,100%,2</area> -@@ -1060,7 +1060,7 @@ +@@ -1060,7 +1064,7 @@ <type>roundbox</type> <fill color="#333333" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -306,7 +377,7 @@ </shape> </group> -@@ -1071,7 +1071,7 @@ +@@ -1071,7 +1075,7 @@ <type>roundbox</type> <fill color="#1a1a1a" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -315,7 +386,7 @@ </shape> <shape name="select_bar_top_highlight"> <area>0,0,100%,2</area> -@@ -1164,7 +1164,7 @@ +@@ -1164,7 +1168,7 @@ <type>roundbox</type> <fill color="#1a1a1a" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -324,7 +395,7 @@ </shape> </group> -@@ -1233,7 +1233,7 @@ +@@ -1233,7 +1237,7 @@ <type>roundbox</type> <fill color="#333333" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -333,3 +404,110 @@ </shape> </group> +@@ -1455,7 +1459,7 @@ + <area>0,0,100%,100%</area> + </group> + <textarea name="buttontext"> +- <font>basesmall</font> ++ <font>basesmallyellow</font> + </textarea> + </state> + <state name="selectedinactive" from="active"> +@@ -1564,6 +1568,9 @@ + <group name="select_bar" from="base_select_bar_selectedinactive_group"> + <area>0,0,100%,100%</area> + </group> ++ <textarea name="buttontext"> ++ <font>basesmall</font> ++ </textarea> + <imagetype name="buttonarrow"> + <filename>images/lists_right_arrow.png</filename> + <alpha>0</alpha> +@@ -1664,6 +1671,7 @@ + </state> + </statetype> + <textarea name="buttontext" from="base_text_font_state_small"> ++ <font state="normal">basesmallyellow</font> + </textarea> + <statetype name="buttoncheck"> + <state type="off"> +@@ -2186,7 +2194,7 @@ + </shape> + + <shape name="popup-seperator-line" from="base_line"> +- <area>23,212,556,2</area> ++ <area>23,174,556,2</area> + </shape> + + <shape name="popup-third-line" from="base_highlight_line"> +@@ -2202,18 +2210,18 @@ + </shape> + + <shape name="popup-arrows-backdrop" from="base_arrows_backdrop"> +- <area>3,488,50,13</area> ++ <area>549,488,50,13</area> + </shape> + + <textarea name="messagearea" from="basetextarea"> +- <area>16,10,570,196</area> +- <font>basesmalldarkyellow</font> ++ <area>16,10,570,158</area> ++ <font>basesmall</font> + <multiline>yes</multiline> + <align>allcenter</align> + </textarea> + + <buttonlist name="list" from="base_button_list"> +- <area>8,216,586,264</area> ++ <area>8,178,586,302</area> + <statetype name="buttonitem"> + <state name="active"> + <area>0,0,100%,34</area> +@@ -2244,10 +2252,10 @@ + </state> + </statetype> + <statetype name="upscrollarrow"> +- <position>2,274</position> ++ <position>548,312</position> + </statetype> + <statetype name="downscrollarrow"> +- <position>22,274</position> ++ <position>568,312</position> + </statetype> + </buttonlist> + </window> +@@ -2299,7 +2307,7 @@ + </shape> + + <shape name="large-dialogbox-arrows-backdrop" from="base_arrows_backdrop"> +- <area>3,488,50,13</area> ++ <area>761,488,50,13</area> + </shape> + + <textarea name="messagearea" from="basetextarea"> +@@ -2332,10 +2340,10 @@ + </state> + </statetype> + <statetype name="upscrollarrow"> +- <position>2,198</position> ++ <position>762,198</position> + </statetype> + <statetype name="downscrollarrow"> +- <position>22,198</position> ++ <position>782,198</position> + </statetype> + </buttonlist> + </window> +@@ -2795,10 +2803,10 @@ + </state> + </statetype> + <statetype name="upscrollarrow"> +- <position>0,272</position> ++ <position>550,272</position> + </statetype> + <statetype name="downscrollarrow"> +- <position>20,272</position> ++ <position>570,272</position> + </statetype> + </buttonlist> + diff --git a/abs/core/linhes-theme/blank_coverart.png b/abs/core/linhes-theme/blank_coverart.png Binary files differindex c44148e..c44148e 100755..100644 --- a/abs/core/linhes-theme/blank_coverart.png +++ b/abs/core/linhes-theme/blank_coverart.png diff --git a/abs/core/linhes-theme/checkmark.png b/abs/core/linhes-theme/checkmark.png Binary files differindex 0c8ba2d..0c8ba2d 100755..100644 --- a/abs/core/linhes-theme/checkmark.png +++ b/abs/core/linhes-theme/checkmark.png diff --git a/abs/core/linhes-theme/controls-ui.xml.patch b/abs/core/linhes-theme/controls-ui.xml.patch new file mode 100644 index 0000000..6da0bcd --- /dev/null +++ b/abs/core/linhes-theme/controls-ui.xml.patch @@ -0,0 +1,11 @@ +--- controls-ui.xml.orig 2016-12-13 20:38:02.325765836 +0000 ++++ controls-ui.xml 2016-12-13 20:34:54.356551993 +0000 +@@ -73,7 +73,7 @@ + <area>0,0,1280,720</area> + + <textarea name="heading" from="base_heading"> +- <value>Edit keys</value> ++ <value>Edit Keys</value> + </textarea> + + <shape name="edit-keys-backdrop" from="base_backdrop"> diff --git a/abs/core/linhes-theme/error.png b/abs/core/linhes-theme/error.png Binary files differindex d5ccc2d..d5ccc2d 100755..100644 --- a/abs/core/linhes-theme/error.png +++ b/abs/core/linhes-theme/error.png diff --git a/abs/core/linhes-theme/gears.png b/abs/core/linhes-theme/gears.png Binary files differindex b2f78d6..b2f78d6 100755..100644 --- a/abs/core/linhes-theme/gears.png +++ b/abs/core/linhes-theme/gears.png diff --git a/abs/core/linhes-theme/image-ui.xml b/abs/core/linhes-theme/image-ui.xml new file mode 100644 index 0000000..2e4f996 --- /dev/null +++ b/abs/core/linhes-theme/image-ui.xml @@ -0,0 +1,632 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd"> +<mythuitheme> + <!-- A gallery button showing a picture, video or folder --> + <window name="gallery"> + + <textarea name="heading" from="base_heading"> + <value>Image Gallery</value> + </textarea> + + <shape name="help-instr-backdrop" from="base_backdrop"> + <area>0,36,1280,40</area> + <type>box</type> + </shape> + + <shape name="help-instr-top-line" from="base_line"> + <area>0,37,1280,2</area> + </shape> + + <shape name="help-instr-bottom-line" from="base_line"> + <area>0,73,1280,2</area> + </shape> + + <shape name="arrows-backdrop" from="base_backdrop"> + <area>1215,697,50,20</area> + </shape> + + <!--shows path to current image --> + <textarea name="breadcrumbs"> + <area>110,39,900,34</area> + <font>basesmallyellow</font> + <cutdown>no</cutdown> + <scroll direction="horizontal" startdelay="0" returndelay="0"/> + <align>left,vcenter</align> + </textarea> + + <!-- shows current position in grid eg '1/123' --> + <textarea name="position" from="basetextarea"> + <area>15,39,100,34</area> + <font>basesmall</font> + <align>left,vcenter</align> + </textarea> + + <!-- Mandatory: the image list 10 columns x 6 rows --> + <buttonlist name="images0"> + <area>15,80,100%-10,100%-30</area> + <buttonarea>0,15,100%,100%-10</buttonarea> + <wrapstyle>flowing</wrapstyle> + <layout>grid</layout> + <arrange>fixed</arrange> + <align>allcenter</align> + <spacing>0</spacing> <!-- (100% - 10*10%) / (10-1) or 0% --> + <statetype name="buttonitem"> + <area>0,0,100%,100%</area> + <state name="active"> + <area>0,0,10%,16%</area> + <shape name="buttonbackground" from="base_backdrop"> + <area>0,0,100%,100%</area> + </shape> + <shape name="buttonbackground-line" from="base_backdrop_line"> + <area>1%,1%,99%,99%</area> + </shape> + <!-- Shows a picture image --> + <imagetype name="buttonimage"> + <area>4%,4%,96%,96%</area> + <preserveaspect>yes</preserveaspect> + </imagetype> + <!-- Shows a single folder image --> + <imagetype name="folderimage" from="buttonimage"> + </imagetype> + <!-- Shows image for default folder --> + <imagetype name="thumbimage0" from="buttonimage"> + </imagetype> + <!-- Shows a video image --> + <imagetype name="videoimage" from="buttonimage"> + </imagetype> + <!-- Show a background image depending on node type --> + <statetype name="buttontype"> + <area>0,0,100%,100%</area> + <state name="subfolder"> + <area>0,0,100%,100%</area> + <imagetype name="background"> + <area>30%,30%,55%,55%</area> + <filename>images/folderclosed.png</filename> + <preserveaspect>yes</preserveaspect> + </imagetype> + </state> + <state name="device" from="subfolder"/> + <state name="image"> + <area>0,0,100%,100%</area> + <imagetype name="background"> + <area>0,0,100%,100%</area> + <filename>images/image_gallery_no_image</filename> + <alpha>64</alpha> + </imagetype> + </state> + <state name="video"> + <area>0,0,50%,50%</area> + <imagetype name="background"> + <area>0,0,100%,100%</area> + <filename>images/no_preview_with_fanart.png</filename> + <preserveaspect>yes</preserveaspect> + </imagetype> + </state> + </statetype> + <!-- Show how many images / directories are in this directory --> + <textarea name="childcount"> + <area>0,0,100%,100%</area> + <font>baseextrasmall</font> + <align>allcenter</align> + </textarea> + <!-- Show up arrow on parent dir with ancestors --> + <statetype name="parenttype"> + <area>0,0,100%,100%</area> + <state name="upfolder"> + <area>0,0,100%,100%</area> + <imagetype name="icon"> + <area>30%,30%,55%,55%</area> + <filename>images/mv_gallery_dir_up.png</filename> + <preserveaspect>yes</preserveaspect> + </imagetype> + </state> + </statetype> + <!-- Darken hidden files/ folders --> + <statetype name="buttonstate"> + <area>0,0,100%,100%</area> + <state name="visible"/> + <state name="hidden"> + <area>0,0,100%,100%</area> + <shape name="hidden_background_shape"> + <area>0,0,100%,100%</area> + <type>box</type> + <fill color="#000000" alpha="128"/> + </shape> + </state> + </statetype> + <!-- Shows that the image was marked/selected and + might be manipulated with other images --> + <statetype name="buttoncheck"> + <area>0,0,100%,100%</area> + <state type="full"> + <area>70%,5%,76%,26%</area> + <shape name="marked_background"> + <area>0,0,100%,100%</area> + <type>ellipse</type> + <fill color="#000000"/> + </shape> + <imagetype name="marked"> + <area>4%,4%,96%,96%</area> + <filename>images/checkmark.png</filename> + <preserveaspect>no</preserveaspect> + </imagetype> + </state> + </statetype> + <shape name="buttontext-backdrop" from="base_backdrop" depends="buttontext"> + <area>3%,97%-22,97%,22</area> + <type>roundbox</type> + <cornerradius>4</cornerradius> + </shape> + <textarea name="buttontext"> + <area>2%,97%-22,97%,22</area> + <font>baseextrasmall</font> + <align>allcenter</align> + </textarea> + </state> + + <state name="selectedactive" from="active"> + <area>-8,-8,10%+16,16%+16</area> + <shape name="buttonbackground"> + <area>0,0,100%,100%</area> + <type>roundbox</type> + <fill color="#101017" alpha="255" /> + <cornerradius>8</cornerradius> + </shape> + <shape name="buttonbackground-line"> + <area>0,0,100%,100%</area> + <type>roundbox</type> + <fill color="#000000" alpha="0" /> + <line color="#0072bc" alpha="45" width="4" /> + <cornerradius>8</cornerradius> + </shape> + <shape name="buttonbackground-top-highlight-line"> + <area>8%,0,92%,4</area> + <type>box</type> + <fill style="gradient"> + <gradient direction="horizontal" alpha="0"> + <stop position="0" color="#0072bc" /> + <stop position="50" color="#0072bc" alpha="180" /> + <stop position="100" color="#0072bc" /> + </gradient> + </fill> + </shape> + <shape name="buttonbackground-bottom-highlight-line" from="buttonbackground-top-highlight-line"> + <area>8%,100%-4,92%,4</area> + </shape> + <shape name="buttonbackground-left-highlight-line"> + <area>0,8%,4,92%</area> + <type>box</type> + <fill style="gradient"> + <gradient alpha="0" direction="vertical"> + <stop position="0" color="#0072bc" /> + <stop position="50" color="#0072bc" alpha="220" /> + <stop position="100" color="#0072bc" /> + </gradient> + </fill> + </shape> + <shape name="buttonbackground-right-highlight-line" from="buttonbackground-left-highlight-line"> + <area>100%-4,8%,4,92%</area> + </shape> + + <statetype name="buttontype" depends="!parenttype"> + <area>0,0,100%,100%</area> + <state name="subfolder"> + <area>0,0,100%,100%</area> + <imagetype name="background"> + <area>30%,30%,55%,55%</area> + <filename>images/folderopen.png</filename> + <preserveaspect>yes</preserveaspect> + </imagetype> + </state> + </statetype> + + <!-- Show up arrow on parent dir with ancestors --> + <statetype name="parenttype"> + <state name="upfolder"> + <imagetype name="icon"> + <filename>images/mv_gallery_dir_up_open.png</filename> + </imagetype> + </state> + </statetype> + <!-- Show how many images / directories are in this directory --> + <textarea name="childcount"> + <font>baseextrasmallyellow</font> + </textarea> + <textarea name="buttontext"> + <area>2%,97%-22,97%,22</area> + <font>baseextrasmallyellow</font> + <align>allcenter</align> + </textarea> + </state> + + <state name="inactive" from="active"/> + + <state name="selectedinactive" from="active"/> + </statetype> + + <statetype name="upscrollarrow"> + <position>1207,623</position> + <state type="off"> + <imagetype name="upoff"> + <filename>images/lists_up_arrow.png</filename> + <alpha>80</alpha> + </imagetype> + </state> + <state type="full"> + <imagetype name="upon"> + <filename>images/lists_up_arrow.png</filename> + <alpha>200</alpha> + </imagetype> + </state> + </statetype> + <statetype name="downscrollarrow"> + <position>1227,623</position> + <state type="off"> + <imagetype name="dnoff"> + <filename>images/lists_down_arrow.png</filename> + <alpha>80</alpha> + </imagetype> + </state> + <state type="full"> + <imagetype name="dnon"> + <filename>images/lists_down_arrow.png</filename> + <alpha>200</alpha> + </imagetype> + </state> + </statetype> + + </buttonlist> + + <!-- the image list 8 columns x 4 rows --> + <buttonlist name="images1" from="images0"> + <spacing>7</spacing> <!-- (100% - 8*12%) / (8-1) or 0.57% --> + <statetype name="buttonitem"> + <state name="active"> + <area>0,0,12%,24%</area> + </state> + <state name="selectedactive"> + <area>-8,-8,12%+16,24%+16</area> + </state> + </statetype> + </buttonlist> + + <!-- the image list 6 columns x 3 rows --> + <buttonlist name="images2" from="images0"> + <spacing>10</spacing> <!-- (100% - 6*16%) / (6-1) or 0.8% --> + <statetype name="buttonitem"> + <state name="active"> + <area>0,0,16%,32%</area> + </state> + <state name="selectedactive"> + <area>-10,-12,16%+20,32%+20</area> + </state> + </statetype> + </buttonlist> + + <!-- the image list 4 columns x 2 rows --> + <buttonlist name="images3" from="images0"> + <spacing>0</spacing> <!-- (100% - 4*25%) / (4-1) or 0% --> + <statetype name="buttonitem"> + <state name="active"> + <area>0,0,25%,50%</area> + </state> + <state name="selectedactive"> + <area>-9,-9,25%+16,50%+10</area> + </state> + </statetype> + </buttonlist> + + <!-- shows a message when no images are available + in the current directory --> + <textarea name="noimages" from="basetextarea"> + <area>20,76,1240,589</area> + <font>basemedium</font> + <align>allcenter</align> + </textarea> + + <!-- Mandatory: Shows file info overlay --> + <buttonlist name="infolist" from="base_list"> + <area>10,80,510,100%-30</area> + <layout>vertical</layout> + <spacing>0</spacing> + <scrollstyle>free</scrollstyle> + <arrange>stack</arrange> + <wrapstyle>items</wrapstyle> + <align>center</align> + <buttonarea>0,0,100%,100%</buttonarea> + <statetype name="buttonitem"> + <state name="active"> + <area>0,0,100%,30</area> + <group name="select_bar" from="base_select_bar_active_group"> + <area>0,0,100%,100%</area> + <shape name="select_bar"> + <fill color="#000000" alpha="210" /> + <type>box</type> + </shape> + </group> + <textarea name="name" from="basetextarea"> + <area>10,0,100%-10,30</area> + <scroll direction="left" /> + <cutdown>yes</cutdown> + <template>%NAME%: %VALUE%</template> + </textarea> + </state> + <state name="selectedactive" from="active" /> + <state name="selectedinactive" from="active" /> + </statetype> + <statetype name="upscrollarrow"> + <position>20,-15</position> + <state type="off"> + <imagetype name="upoff"> + <alpha>0</alpha> + </imagetype> + </state> + <state type="full"> + <imagetype name="upon"> + <filename>images/lists_up_arrow.png</filename> + <alpha>200</alpha> + </imagetype> + </state> + </statetype> + <statetype name="downscrollarrow"> + <position>20,100%+10</position> + <state type="off"> + <imagetype name="dnoff"> + <alpha>0</alpha> + </imagetype> + </state> + <state type="full"> + <imagetype name="dnon"> + <filename>images/lists_down_arrow.png</filename> + <alpha>200</alpha> + </imagetype> + </state> + </statetype> + </buttonlist> + + <!--Shows scan progress--> + <group name="progress"> + <area>0,0,100%,100%</area> + + <animation trigger="AboutToShow"> + <section> + <alpha start="0" end="255" easingcurve="OutQuart"/> + <zoom start="0" end="100" easingcurve="OutQuart"/> + </section> + </animation> + + <animation trigger="AboutToHide"> + <section> + <alpha start="255" end="0" easingcurve="InQuart"/> + <zoom start="100" end="0" easingcurve="InQuart"/> + </section> + </animation> + + <shape name="osd-status-backdrop" depends="scanprogresstext"> + <area>64,624,1152,60</area> + <type>roundbox</type> + <fill color="#000000" alpha="140" /> + <cornerradius>8</cornerradius> + </shape> + + <shape name="osd-status-backdrop-line" depends="scanprogresstext"> + <area>65,625,1150,58</area> + <type>roundbox</type> + <fill color="#000000" alpha="0" /> + <line color="#ffffff" alpha="45" width="2" /> + <cornerradius>6</cornerradius> + </shape> + + <shape name="top-line" depends="scanprogresstext"> + <area>66,626,1148,2</area> + <type>box</type> + <fill style="gradient"> + <gradient direction="horizontal" alpha="0"> + <stop position="0" color="#ffffff" /> + <stop position="50" color="#ffffff" alpha="120" /> + <stop position="100" color="#ffffff" /> + </gradient> + </fill> + </shape> + + <shape name="bottom-line" from="top-line" depends="scanprogresstext"> + <area>66,680,1148,2</area> + </shape> + + <shape name="left-line" depends="scanprogresstext"> + <area>66,628,2,52</area> + <type>box</type> + <fill style="gradient"> + <gradient direction="vertical" alpha="0"> + <stop position="0" color="#ffffff" /> + <stop position="50" color="#ffffff" alpha="180" /> + <stop position="100" color="#ffffff" /> + </gradient> + </fill> + </shape> + + <shape name="right-line" from="left-line" depends="scanprogresstext"> + <area>1212,628,2,52</area> + </shape> + + <!-- Progress bar--> + <progressbar name="scanprogressbar"> + <area>90,650,1100,8</area> + <layout>horizontal</layout> + <style>reveal</style> + <imagetype name="background"> + <area>0,0,100%,100%</area> + <filename>images/osd/progressbar_background.png</filename> + </imagetype> + <imagetype name="progressimage"> + <area>0,0,100%,100%</area> + <filename>images/osd/progressbar_fill.png</filename> + </imagetype> + </progressbar> + + <!--Shows numerical scan progress--> + <textarea name="scanprogresstext" from="basetextarea"> + <area>90,657,1100,24</area> + <font>basesmall</font> + <align>allcenter</align> + </textarea> + </group> + + <!-- shows state of type filter --> + <textarea name="typefilter" from="basetextarea"> + <area>1100,39,100,34</area> + <font>basesmallblue</font> + <align>left,vcenter</align> + </textarea> + <textarea name="typefilterAll" from="basetextarea" depends="!typefilter"> + <value>All</value> + <area>1100,39,100,34</area> + <font>basesmallblue</font> + <align>left,vcenter</align> + </textarea> + <textarea name="typefilterlabel" from="basetextarea"> + <value>Show:</value> + <area>1035,39,60,34</area> + <font>basesmallblue</font> + <align>right,vcenter</align> + </textarea> + + <!-- shows state of hidden filter --> + <textarea name="hidefilter" from="basetextarea"> + <area>1185,39,80,34</area> + <font>basesmallblue</font> + <align>right,vcenter</align> + </textarea> + </window> + + <!-- Gallery Slideshow window which shows the a single image only or a slideshow. --> + <window name="slideshow"> + + <!-- Extra small text for Gallery images --> + <fontdef name="gallerytext" from="basesmall"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + </fontdef> + + <!-- the background behind the images --> + <shape name="background_shape"> + <area>0,0,100%,100%</area> + <fill color="#000000" alpha="255"/> + </shape> + + <!-- an image --> + <imagetype name="image"> + <area>0,0,100%,100%</area> + <preserveaspect>yes</preserveaspect> + </imagetype> + + <!-- Represents "Show Captions" state for use as a dependancy by other widgets + Set = Hide; empty = Show --> + <textarea name="hidecaptions" from="basetextarea"> + <area>0,0,0,0</area> + </textarea> + + <!-- End/Loading/Failed to load status --> + <textarea name="status" from="basetextarea" depends="!hidecaptions"> + <area>200,0,100%-200,30</area> + <font>basesmall</font> + <align>hcenter,top</align> + </textarea> + + <!-- Slide count --> + <textarea name="slidecount" from="basetextarea" depends="!hidecaptions"> + <area>100%-200,0,190,30</area> + <font>gallerytext</font> + <align>right, vcentre</align> + </textarea> + + <!-- Date/Comment --> + <textarea name="caption" from="basetextarea" depends="!hidecaptions"> + <area>10,100%-28,100%-10,30</area> + <font>gallerytext</font> + <align>right, vcenter</align> + <cutdown>no</cutdown> + <scroll direction="horizontal"/> + </textarea> + + <!-- Shows file info overlay --> + <buttonlist name="infolist" from="base_list"> + <area>10,30,510,100%-30</area> + <layout>vertical</layout> + <spacing>1</spacing> + <scrollstyle>free</scrollstyle> + <arrange>stack</arrange> + <wrapstyle>items</wrapstyle> + <align>center</align> + <buttonarea>0,0,100%,100%</buttonarea> + <statetype name="buttonitem"> + <state name="active"> + <area>0,0,100%,30</area> + <group name="select_bar" from="base_select_bar_active_group"> + <area>0,0,100%,100%</area> + </group> + <textarea name="name" from="basetextarea"> + <area>15,0,100%,30</area> + <cutdown>yes</cutdown> + <template>%NAME%: %VALUE%</template> + </textarea> + </state> + <state name="selectedactive"> + <area>0,0,100%,64</area> + <shape name="select_bar_backdrop_line" from="base_backdrop_line"> + <area>0,0,100%,100%-2</area> + <type>box</type> + </shape> + <group name="select_bar" from="base_select_bar_selectedactive_group"> + <area>1,1,100%-2,100%-2</area> + </group> + + <shape name="select_bar_left_line" from="base_highlight_vertical_line"> + <area>0,0,2,100%</area> + </shape> + <shape name="select_bar_right_line" from="base_highlight_vertical_line"> + <area>100%-4,0,2,100%</area> + </shape> + <textarea name="name" from="basetextarea"> + <area>15,5,100%,50</area> + <multiline>yes</multiline> + <scroll direction="up" rate="20"/> + <template>%NAME%: %VALUE%</template> + <font>basesmallyellow</font> + </textarea> + </state> + <state name="selectedinactive" from="active" /> + </statetype> + <statetype name="upscrollarrow"> + <position>20,-15</position> + <state type="off"> + <imagetype name="upoff"> + <alpha>0</alpha> + </imagetype> + </state> + <state type="full"> + <imagetype name="upon"> + <filename>images/lists_up_arrow.png</filename> + <alpha>200</alpha> + </imagetype> + </state> + </statetype> + <statetype name="downscrollarrow"> + <position>20,100%+10</position> + <state type="off"> + <imagetype name="dnoff"> + <alpha>0</alpha> + </imagetype> + </state> + <state type="full"> + <imagetype name="dnon"> + <filename>images/lists_down_arrow.png</filename> + <alpha>200</alpha> + </imagetype> + </state> + </statetype> + </buttonlist> + + </window> + +</mythuitheme> diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch index b1dbaaf..3a0c3d9 100644 --- a/abs/core/linhes-theme/menu-ui-vert.xml.patch +++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch @@ -1,5 +1,5 @@ ---- menu-ui-vert.xml.orig 2016-01-13 18:48:20.631382184 +0000 -+++ menu-ui-vert.xml 2016-04-13 19:40:10.952214840 +0000 +--- menu-ui-vert.xml.orig 2017-01-12 02:27:03.269571903 +0000 ++++ menu-ui-vert.xml 2017-01-12 02:19:35.517176026 +0000 @@ -6,18 +6,53 @@ <area>0,0,1280,720</area> @@ -126,7 +126,7 @@ <font>basemediumlightgrey</font> <multiline>yes</multiline> <align>allcenter</align> -@@ -147,40 +227,40 @@ +@@ -147,40 +227,48 @@ </textarea> </state> <state name="selectedactive"> @@ -134,6 +134,7 @@ + <area>-20,0,370,80</area> + <shape name="select_bar_backdrop_line" from="base_backdrop_line"> + <area>0,0,100%,100%-2</area> ++ <line color="#0072bc" alpha="45" width="2" /> + <type>box</type> + </shape> <group name="select_bar" from="base_select_bar_selectedactive_group"> @@ -142,9 +143,16 @@ </group> + <shape name="select_bar_left_line" from="base_highlight_vertical_line"> + <area>0,0,2,100%</area> ++ <fill style="gradient"> ++ <gradient alpha="0" direction="vertical"> ++ <stop position="0" color="#0072bc" /> ++ <stop position="50" color="#0072bc" alpha="180" /> ++ <stop position="100" color="#0072bc" /> ++ </gradient> ++ </fill> + </shape> -+ <shape name="select_bar_right_line" from="base_highlight_vertical_line"> -+ <area>100%-4,0,2,100%</area> ++ <shape name="select_bar_right_line" from="select_bar_left_line"> ++ <area>100%-2,0,2,100%</area> + </shape> <textarea name="buttontext"> - <area>5,0,320,64</area> @@ -192,7 +200,7 @@ <showempty>yes</showempty> <state type="full"> <imagetype name="upon"> -@@ -190,7 +270,7 @@ +@@ -190,7 +278,7 @@ </state> </statetype> <statetype name="downscrollarrow"> diff --git a/abs/core/linhes-theme/music-base.xml.patch b/abs/core/linhes-theme/music-base.xml.patch new file mode 100644 index 0000000..7c8e3bf --- /dev/null +++ b/abs/core/linhes-theme/music-base.xml.patch @@ -0,0 +1,121 @@ +--- music-base.xml.orig 2016-12-13 20:45:06.068067497 +0000 ++++ music-base.xml 2016-12-18 00:17:16.171607805 +0000 +@@ -360,7 +360,6 @@ + <textarea name="title" from="buttontext"> + <area>143,0,1066,30</area> + <align>left,vcenter</align> +- <font>basesmall</font> + <template>%TITLE% by %ARTIST% on %ALBUM%</template> + </textarea> + </state> +@@ -412,9 +411,12 @@ + </textarea> + </state> + <state name="selectedinactive" from="selectedactive"> +- <group name="select_bar" from="base_select_bar_selectedinactive_group"> +- <area>0,0,100%,100%</area> +- </group> ++ <group name="select_bar" from="base_select_bar_selectedinactive_group"> ++ <area>0,0,100%,100%</area> ++ </group> ++ <textarea name="title"> ++ <font>basesmall</font> ++ </textarea> + </state> + </statetype> + <statetype name="upscrollarrow"> +@@ -450,7 +452,7 @@ + <textarea name="shuffletext" from="basetextarea"> + <area>0,0,300,22</area> + <font>basesmaller</font> +- <value>Shuffle Mode: Intelligent</value> ++ <value>Shuffle Mode: Smart</value> + <align>left,vcenter</align> + </textarea> + </state> +@@ -504,7 +506,7 @@ + </statetype> + + <textarea name="playlistposition" from="basetextarea"> +- <area>192,9,170,14</area> ++ <area>192,8,170,14</area> + <font>basesupersmallyellow</font> + <align>right,vcenter</align> + </textarea> +@@ -514,7 +516,7 @@ + </progressbar> + + <textarea name="playlisttime" from="basetextarea"> +- <area>918,9,230,14</area> ++ <area>918,8,230,14</area> + <font>basesupersmallyellow</font> + <align>left,vcenter</align> + </textarea> +@@ -574,7 +576,7 @@ + </imagetype> + + <textarea name="title" from="basetextarea"> +- <area>171,18,938,24</area> ++ <area>171,14,938,24</area> + <font>basesmallyellow</font> + </textarea> + +@@ -615,11 +617,11 @@ + <font>baseevensmaller</font> + <align>allcenter</align> + </textarea> +- ++<!-- + <group name="musiccontrols" from="base_music_controls"> + <position>535,140</position> + </group> +- ++--> + <statetype name="mutestate" from="base_mute_state"> + <position>44,146</position> + </statetype> +@@ -629,11 +631,11 @@ + </textarea> + + <progressbar name="progress" from="baseprogressbar"> +- <position>372,162</position> ++ <position>372,152</position> + </progressbar> + + <textarea name="time" from="basetextarea"> +- <area>918,161,185,14</area> ++ <area>918,149,185,14</area> + <font>basesupersmallyellow</font> + </textarea> + +@@ -718,7 +720,7 @@ + + <textarea name="title" from="basetextarea"> + <area>146,7,987,28</area> +- <font>basesmaller</font> ++ <font>basesmalleryellow</font> + <template>%TITLE% - %ARTIST% - %ALBUM%</template> + </textarea> + +@@ -739,17 +741,17 @@ + <textarea name="volume" from="base_volume"> + <position>190,57</position> + </textarea> +- ++<!-- + <group name="musiccontrols" from="base_music_controls"> + <position>535,68</position> + </group> +- ++--> + <progressbar name="progress" from="baseprogressbar"> +- <position>372,90</position> ++ <position>372,79</position> + </progressbar> + + <textarea name="time" from="basetextarea"> +- <area>918,89,185,14</area> ++ <area>918,77,185,14</area> + <font>basesupersmallyellow</font> + </textarea> + diff --git a/abs/core/linhes-theme/music-ui.xml.patch b/abs/core/linhes-theme/music-ui.xml.patch new file mode 100644 index 0000000..6d01256 --- /dev/null +++ b/abs/core/linhes-theme/music-ui.xml.patch @@ -0,0 +1,704 @@ +--- music-ui.xml.orig 2016-12-13 20:47:17.067929339 +0000 ++++ music-ui.xml 2017-01-12 02:19:35.520508931 +0000 +@@ -6,7 +6,7 @@ + <area>0,0,1280,720</area> + + <textarea name="heading" from="base_heading"> +- <value>Current Play List View</value> ++ <value>Current Playlist View</value> + </textarea> + + <shape name="play-list-backdrop" from="base_backdrop"> +@@ -41,7 +41,7 @@ + <area>28,44,1224,406</area> + <multiline>yes</multiline> + <align>allcenter</align> +- <value>You haven't selected any tracks to play</value> ++ <value>Press MENU to add tracks to Current Playlist</value> + </textarea> + + <!-- current playlist button list --> +@@ -92,7 +92,7 @@ + </state> + </statetype> + <textarea name="tracknum"> +- <area>133,0,52,30</area> ++ <area>118,0,70,30</area> + <font>basesmall</font> + <align>right,vcenter</align> + <template>%1 -</template> +@@ -107,7 +107,7 @@ + <align>left,vcenter</align> + </textarea> + <textarea name="length" from="title"> +- <area>1139,0,70,30</area> ++ <area>1129,0,80,30</area> + <align>right,vcenter</align> + </textarea> + </state> +@@ -121,7 +121,7 @@ + <state name="playing"> + <area>0,0,100%,100%</area> + <textarea name="playing" from="basetextarea"> +- <area>84,0,70,64</area> ++ <area>74,0,70,64</area> + <font>basesupersmallgreen</font> + <cutdown>no</cutdown> + <align>allcenter</align> +@@ -132,7 +132,7 @@ + <state name="paused"> + <area>0,0,100%,100%</area> + <textarea name="paused" from="basetextarea"> +- <area>84,0,70,64</area> ++ <area>74,0,70,64</area> + <font>basesupersmallyellow</font> + <cutdown>no</cutdown> + <align>allcenter</align> +@@ -143,7 +143,7 @@ + <state name="stopped"> + <area>0,0,100%,100%</area> + <textarea name="stopped" from="basetextarea"> +- <area>84,0,70,64</area> ++ <area>74,0,70,64</area> + <font>basesupersmallred</font> + <cutdown>no</cutdown> + <align>allcenter</align> +@@ -153,40 +153,45 @@ + </state> + </statetype> + <textarea name="tracknum"> +- <area>159,2,52,24</area> ++ <area>118,1,70,24</area> + <font>basesmallyellow</font> +- <align>right,vcenter</align> ++ <align>right,top</align> + <template>%1 -</template> + </textarea> + <textarea name="title"> +- <area>219,2,540,24</area> ++ <area>193,1,566,24</area> ++ <align>left,top</align> + <font>basesmallyellow</font> ++ <scroll direction="left" startdelay="1"/> + </textarea> + <textarea name="artist" from="title"> +- <area>774,2,350,24</area> ++ <area>774,1,350,24</area> ++ <scroll direction="left" startdelay="1"/> + </textarea> +- <textarea name="length" from="title"> +- <area>1139,2,70,24</area> ++ <textarea name="length"> ++ <area>1129,1,80,24</area> + <align>right,vcenter</align> ++ <font>basesmallyellow</font> + </textarea> + <textarea name="album"> +- <area>229,0,540,64</area> +- <font>baseextrasmallyellow</font> ++ <area>193,24,566,20</area> ++ <font>baseextrasmallblue</font> + <align>left,vcenter</align> + </textarea> + <textarea name="genre" from="album"> +- <area>784,0,340,64</area> ++ <area>774,24,350,20</area> + </textarea> + <statetype name="ratingstate" from="base_rating_state"> +- <position>219,40</position> ++ <position>193,40</position> + </statetype> + <textarea name="lastplayed" from="album"> +- <area>774,43,250,20</area> ++ <area>774,43,260,20</area> ++ <font>baseextrasmall</font> + </textarea> +- <textarea name="playcount" from="album"> ++ <textarea name="playcount" from="lastplayed"> + <area>1039,43,170,20</area> + <align>right,vcenter</align> +- <template>Played %1 times</template> ++ <template>Played: %1</template> + </textarea> + </state> + <state name="selectedinactive" from="selectedactive"> +@@ -217,7 +222,7 @@ + <area>0,0,1280,720</area> + + <textarea name="heading" from="base_heading"> +- <value>Play List Editor Tree View</value> ++ <value>Playlist Editor Tree View</value> + </textarea> + + <shape name="breadcrumbs-backdrop" from="base_backdrop"> +@@ -274,6 +279,7 @@ + <area>36,39,993,30</area> + <font>basesmallyellow</font> + <align>left,vcenter</align> ++ <scroll direction="horizontal" startdelay="1" rate="80"/> + </textarea> + + <!-- optional - shows current position in grid eg '1 of 123' --> +@@ -355,7 +361,7 @@ + <area>0,0,1280,720</area> + + <textarea name="heading" from="base_heading"> +- <value>Play List Editor Gallery View</value> ++ <value>Playlist Editor Gallery View</value> + </textarea> + + <shape name="breadcrumbs-backdrop" from="base_backdrop"> +@@ -404,6 +410,7 @@ + <area>36,39,993,30</area> + <font>basesmallyellow</font> + <align>left,vcenter</align> ++ <scroll direction="horizontal" startdelay="1" rate="80"/> + </textarea> + + <!-- optional - shows current position in grid eg '1 of 123' --> +@@ -435,7 +442,8 @@ + </group> + <imagetype name="buttonimage"> + <area>8,8,120,120</area> +- <filename>mythmusic/mm_nothumb.png</filename> ++ <filename>mythmusic/mm_category.png</filename> ++ <alpha>100</alpha> + </imagetype> + <statetype name="nodetype"> + <position>8,8</position> +@@ -443,73 +451,85 @@ + <state name="alltracks"> + <imagetype name="alltracks"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + <state name="genres"> + <imagetype name="genres"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + <state name="albums"> + <imagetype name="albums"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + <state name="artists"> + <imagetype name="artists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + <state name="compartists"> + <imagetype name="compartists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + <state name="ratings"> + <imagetype name="ratings"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + <state name="years"> + <imagetype name="years"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + <state name="compilations"> + <imagetype name="compilations"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + <state name="cd"> + <imagetype name="cd"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + <state name="directory"> + <imagetype name="directory"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + <state name="playlists"> + <imagetype name="playlists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + <state name="smartplaylists"> + <imagetype name="smartplaylists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> ++ <alpha>100</alpha> + </imagetype> + </state> + </statetype> +@@ -547,7 +567,7 @@ + <area>0,0,100%,100%</area> + <type>roundbox</type> + <fill color="#101017" alpha="255" /> +- <line color="#ffffff" alpha="45" width="4" /> ++ <line color="#0072bc" alpha="45" width="4" /> + <cornerradius>8</cornerradius> + </shape> + <shape name="select_bar_top_highlight_line"> +@@ -555,9 +575,9 @@ + <type>box</type> + <fill style="gradient"> + <gradient direction="horizontal" alpha="0"> +- <stop position="0" color="#ffffff" /> +- <stop position="50" color="#ffffff" alpha="180" /> +- <stop position="100" color="#ffffff" /> ++ <stop position="0" color="#0072bc" /> ++ <stop position="50" color="#0072bc" alpha="180" /> ++ <stop position="100" color="#0072bc" /> + </gradient> + </fill> + </shape> +@@ -569,9 +589,9 @@ + <type>box</type> + <fill style="gradient"> + <gradient alpha="0" direction="vertical"> +- <stop position="0" color="#ffffff" /> +- <stop position="50" color="#ffffff" alpha="220" /> +- <stop position="100" color="#ffffff" /> ++ <stop position="0" color="#0072bc" /> ++ <stop position="50" color="#0072bc" alpha="220" /> ++ <stop position="100" color="#0072bc" /> + </gradient> + </fill> + </shape> +@@ -580,7 +600,7 @@ + </shape> + <imagetype name="buttonimage"> + <area>8,8,120,120</area> +- <filename>mythmusic/mm_nothumb.png</filename> ++ <filename>mythmusic/mm_category.png</filename> + </imagetype> + <statetype name="nodetype"> + <position>8,8</position> +@@ -588,73 +608,73 @@ + <state name="alltracks"> + <imagetype name="alltracks"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + <state name="genres"> + <imagetype name="genres"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + <state name="albums"> + <imagetype name="albums"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + <state name="artists"> + <imagetype name="artists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + <state name="compartists"> + <imagetype name="compartists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + <state name="ratings"> + <imagetype name="ratings"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + <state name="years"> + <imagetype name="years"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + <state name="compilations"> + <imagetype name="compilations"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + <state name="cd"> + <imagetype name="cd"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + <state name="directory"> + <imagetype name="directory"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + <state name="playlists"> + <imagetype name="playlists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + <state name="smartplaylists"> + <imagetype name="smartplaylists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + </imagetype> + </state> + </statetype> +@@ -681,22 +701,50 @@ + <area>5,1,-5,-3</area> + <align>bottom,hcenter</align> + <minsize shrink="short" vanish="true">5,5</minsize> +- <font>baseextrasmall</font> ++ <font>baseextrasmallyellow</font> + <multiline>yes</multiline> + </textarea> + </group> + </state> +- <state name="selectedinactive"> +- <group name="select_bar" from="base_button_select_bar_disabled_group"> +- <area>0,0,136,136</area> +- <shape name="select_bar"> +- <fill color="#333333" alpha="255" /> +- <cornerradius>8</cornerradius> +- </shape> +- </group> ++ <state name="selectedinactive" from="selectedactive"> ++ <shape name="select_bar"> ++ <area>0,0,100%,100%</area> ++ <type>roundbox</type> ++ <fill color="#101017" alpha="255" /> ++ <line color="#ffffff" alpha="45" width="4" /> ++ <cornerradius>8</cornerradius> ++ </shape> ++ <shape name="select_bar_top_highlight_line"> ++ <area>8,2,120,4</area> ++ <type>box</type> ++ <fill style="gradient"> ++ <gradient direction="horizontal" alpha="0"> ++ <stop position="0" color="#ffffff" /> ++ <stop position="50" color="#ffffff" alpha="180" /> ++ <stop position="100" color="#ffffff" /> ++ </gradient> ++ </fill> ++ </shape> ++ <shape name="select_bar_bottom_highlight_line" from="select_bar_top_highlight_line"> ++ <area>8,130,120,4</area> ++ </shape> ++ <shape name="select_bar_left_highlight_line"> ++ <area>2,8,4,120</area> ++ <type>box</type> ++ <fill style="gradient"> ++ <gradient alpha="0" direction="vertical"> ++ <stop position="0" color="#ffffff" /> ++ <stop position="50" color="#ffffff" alpha="220" /> ++ <stop position="100" color="#ffffff" /> ++ </gradient> ++ </fill> ++ </shape> ++ <shape name="select_bar_right_highlight_line" from="select_bar_left_highlight_line"> ++ <area>130,8,4,120</area> ++ </shape> + <imagetype name="buttonimage"> + <area>8,8,120,120</area> +- <filename>mythmusic/mm_nothumb.png</filename> ++ <filename>mythmusic/mm_category.png</filename> + <alpha>100</alpha> + </imagetype> + <statetype name="nodetype"> +@@ -705,94 +753,84 @@ + <state name="alltracks"> + <imagetype name="alltracks"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> + <state name="genres"> + <imagetype name="genres"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> + <state name="albums"> + <imagetype name="albums"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> + <state name="artists"> + <imagetype name="artists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> + <state name="compartists"> + <imagetype name="compartists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> + <state name="ratings"> + <imagetype name="ratings"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> + <state name="years"> + <imagetype name="years"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> + <state name="compilations"> + <imagetype name="compilations"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> + <state name="cd"> + <imagetype name="cd"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> + <state name="directory"> + <imagetype name="directory"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> + <state name="playlists"> + <imagetype name="playlists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> + <state name="smartplaylists"> + <imagetype name="smartplaylists"> + <area>0,0,120,120</area> +- <filename>mythmusic/mm_category.png</filename> +- <alpha>100</alpha> +- </imagetype> +- </state> +- </statetype> +- <statetype name="buttoncheck"> +- <position>8,8</position> +- <showempty>yes</showempty> +- <state type="full"> +- <imagetype name="marked"> +- <filename>mythmusic/playlist_yes.png</filename> ++ <filename>mythmusic/mm_nothumb.png</filename> + <alpha>100</alpha> + </imagetype> + </state> +@@ -813,7 +851,6 @@ + <minsize shrink="short" vanish="true">5,5</minsize> + <font>baseextrasmall</font> + <multiline>yes</multiline> +- <alpha>100</alpha> + </textarea> + </group> + </state> +@@ -1909,6 +1946,122 @@ + + </window> + ++ <window name="trackslyricsview"> ++ <area>0,0,1280,720</area> ++ ++ <group name="heading-backdrop" from="base_heading_group" /> ++ ++ <textarea name="heading" from="base_heading"> ++ <value>Track Lyrics View</value> ++ </textarea> ++ ++ <shape name="lyrics-backdrop" from="base_backdrop"> ++ <area>20,36,1240,453</area> ++ </shape> ++ ++ <shape name="lyrics-backdrop-line" from="base_backdrop_line"> ++ <area>21,37,1238,451</area> ++ </shape> ++ ++ <shape name="lyrics-top-line" from="base_highlight_line"> ++ <area>21,38,1238,2</area> ++ </shape> ++ ++ <shape name="lyrics-bottom-line" from="base_highlight_line"> ++ <area>21,486,1238,2</area> ++ </shape> ++ ++ <shape name="lyrics-list-left-line" from="base_highlight_vertical_line"> ++ <area>22,40,2,446</area> ++ </shape> ++ ++ <shape name="lyrics-list-right-line" from="base_highlight_vertical_line"> ++ <area>1256,40,2,446</area> ++ </shape> ++ ++ <shape name="lyrics-list-arrows-backdrop" from="base_arrows_backdrop"> ++ <area>1207,490,50,11</area> ++ </shape> ++ ++ <buttonlist name="lyrics_list" from="base_list"> ++ <area>28,44,1224,440</area> ++ <searchposition>-1,466</searchposition> ++ <buttonarea>0,0,1224,440</buttonarea> ++ <statetype name="buttonitem"> ++ <state name="active"> ++ <area>0,0,100%,30</area> ++ <textarea name="buttontext"> ++ <area>0,0,100%,100%</area> ++ <align>top,hcenter</align> ++ <font>basesmall</font> ++ </textarea> ++ </state> ++ <state name="selectedactive" from="active"> ++ <group name="select_bar" from="base_select_bar_selectedactive_group"> ++ <area>0,0,100%,100%</area> ++ </group> ++ <textarea name="buttontext"> ++ <font>basesmallyellow</font> ++ </textarea> ++ </state> ++ <state name="selectedinactive" from="selectedactive"> ++ <group name="select_bar" from="base_select_bar_selectedinactive_group"> ++ <area>0,0,100%,100%</area> ++ </group> ++ </state> ++ </statetype> ++ ++ <statetype name="upscrollarrow"> ++ <position>1186,448</position> ++ </statetype> ++ ++ <statetype name="downscrollarrow"> ++ <position>1206,448</position> ++ </statetype> ++ </buttonlist> ++ ++ <statetype name="loading_state"> ++ <position>339,153</position> ++ <state name="off"></state> ++ <state name="on"> ++ <shape name="boxshape" from="base_popup_backdrop"> ++ <area>0,0,602,144</area> ++ </shape> ++ <shape name="boxshape-line" from="base_backdrop_line"> ++ <area>1,1,600,142</area> ++ </shape> ++ <shape name="busy-dialog-top-line" from="base_highlight_line"> ++ <area>2,2,598,2</area> ++ </shape> ++ <shape name="busy-dialog-bottom-line" from="base_highlight_line"> ++ <area>2,140,598,2</area> ++ </shape> ++ <shape name="busy-dialog-left-line" from="base_highlight_vertical_line"> ++ <area>2,4,2,138</area> ++ </shape> ++ <shape name="busy-dialog-right-line" from="base_highlight_vertical_line"> ++ <area>598,4,2,138</area> ++ </shape> ++ <imagetype name="loadinganimation"> ++ <position>33,65</position> ++ <filepattern low="1" high="60" cycle="reverse">images/busy/busy%1.png</filepattern> ++ <delay>12</delay> ++ </imagetype> ++ </state> ++ </statetype> ++ ++ <textarea name="status_text" from="basetextarea"> ++ <area>20,36,1240,453</area> ++ <font>basemediumyellow</font> ++ <align>allcenter</align> ++ </textarea> ++ ++ <group name="trackinfopanel" from="base_info_panel"> ++ <area>0,506,1280,240</area> ++ </group> ++ ++ </window> ++ + <window name="editmetadata"> + <area>0,0,1280,720</area> + +@@ -3492,7 +3645,7 @@ + </section> + </animation> + +- <shape name="cd-rip-backdrop" from="base_popup_backdrop"> ++ <shape name="cd-rip-backdrop" from="base_popup_backdrop"> + <area>0,0,800,360</area> + </shape> + diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch index 3eabbfc..a5629d4 100644 --- a/abs/core/linhes-theme/osd.xml.patch +++ b/abs/core/linhes-theme/osd.xml.patch @@ -1,5 +1,5 @@ --- osd.xml.orig 2016-11-16 18:00:59.736588734 +0000 -+++ osd.xml 2016-11-17 19:29:17.370920531 +0000 ++++ osd.xml 2017-01-13 18:57:07.721509072 +0000 @@ -7,13 +7,13 @@ <window name="osd_debug"> <area>0,0,1280,720</area> @@ -274,17 +274,17 @@ - <area>90,658,1100,24</area> + <textarea name="value"> + <area>90,657,1100,24</area> - <font>small</font> - <align>allcenter</align> -- <template>%DESCRIPTION% -- %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template> ++ <font>small</font> ++ <align>allcenter</align> + <template>%VALUE%%UNITS%</template> + </textarea> + + <textarea name="playedtime" depends="!value"> + <area>90,657,1100,24</area> -+ <font>small</font> -+ <align>allcenter</align> + <font>small</font> + <align>allcenter</align> +- <template>%DESCRIPTION% +- %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template> + <template>%PLAYEDTIME% of %TOTALTIME% + %(|REMAININGTIME| remains)%%(|BEHINDTIME| behind)%</template> </textarea> @@ -457,21 +457,21 @@ <align>vcenter</align> - <template>%TIMEDATE% : %LENMINS%</template> + <template>%TIMEDATE% %LONGREPEAT%</template> - </textarea> - -- <textarea name="longrepeat"> ++ </textarea> ++ + <!--use channum to detect if in videos--> + <textarea name="lenminsFilesize" depends="channum"> - <font>mediumsmall</font> -- <area>771,453,435,22</area> ++ <font>mediumsmall</font> + <area>871,453,335,22</area> + <align>right,vcenter</align> + <template>%LENMINS% (%FILESIZE_STR%)</template> -+ </textarea> -+ + </textarea> + +- <textarea name="longrepeat"> + <!--use channum to detect if in videos--> + <textarea name="lenmins" depends="!channum"> -+ <font>mediumsmall</font> + <font>mediumsmall</font> +- <area>771,453,435,22</area> + <area>871,453,335,22</area> <align>right,vcenter</align> - <template>%LONGREPEAT% Size: %FILESIZE_STR%</template> @@ -751,3 +751,66 @@ </fontdef> <shape name="mythpopupbox-backdrop"> +@@ -1810,7 +1836,7 @@ + </shape> + + <shape name="message-area-seperator-line"> +- <area>362,328,556,2</area> ++ <area>362,290,556,2</area> + <type>box</type> + <fill style="gradient"> + <gradient direction="horizontal" alpha="45"> +@@ -1822,21 +1848,21 @@ + </shape> + + <shape name="mythpopup-box-arrows-backdrop"> +- <area>342,603,50,14</area> ++ <area>888,603,50,14</area> + <type>roundbox</type> +- <fill color="#000000" alpha="200" /> ++ <fill color="#000000" alpha="140" /> + <cornerradius>90</cornerradius> + </shape> + + <textarea name="messagearea"> +- <area>355,126,570,196</area> +- <font>smallyellow</font> ++ <area>355,126,570,158</area> ++ <font>small</font> + <multiline>yes</multiline> + <align>allcenter</align> + </textarea> + + <buttonlist name="list"> +- <area>347,332,586,264</area> ++ <area>347,294,586,302</area> + <layout>vertical</layout> + <spacing>4</spacing> + <showarrow>yes</showarrow> +@@ -1922,7 +1948,7 @@ + </fill> + </shape> + <textarea name="buttontext"> +- <font>small</font> ++ <font>smallyellow</font> + </textarea> + <imagetype name="buttonarrow"> + <alpha>255</alpha> +@@ -1964,7 +1990,7 @@ + </state> + </statetype> + <statetype name="upscrollarrow"> +- <position>2,274</position> ++ <position>548,312</position> + <state type="off"> + <imagetype name="upon"> + <filename>images/osd/lists_up_arrow.png</filename> +@@ -1978,7 +2004,7 @@ + </state> + </statetype> + <statetype name="downscrollarrow"> +- <position>22,274</position> ++ <position>568,312</position> + <state type="off"> + <imagetype name="dnon"> + <filename>images/osd/lists_down_arrow.png</filename> diff --git a/abs/core/linhes-theme/preview.png b/abs/core/linhes-theme/preview.png Binary files differindex 7c1efdb..7c1efdb 100755..100644 --- a/abs/core/linhes-theme/preview.png +++ b/abs/core/linhes-theme/preview.png diff --git a/abs/core/linhes-theme/question.png b/abs/core/linhes-theme/question.png Binary files differindex 1eda678..1eda678 100755..100644 --- a/abs/core/linhes-theme/question.png +++ b/abs/core/linhes-theme/question.png diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch index 4c8f8c1..77969dc 100644 --- a/abs/core/linhes-theme/recordings-ui.xml.patch +++ b/abs/core/linhes-theme/recordings-ui.xml.patch @@ -1,5 +1,5 @@ --- recordings-ui.xml.orig 2016-11-16 20:12:29.390254787 +0000 -+++ recordings-ui.xml 2016-11-16 20:12:03.436933524 +0000 ++++ recordings-ui.xml 2016-12-23 02:34:31.313887659 +0000 @@ -105,19 +105,11 @@ </shape> @@ -30,7 +30,7 @@ <multiline>yes</multiline> </textarea> </state> -@@ -232,11 +225,12 @@ +@@ -232,16 +225,16 @@ <area>0,0,898,64</area> <textarea name="titlesubtitle" from="base_text_font_state_small"> <area>8,2,694,24</area> @@ -39,12 +39,19 @@ <align>vcenter</align> </textarea> <textarea name="shortstartdate" from="titlesubtitle"> - <area>720,3,80,24</area> -+ <font state="normal">basesmall</font> +- <area>720,3,80,24</area> ++ <area>720,2,80,24</area> <align>right,vcenter</align> </textarea> <textarea name="filesize_str" from="base_text_font_state_extrasmall"> -@@ -579,20 +573,20 @@ +- <area>818,7,72,18</area> +- <font state="normal">baseextrasmall</font> ++ <area>818,2,72,24</area> ++ <font state="normal">baseextrasmallyellow</font> + <cutdown>no</cutdown> + <align>right,vcenter</align> + </textarea> +@@ -579,20 +572,20 @@ <align>allcenter</align> </textarea> <textarea name="s00e00" from="base_text_font_state_extrasmall"> @@ -68,7 +75,7 @@ <font state="normal">baseextrasmall</font> <align>right,vcenter</align> </textarea> -@@ -606,57 +600,48 @@ +@@ -606,57 +599,48 @@ </statetype> </buttonlist> @@ -138,7 +145,7 @@ <font>basesupersmallyellow</font> <align>allcenter</align> <template>Disk space: %1</template> -@@ -688,7 +673,7 @@ +@@ -688,7 +672,7 @@ <textarea name="norecordings"> <area>350,87,906,351</area> <font>basemedium</font> diff --git a/abs/core/linhes-theme/schedule-ui.xml.patch b/abs/core/linhes-theme/schedule-ui.xml.patch index 930c26f..0ed5ba4 100644 --- a/abs/core/linhes-theme/schedule-ui.xml.patch +++ b/abs/core/linhes-theme/schedule-ui.xml.patch @@ -1,5 +1,5 @@ ---- schedule-ui.xml.orig 2014-10-26 18:47:27.740659484 +0000 -+++ schedule-ui.xml 2014-10-26 18:45:31.642195458 +0000 +--- schedule-ui.xml.orig 2017-01-12 02:24:06.812272686 +0000 ++++ schedule-ui.xml 2017-01-12 02:24:53.802894035 +0000 @@ -126,7 +126,7 @@ <conflictingcolor>#ff6600</conflictingcolor> <cutdown>no</cutdown> @@ -9,3 +9,42 @@ <recordstatus type="SingleRecord" image="images/gg-rs-single.png"></recordstatus> <recordstatus type="TimeslotRecord" image="images/gg-rs-timeslot.png"></recordstatus> <recordstatus type="ChannelRecord" image="images/gg-rs-channel.png"></recordstatus> +@@ -1437,10 +1437,10 @@ + </state> + </statetype> + <statetype name="upscrollarrow"> +- <position>0,350</position> ++ <position>550,350</position> + </statetype> + <statetype name="downscrollarrow"> +- <position>20,350</position> ++ <position>570,350</position> + </statetype> + </buttonlist> + +@@ -1544,10 +1544,10 @@ + </state> + </statetype> + <statetype name="upscrollarrow"> +- <position>0,350</position> ++ <position>550,350</position> + </statetype> + <statetype name="downscrollarrow"> +- <position>20,350</position> ++ <position>570,350</position> + </statetype> + </buttonlist> + +@@ -3098,10 +3098,10 @@ + </state> + </statetype> + <statetype name="upscrollarrow"> +- <position>0,350</position> ++ <position>550,350</position> + </statetype> + <statetype name="downscrollarrow"> +- <position>20,350</position> ++ <position>570,350</position> + </statetype> + </buttonlist> + diff --git a/abs/core/linhes-theme/status-ui.xml.patch b/abs/core/linhes-theme/status-ui.xml.patch new file mode 100644 index 0000000..9c26d77 --- /dev/null +++ b/abs/core/linhes-theme/status-ui.xml.patch @@ -0,0 +1,53 @@ +--- status-ui.xml.orig 2017-01-12 02:25:29.328323754 +0000 ++++ status-ui.xml 2017-01-12 02:19:35.527174739 +0000 +@@ -212,9 +212,9 @@ + + <textarea name="title"> + <area>4,4,552,64</area> +- <font>basemedium</font> ++ <font>basemediumyellow</font> + <align>allcenter</align> +- <value>MythTV is in standby mode!</value> ++ <value>MythTV is in Standby Mode</value> + </textarea> + + <statetype name="backendstatus"> +@@ -230,7 +230,7 @@ + <textarea name="status"> + <area>4,248,552,64</area> + <font>basemediumgreen</font> +- <value>Backend is idle!</value> ++ <value>Backend is Idle</value> + <align>allcenter</align> + <multiline>true</multiline> + </textarea> +@@ -241,16 +241,16 @@ + </shape> + <textarea name="status"> + <font>basemediumred</font> +- <value>Backend is recording!</value> ++ <value>Backend is Recording</value> + </textarea> + </state> + <state name="shuttingdown" from="idle"> + <shape name="icon"> +- <fill color="#d9d900" /> ++ <fill color="#d97616" /> + </shape> + <textarea name="status"> +- <font>basemediumyellow</font> +- <value>Shutting Down!</value> ++ <font>basemediumorange</font> ++ <value>MythTV is Shutting Down</value> + </textarea> + </state> + <state name="offline" from="idle"> +@@ -259,7 +259,7 @@ + </shape> + <textarea name="status"> + <font>basemediumred</font> +- <value>Backend is offline!</value> ++ <value>Backend is Offline</value> + </textarea> + </state> + </statetype> diff --git a/abs/core/linhes-theme/stream-ui.xml.patch b/abs/core/linhes-theme/stream-ui.xml.patch new file mode 100644 index 0000000..e555b2b --- /dev/null +++ b/abs/core/linhes-theme/stream-ui.xml.patch @@ -0,0 +1,568 @@ +--- stream-ui.xml.orig 2016-12-13 20:49:12.313146317 +0000 ++++ stream-ui.xml 2016-12-13 20:34:54.363217804 +0000 +@@ -41,7 +41,7 @@ + <area>28,40,1224,276</area> + <multiline>yes</multiline> + <align>allcenter</align> +- <value>Press MENU to add some radio streams to play.</value> ++ <value>Press MENU to add radio streams to play</value> + </textarea> + + <buttonlist name="streamlist" from="base_list"> +@@ -90,21 +90,24 @@ + </textarea> + </state> + </statetype> +- <textarea name="station" from="buttontext"> ++ <textarea name="broadcaster" from="buttontext"> + <area>153,0,200,30</area> + <align>left,vcenter</align> ++ <font>basesmall</font> + </textarea> +- <textarea name="channel" from="buttontext"> +- <area>363,0,370,30</area> +- <align>left,vcenter</align> ++ <textarea name="channel" from="broadcaster"> ++ <area>363,0,470,30</area> + </textarea> +- <textarea name="genre" from="buttontext"> +- <area>743,0,462,30</area> ++ <textarea name="genre" from="broadcaster"> ++ <area>843,0,362,30</area> + <align>right,vcenter</align> + </textarea> + </state> + <state name="selectedactive"> + <area>0,0,100%,64</area> ++ <group name="select_bar" from="base_select_bar_selectedactive_group"> ++ <area>0,0,100%,100%</area> ++ </group> + <imagetype name="buttonimage"> + <area>15,3,58,58</area> + <filename>mm_icecast.png</filename> +@@ -144,23 +147,43 @@ + </textarea> + </state> + </statetype> +- <textarea name="station" from="buttontext"> +- <area>183,0,200,64</area> ++ <textarea name="broadcaster" from="buttontext"> ++ <area>183,1,200,30</area> + <align>left,vcenter</align> + </textarea> +- <textarea name="channel" from="buttontext"> +- <area>393,0,356,64</area> +- <align>left,vcenter</align> ++ <textarea name="channel" from="broadcaster"> ++ <area>393,1,456,30</area> + </textarea> +- <textarea name="genre" from="buttontext"> +- <area>759,0,450,64</area> ++ <textarea name="genre" from="broadcaster"> ++ <area>859,1,350,30</area> + <align>right,vcenter</align> + </textarea> ++ <textarea name="description" from="broadcaster"> ++ <area>203,32,1006,30</area> ++ <font>basesmallerblue</font> ++ <multiline>no</multiline> ++ <scroll direction="left" startdelay="1"/> ++ </textarea> + </state> + <state name="selectedinactive" from="selectedactive"> + <group name="select_bar" from="base_select_bar_selectedinactive_group"> + <area>0,0,100%,100%</area> + </group> ++ <textarea name="broadcaster"> ++ <font>basesmall</font> ++ </textarea> ++ <textarea name="channel"> ++ <font>basesmall</font> ++ </textarea> ++ <textarea name="genre"> ++ <font>basesmall</font> ++ </textarea> ++ <textarea name="description" from="broadcaster"> ++ <area>203,32,1006,30</area> ++ <font>basesmallerblue</font> ++ <multiline>no</multiline> ++ <cutdown>yes</cutdown> ++ </textarea> + </state> + </statetype> + <statetype name="upscrollarrow"> +@@ -263,6 +286,18 @@ + <group name="select_bar" from="base_select_bar_selectedinactive_group"> + <area>0,0,100%,100%</area> + </group> ++ <textarea name="tracknum"> ++ <font>basesmall</font> ++ </textarea> ++ <textarea name="title"> ++ <font>basesmall</font> ++ </textarea> ++ <textarea name="artist"> ++ <font>basesmall</font> ++ </textarea> ++ <textarea name="length"> ++ <font>basesmall</font> ++ </textarea> + </state> + </statetype> + <statetype name="upscrollarrow"> +@@ -332,12 +367,12 @@ + + <textarea name="channel" from="basetextarea"> + <area>187,86,906,33</area> +- <font>basesmallblue</font> +- <template>%STATION% - %CHANNEL%</template> ++ <font>basesmall</font> ++ <template>%BROADCASTER% - %CHANNEL%</template> + </textarea> + + <textarea name="filename" from="basetextarea"> +- <font>basesmall</font> ++ <font>basesmallblue</font> + <area>187,119,906,33</area> + </textarea> + +@@ -359,22 +394,6 @@ + <align>allcenter</align> + </textarea> + +- <button name="prev" from="base_prev_button"> +- <position>584,158</position> +- </button> +- +- <button name="play" from="base_play_button"> +- <position>618,158</position> +- </button> +- +- <button name="stop" from="base_stop_button"> +- <position>646,158</position> +- </button> +- +- <button name="next" from="base_next_button"> +- <position>676,158</position> +- </button> +- + <statetype name="mutestate" from="base_mute_state"> + <position>57,163</position> + </statetype> +@@ -384,11 +403,11 @@ + </textarea> + + <progressbar name="bufferprogress" from="baseprogressbar"> +- <position>372,180</position> ++ <position>372,170</position> + </progressbar> + + <textarea name="bufferstatus" from="basetextarea"> +- <area>918,179,175,14</area> ++ <area>918,167,175,14</area> + <font>basesupersmallyellow</font> + </textarea> + +@@ -408,6 +427,7 @@ + + <shape name="edit-stream-metadata-backdrop-line" from="base_backdrop_line"> + <area>116,37,1048,506</area> ++ <area>116,37,1048,566</area> + </shape> + + <shape name="edit-stream-metadata-top-line" from="base_highlight_line"> +@@ -415,23 +435,25 @@ + </shape> + + <shape name="edit-stream-metadata-bottom-line" from="base_highlight_line"> +- <area>117,540,1046,2</area> ++ <area>117,600,1046,2</area> + </shape> + + <shape name="edit-stream-metadata-left-line" from="base_highlight_vertical_line"> +- <area>117,40,2,500</area> ++ <area>117,40,2,560</area> + </shape> + + <shape name="edit-stream-metadata-right-line" from="base_highlight_vertical_line"> +- <area>1161,40,2,500</area> ++ <area>1161,40,2,560</area> + </shape> + + <shape name="edit-stream-metadata-bottom-backdrop-line" from="base_backdrop_line"> + <area>116,547,1048,137</area> ++ <area>116,619,1048,65</area> + </shape> + + <shape name="edit-stream-metadata-bottom-top-line" from="base_highlight_line"> + <area>117,548,1046,2</area> ++ <area>117,620,1046,2</area> + </shape> + + <shape name="edit-stream-metadata-bottom-bottom-line" from="base_highlight_line"> +@@ -439,85 +461,137 @@ + </shape> + + <shape name="edit-stream-metadata-bottom-left-line" from="base_highlight_vertical_line"> +- <area>117,550,2,131</area> ++ <area>117,622,2,59</area> + </shape> + + <shape name="edit-stream-metadata-bottom-right-line" from="base_highlight_vertical_line"> +- <area>1161,550,2,131</area> +- </shape> +- +- <shape name="edit-stream-metadata-bottom-seperator-first-line" from="base_line"> +- <area>138,620,1004,2</area> ++ <area>1161,622,2,59</area> + </shape> + +- <textarea name="stationlabel" > +- <area>119,68,214,40</area> ++ <textarea name="broadcasterlabel" > ++ <area>119,54,140,40</area> + <font>basemedium</font> + <align>right,vcenter</align> +- <value>Station:</value> ++ <value>Broadcaster:</value> + </textarea> + +- <textedit name="stationedit" from="base_textedit"> +- <area>343,68,800,40</area> ++ <textedit name="broadcasteredit" from="base_textedit"> ++ <area>269,54,370,40</area> + </textedit> + +- <button name="searchbutton" from="base_button"> +- <area>465,136,350,40</area> +- <value>Search for Stream</value> +- </button> +- +- <textarea name="channellabel" from="stationlabel"> +- <position>119,204</position> ++ <textarea name="channellabel" from="broadcasterlabel"> ++ <area>649,54,120,40</area> + <value>Channel:</value> + </textarea> + +- <textedit name="channeledit" from="stationedit"> +- <position>343,204</position> ++ <textedit name="channeledit" from="broadcasteredit"> ++ <position>779,54</position> ++ </textedit> ++ ++ <textarea name="descriptionlabel" from="broadcasterlabel"> ++ <area>119,109,140,40</area> ++ <value>Description:</value> ++ </textarea> ++ ++ <textedit name="descriptionedit" from="broadcasteredit"> ++ <area>269,109,880,40</area> + </textedit> + +- <textarea name="urllabel" from="stationlabel"> +- <position>119,271</position> +- <value>URL:</value> ++ <textarea name="url1label" from="descriptionlabel"> ++ <position>119,164</position> ++ <value>URL1:</value> + </textarea> ++ <textedit name="url1edit" from="descriptionedit"> ++ <position>269,164</position> ++ </textedit> ++ ++ <textarea name="url2label" from="descriptionlabel"> ++ <position>119,219</position> ++ <value>URL2:</value> ++ </textarea> ++ <textedit name="url2edit" from="descriptionedit"> ++ <position>269,219</position> ++ </textedit> ++ ++ <textarea name="url3label" from="descriptionlabel"> ++ <position>119,274</position> ++ <value>URL3:</value> ++ </textarea> ++ <textedit name="url3edit" from="descriptionedit"> ++ <position>269,274</position> ++ </textedit> ++ ++ <textarea name="url4label" from="descriptionlabel"> ++ <position>119,329</position> ++ <value>URL4:</value> ++ </textarea> ++ <textedit name="url4edit" from="descriptionedit"> ++ <position>269,329</position> ++ </textedit> + +- <textedit name="urledit" from="stationedit"> +- <position>343,271</position> ++ <textarea name="url5label" from="descriptionlabel"> ++ <position>119,384</position> ++ <value>URL5:</value> ++ </textarea> ++ <textedit name="url5edit" from="descriptionedit"> ++ <position>269,384</position> + </textedit> + +- <textarea name="logourllabel" from="stationlabel"> +- <position>119,338</position> ++ <textarea name="logourllabel" from="descriptionlabel"> ++ <position>119,439</position> + <value>Logo URL:</value> + </textarea> + +- <textedit name="logourledit" from="urledit"> +- <position>343,338</position> ++ <textedit name="logourledit" from="descriptionedit"> ++ <position>269,439</position> + </textedit> + +- <textarea name="genrelabel" from="stationlabel"> +- <position>119,405</position> ++ <textarea name="genrelabel" from="broadcasterlabel"> ++ <position>119,494</position> + <value>Genres:</value> + </textarea> + +- <textedit name="genreedit" from="urledit"> +- <position>343,405</position> ++ <textedit name="genreedit" from="broadcasteredit"> ++ <position>269,494</position> + </textedit> + +- <textarea name="formatlabel" from="stationlabel"> +- <position>119,472</position> +- <value>Metadata Format:</value> ++ <textarea name="formatlabel" from="channellabel"> ++ <position>649,494</position> ++ <value>Format:</value> + </textarea> + +- <textedit name="formatedit" from="stationedit"> +- <position>343,472</position> ++ <textedit name="formatedit" from="channeledit"> ++ <position>779,494</position> ++ </textedit> ++ ++ <textarea name="countrylabel" from="broadcasterlabel"> ++ <position>119,549</position> ++ <value>Country:</value> ++ </textarea> ++ <textedit name="countryedit" from="broadcasteredit"> ++ <position>269,549</position> ++ </textedit> ++ ++ <textarea name="languagelabel" from="channellabel"> ++ <position>649,549</position> ++ <value>Language:</value> ++ </textarea> ++ <textedit name="languageedit" from="channeledit"> ++ <position>779,549</position> + </textedit> + + <button name="cancelbutton" from="base_button"> +- <area>233,632,350,40</area> ++ <area>138,632,320,40</area> + <value>Cancel</value> + </button> + ++ <button name="searchbutton" from="base_button"> ++ <area>480,632,320,40</area> ++ <value>Search for Stream...</value> ++ </button> ++ + <button name="savebutton" from="base_button"> +- <area>697,632,350,40</area> ++ <area>822,632,320,40</area> + <value>Save</value> + </button> + +@@ -553,14 +627,6 @@ + <area>1256,40,2,211</area> + </shape> + +- <shape name="stream-search-image-border"> +- <area>37,53,247,185</area> +- <type>roundbox</type> +- <fill color="#000000" alpha="0" /> +- <line color="#AAAAAA" alpha="100" width="2" /> +- <cornerradius>6</cornerradius> +- </shape> +- + <shape name="stream-list-backdrop" from="base_backdrop"> + <area>20,265,1240,420</area> + </shape> +@@ -589,50 +655,65 @@ + <area>1207,685,50,10</area> + </shape> + +- <imagetype name="stream-search-image"> +- <area>41,57,239,177</area> +- <filename>images/stream_search_image.png</filename> +- <mask>images/masks/stream_search_image_mask.png</mask> +- <preserveaspect>no</preserveaspect> +- </imagetype> +- +- <textarea name="stationlabel" > +- <area>214,64,250,40</area> ++ <textarea name="broadcasterlabel" > ++ <area>71,64,150,40</area> + <font>basemedium</font> + <align>right,vcenter</align> +- <value>Station:</value> ++ <value>Broadcaster:</value> + </textarea> + +- <buttonlist name="stationlist" from="base_selector"> +- <area>470,64,376,40</area> ++ <buttonlist name="broadcasterlist" from="base_selector"> ++ <area>231,64,370,40</area> + </buttonlist> + +- <textarea name="genrelabel" from="stationlabel"> +- <position>214,125</position> ++ <textarea name="genrelabel" from="broadcasterlabel"> ++ <area>611,64,150,40</area> + <value>Genre:</value> + </textarea> + +- <buttonlist name="genrelist" from="stationlist"> +- <position>470,125</position> ++ <buttonlist name="genrelist" from="broadcasterlist"> ++ <position>771,64</position> ++ </buttonlist> ++ ++ <textarea name="countrylabel" from="broadcasterlabel"> ++ <position>71,125</position> ++ <value>Country:</value> ++ </textarea> ++ ++ <buttonlist name="countrylist" from="broadcasterlist"> ++ <position>231,125</position> ++ </buttonlist> ++ ++ <textarea name="languagelabel" from="genrelabel"> ++ <position>611,125</position> ++ <value>Language:</value> ++ </textarea> ++ ++ <buttonlist name="languagelist" from="genrelist"> ++ <position>771,125</position> + </buttonlist> + +- <textarea name="channellabel" from="stationlabel"> +- <position>214,186</position> ++ <textarea name="channellabel" from="broadcasterlabel"> ++ <position>71,186</position> + <value>Channel:</value> + </textarea> + + <textedit name="channeledit" from="base_textedit"> +- <area>470,186,376,40</area> ++ <area>231,186,370,40</area> + <textarea name="text"> + <area>18,0,95%,100%</area> + </textarea> + </textedit> + ++ <textarea name="matcheslabel" from="genrelabel" depends="matchestext"> ++ <position>611,186</position> ++ <value>Matches:</value> ++ </textarea> ++ + <textarea name="matchestext"> +- <area>871,40,375,211</area> +- <font>basemediumblue</font> +- <align>allcenter</align> +- <template>Matches: %1</template> ++ <area>771,186,370,40</area> ++ <font>basemedium</font> ++ <align>left,vcenter</align> + </textarea> + + <buttonlist name="streamlist" from="base_list"> +@@ -650,16 +731,16 @@ + <area>15,1,28,28</area> + <filename>mythmusic/mm_icecast.png</filename> + </imagetype> +- <textarea name="station" from="buttontext"> ++ <textarea name="broadcasterchannel" from="buttontext"> + <area>58,0,548,30</area> + <font>basesmall</font> + <align>left,vcenter</align> +- <template>%STATION% - %Channel%</template> + </textarea> +- <textarea name="genre" from="buttontext"> +- <area>621,0,548,30</area> +- <font>basesmall</font> +- <align>left,vcenter</align> ++ <textarea name="genre" from="broadcasterchannel"> ++ <area>621,0,355,30</area> ++ </textarea> ++ <textarea name="language" from="broadcasterchannel"> ++ <area>990,0,177,30</area> + </textarea> + <statetype name="selectedstate"> + <position>1184,2</position> +@@ -681,18 +762,21 @@ + <area>15,4,56,56</area> + <filename>mythmusic/mm_icecast.png</filename> + </imagetype> +- <textarea name="station" from="buttontext"> +- <area>86,0,534,64</area> +- <font>basesmall</font> +- <multiline>yes</multiline> ++ <textarea name="broadcasterchannel" from="buttontext"> ++ <area>86,0,534,30</area> ++ <font>basesmallyellow</font> ++ <multiline>no</multiline> + <align>left,vcenter</align> +- <template>%STATION% - %Channel%</template> + </textarea> +- <textarea name="genre" from="buttontext"> +- <area>635,0,534,64</area> +- <font>basesmall</font> +- <multiline>yes</multiline> +- <align>left,vcenter</align> ++ <textarea name="genre" from="broadcasterchannel"> ++ <area>635,0,534,30</area> ++ </textarea> ++ <textarea name="language" from="broadcasterchannel"> ++ <area>1004,0,177,30</area> ++ </textarea> ++ <textarea name="description" from="broadcasterchannel"> ++ <area>86,30,100%,30</area> ++ <scroll direction="left" startdelay="2"/> + </textarea> + <statetype name="selectedstate"> + <position>1184,19</position> +@@ -708,6 +792,20 @@ + <group name="select_bar" from="base_select_bar_selectedinactive_group"> + <area>0,0,100%,100%</area> + </group> ++ <textarea name="broadcasterchannel"> ++ <font>basesmall</font> ++ </textarea> ++ <textarea name="genre"> ++ <font>basesmall</font> ++ </textarea> ++ <textarea name="language"> ++ <font>basesmall</font> ++ </textarea> ++ <textarea name="description" from="broadcasterchannel"> ++ <area>86,30,100%,30</area> ++ <font>basesmall</font> ++ <cutdown>yes</cutdown> ++ </textarea> + </state> + </statetype> + <statetype name="upscrollarrow"> +@@ -718,7 +816,6 @@ + </statetype> + </buttonlist> + +- + </window> + + </mythuitheme> diff --git a/abs/core/linhes-theme/tux_thoughts.png b/abs/core/linhes-theme/tux_thoughts.png Binary files differindex c36c7a6..c36c7a6 100755..100644 --- a/abs/core/linhes-theme/tux_thoughts.png +++ b/abs/core/linhes-theme/tux_thoughts.png diff --git a/abs/core/linhes-theme/video-ui.xml.patch b/abs/core/linhes-theme/video-ui.xml.patch index 0047776..5c84fcd 100644 --- a/abs/core/linhes-theme/video-ui.xml.patch +++ b/abs/core/linhes-theme/video-ui.xml.patch @@ -1,5 +1,5 @@ ---- video-ui.xml.orig 2016-11-16 20:12:36.859292023 +0000 -+++ video-ui.xml 2016-11-16 20:11:55.327978776 +0000 +--- video-ui.xml.orig 2016-12-13 20:43:30.600314830 +0000 ++++ video-ui.xml 2016-12-13 20:34:54.359884898 +0000 @@ -171,6 +171,7 @@ <textarea name="description" from="basetextarea"> <area>24,51,515,393</area> @@ -8,6 +8,52 @@ <font>basesmall</font> </textarea> +@@ -358,38 +359,38 @@ + </imagetype> + <textarea name="title" from="basetextarea"> + <area>88,1,498,24</area> +- <font>basesmall</font> ++ <font>basesmallyellow</font> + </textarea> + <textarea name="director" from="title"> + <area>606,1,536,24</area> + <cutdown>no</cutdown> + </textarea> + <textarea name="year" from="title"> +- <area>1162,2,54,24</area> ++ <area>1162,1,54,24</area> + <cutdown>no</cutdown> + <align>right,vcenter</align> + </textarea> + <textarea name="rating" from="basetextarea"> +- <area>88,23,196,20</area> ++ <area>88,26,196,20</area> + <font>baseextrasmallblue</font> + <cutdown>no</cutdown> + <align>vcenter</align> + <template>Rated: %1</template> + </textarea> + <textarea name="length" from="rating"> +- <area>305,23,280,20</area> ++ <area>305,26,280,20</area> + <template>Runtime: %1</template> + </textarea> + <textarea name="season" from="rating"> +- <area>606,23,216,20</area> ++ <area>606,26,216,20</area> + <template>Season: %1</template> + </textarea> + <textarea name="episode" from="rating"> +- <area>843,23,228,20</area> ++ <area>843,26,228,20</area> + <template>Episode: %1</template> + </textarea> + <textarea name="browseable" from="rating"> +- <area>1082,23,134,20</area> ++ <area>1082,26,134,20</area> + <align>right,vcenter</align> + <template>Browseable: %1</template> + </textarea> @@ -641,7 +642,7 @@ <multiline>yes</multiline> <font>basesmall</font> diff --git a/abs/core/linhes-theme/warning.png b/abs/core/linhes-theme/warning.png Binary files differindex 047cac5..047cac5 100755..100644 --- a/abs/core/linhes-theme/warning.png +++ b/abs/core/linhes-theme/warning.png |