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