--- 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>