linhes-theme: fix radio and other music changes

17 files changed, 1020 insertions, 13 deletions

diff --git a/abs/core/linhes-theme/LHLogo.png b/abs/core/linhes-theme/LHLogo.png
index 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
index 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 10fe8e1..21f4f02 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,15 +1,17 @@
 pkgname=linhes-theme
 pkgver=8.4
-pkgrel=15
+pkgrel=16
 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'
+         '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'
@@ -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/
 
@@ -95,13 +95,17 @@ package() {
 }
 md5sums=('2dca856c2a4d1f959473512c94e43b60'
          '196b4d6691e95b87a76a9ed8be31a3d9'
-         'f2b9c85519e80843294315a42870e582'
+         '4679c0ae9b20a0e0b1f8076c8ca9d0b4'
+         'ed56a335f8523d288609a81c005cab3f'
          '43b1f213fd392fb07aac503e775e27bc'
+         '1839ffcf43f79bd1ea01e1157214b7ba'
+         '7c3f09b68984af25035662a7ebc1a297'
          '80bb72994eca59ca6dc9034ac185e7cc'
-         '22ff4044c8c29560451fb51dcbf4d44e'
          '9fe3371a8b964a7028126405cfaa330b'
          'ca7efe27ec941e341a555451a48f42ed'
-         '0d62c91c3c1fe76a4549459741591312'
+         '22ff4044c8c29560451fb51dcbf4d44e'
+         '8312aff444945f80a76100696c81cb2e'
+         '5527190d8dd74e720b9160f851727390'
          '5a8fb2a5f0e657d52be6f0a6a006ce72'
          '35d77d91125e46728a30ab23d0903223'
          'bfc32b9fa5dca3d46dd6f365ecb449b5'
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index f672114..83abca6 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	2016-12-13 20:34:54.356551993 +0000
 @@ -3,55 +3,55 @@
  <mythuitheme>
  
@@ -333,3 +333,13 @@
          </shape>
       </group>
  
+@@ -1564,6 +1564,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>
diff --git a/abs/core/linhes-theme/blank_coverart.png b/abs/core/linhes-theme/blank_coverart.png
index 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
index 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
index 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
index 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/music-base.xml.patch b/abs/core/linhes-theme/music-base.xml.patch
new file mode 100644
index 0000000..14eb785
--- /dev/null
+++ b/abs/core/linhes-theme/music-base.xml.patch
@@ -0,0 +1,112 @@
+--- music-base.xml.orig	2016-12-13 20:45:06.068067497 +0000
++++ music-base.xml	2016-12-13 20:34:54.359884898 +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">
+@@ -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..762bae2
--- /dev/null
+++ b/abs/core/linhes-theme/music-ui.xml.patch
@@ -0,0 +1,256 @@
+--- music-ui.xml.orig	2016-12-13 20:47:17.067929339 +0000
++++ music-ui.xml	2016-12-13 20:34:54.363217804 +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>
+@@ -153,40 +153,45 @@
+                         </state>
+                     </statetype>
+                     <textarea name="tracknum">
+-                        <area>159,2,52,24</area>
++                        <area>146,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>219,1,540,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>229,24,540,20</area>
++                        <font>baseextrasmallblue</font>
+                         <align>left,vcenter</align>
+                     </textarea>
+                     <textarea name="genre" from="album">
+-                        <area>784,0,340,64</area>
++                        <area>784,24,340,20</area>
+                     </textarea>
+                     <statetype name="ratingstate" from="base_rating_state">
+-                        <position>219,40</position>
++                        <position>229,40</position>
+                     </statetype>
+                     <textarea name="lastplayed" from="album">
+-                        <area>774,43,250,20</area>
++                        <area>784,43,250,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">
+@@ -355,7 +360,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">
+@@ -681,7 +686,7 @@
+                                 <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>
+@@ -1909,6 +1914,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 +3613,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/preview.png b/abs/core/linhes-theme/preview.png
index 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
index 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/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
index 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
index 047cac5..047cac5 100755..100644
--- a/abs/core/linhes-theme/warning.png
+++ b/abs/core/linhes-theme/warning.png