diff options
Diffstat (limited to 'abs/core/linhes-theme')
| -rwxr-xr-x | abs/core/linhes-theme/PKGBUILD | 43 | ||||
| -rw-r--r-- | abs/core/linhes-theme/base.xml.patch | 411 | ||||
| -rw-r--r-- | abs/core/linhes-theme/browser-ui.xml.patch | 13 | ||||
| -rw-r--r-- | abs/core/linhes-theme/config-ui.xml.patch | 408 | ||||
| -rw-r--r-- | abs/core/linhes-theme/controls-ui.xml.patch | 11 | ||||
| -rw-r--r-- | abs/core/linhes-theme/musicsettings-ui.xml.patch | 366 | ||||
| -rw-r--r-- | abs/core/linhes-theme/mytharchive-ui.xml.patch | 38 | ||||
| -rw-r--r-- | abs/core/linhes-theme/mythburn-ui.xml.patch | 20 | ||||
| -rw-r--r-- | abs/core/linhes-theme/mythnative-ui.xml.patch | 20 | ||||
| -rw-r--r-- | abs/core/linhes-theme/notification-ui.xml.patch | 54 | ||||
| -rw-r--r-- | abs/core/linhes-theme/schedule-ui.xml.patch | 117 | ||||
| -rw-r--r-- | abs/core/linhes-theme/settings-ui.xml.patch | 11 | ||||
| -rw-r--r-- | abs/core/linhes-theme/standardsetting-ui.xml | 441 | ||||
| -rw-r--r-- | abs/core/linhes-theme/video-ui.xml.patch | 135 | ||||
| -rw-r--r-- | abs/core/linhes-theme/weather-ui.xml.patch | 126 |
15 files changed, 2151 insertions, 63 deletions
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 07cb1b5..0420f3e 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,23 +1,26 @@ pkgname=linhes-theme -pkgver=8.4 -pkgrel=22 +pkgver=8.5 +pkgrel=4 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' 'browser-ui.xml.patch' - 'controls-ui.xml.patch' 'menu-ui-vert.xml.patch' - 'music-base.xml.patch' 'music-ui.xml.patch' + 'config-ui.xml.patch' 'controls-ui.xml.patch' 'menu-ui-vert.xml.patch' + 'music-base.xml.patch' 'music-ui.xml.patch' 'musicsettings-ui.xml.patch' + 'mytharchive-ui.xml.patch' 'mythburn-ui.xml.patch' + 'mythnative-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') + 'recordings-ui.xml.patch' 'schedule-ui.xml.patch' 'settings-ui.xml.patch' + 'status-ui.xml.patch' 'stream-ui.xml.patch' 'video-ui.xml.patch' + 'weather-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' 'image-ui.xml' + 'image-ui.xml' 'standardsetting-ui.xml' 'LHLogo.png' 'LHLogoAndText.png') install=$pkgname.install @@ -59,8 +62,6 @@ package() { msg "Copy *.xml and adding backgrounds and images for LinHES" rsync -pL $srcdir/*.xml $pkgdir/$THEMEROOT/LinHES/ - rsync -pL $srcdir/progdetails_page1.html $pkgdir/$THEMEROOT/LinHES/htmls/ - rsync -pL $srcdir/progdetails_page1.html $pkgdir/$THEMEROOT/LinHES/htmls/progdetails_page2.html rm -r $pkgdir/$THEMEROOT/LinHES/images/backgrounds/* rm -r $pkgdir/$THEMEROOT/LinHES/osd.xml.alt rsync -pL $srcdir/bubble_background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/background.png @@ -75,6 +76,9 @@ package() { rsync -pL $srcdir/LHLogo.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/LHLogoAndText.png $pkgdir/$THEMEROOT/LinHES/images/ + #remove old htmls directory + rm -r $pkgdir/$THEMEROOT/LinHES/htmls + #vertical menu mv $pkgdir/$THEMEROOT/LinHES/menu-ui-vert.xml $pkgdir/$THEMEROOT/LinHES/menu-ui.xml @@ -95,19 +99,26 @@ package() { } md5sums=('2dca856c2a4d1f959473512c94e43b60' '3fc2c8838a9e331a2d19c114760a5acb' - '66dd0365257d88b48ffeec00289e3b22' - '66436e11442b31bf8238f36eae453298' - 'ed56a335f8523d288609a81c005cab3f' + 'b534a456304ed75d0082e04e4fd7a965' + 'd1d54968a2297924673d9653f707df33' + 'b7ab73f7e445b617b1ea293ca40ef4e4' + '26a6db272dee225b9e4dc282f1494e51' 'b90b745c72a057c78ebd0b6f2c5530b9' 'a0ea2d3e386c0b483b31aa1a2703f9eb' '8f8c27146e11954f60913da6d1fce073' - '80bb72994eca59ca6dc9034ac185e7cc' + '09806f2e1d1e6050cc0d10cc6c5daf36' + 'cf259052229f42646d7f37023ec55f44' + '52bb1c1a6c693adc8c04227fb124955a' + '643e7d548587b8742ed5accb6d736257' + 'dd1e013e806efc26049ea89637a51f83' '9fe3371a8b964a7028126405cfaa330b' '537e12f58ae8da81176d8b982ac9c783' - '0a50f8ecd3d73622b31b52b905307c34' + 'a0b6733e4a6734a3c24e8dc3b0c14e74' + '384871202030f41148536e2e89bb1801' '4d01487b534e45c631734501ec0da501' '8312aff444945f80a76100696c81cb2e' - '5527190d8dd74e720b9160f851727390' + '81a2706cd36a16a1e0c54d87f3a0857b' + '4125880d1739b196a8041ecc3d773ee2' '5a8fb2a5f0e657d52be6f0a6a006ce72' '36952501471b05395e4f061557447b2f' 'bfc32b9fa5dca3d46dd6f365ecb449b5' @@ -119,7 +130,7 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60' 'e8dee86a10ce7c4423a97305b38b4668' 'e8ac15e38b3dc99c9e889e439ba356de' 'e8cf0d3a55ba3be47deae55c05432141' - '58834fbee0230c713802c61e635cbab0' '3f600b966bd813dd27f620762ddb3ac8' + 'a2d7c855d78b4fa5e9714509891a6cb9' 'b51ef0cbf8ed2d3a8c1a8257a89aceff' '09ad14842f828b7a8d24070ec8214fe5') diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch index 1f3b71a..fb6091f 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-12-13 20:41:54.779274682 +0000 -+++ base.xml 2017-01-12 17:34:48.863983285 +0000 +--- base.xml.orig 2017-12-01 19:19:20.906194024 +0000 ++++ base.xml 2017-12-01 19:13:11.344053140 +0000 @@ -3,55 +3,55 @@ <mythuitheme> @@ -233,7 +233,19 @@ <font state="normal">basesmallverylightgrey</font> <font state="running">basesmallgreen</font> <cutdown>yes</cutdown> -@@ -411,7 +415,7 @@ +@@ -392,9 +396,10 @@ + + <!-- Base heading definition. --> + <textarea name="base_heading"> +- <area>0,0,1280,22</area> ++ <area>486,0,308,22</area> + <font>baseextrasmall</font> + <align>allcenter</align> ++ <scroll direction="horizontal" /> + <value>Heading</value> + </textarea> + +@@ -411,7 +416,7 @@ <area>283,436,50,11</area> <type>roundbox</type> <fill color="#000000" alpha="200" /> @@ -242,7 +254,7 @@ </shape> <shape name="base_backdrop_line"> -@@ -424,7 +428,7 @@ +@@ -424,7 +429,7 @@ <!-- Base definition of a base popup backdrop --> <shape name="base_popup_backdrop" from="base_backdrop"> @@ -251,7 +263,16 @@ </shape> <!-- Base definition of a heading group --> -@@ -535,10 +539,10 @@ +@@ -481,7 +486,7 @@ + + <!-- Base denfinition of a clock --> + <clock name="base_clock"> +- <area>494,698,292,22</area> ++ <area>486,698,308,22</area> + <font>baseextrasmall</font> + <template>%DATE%, %TIME%</template> + <align>allcenter</align> +@@ -535,10 +540,10 @@ <type>box</type> <fill style="gradient"> <gradient direction="horizontal" alpha="50"> @@ -266,7 +287,7 @@ </gradient> </fill> </shape> -@@ -547,10 +551,10 @@ +@@ -547,10 +552,10 @@ <type>box</type> <fill style="gradient"> <gradient direction="horizontal" alpha="50"> @@ -281,7 +302,7 @@ </gradient> </fill> </shape> -@@ -667,10 +671,10 @@ +@@ -667,10 +672,10 @@ <type>box</type> <fill style="gradient"> <gradient direction="horizontal" alpha="50"> @@ -296,7 +317,7 @@ </gradient> </fill> </shape> -@@ -679,10 +683,10 @@ +@@ -679,10 +684,10 @@ <type>box</type> <fill style="gradient"> <gradient direction="horizontal" alpha="50"> @@ -311,7 +332,7 @@ </gradient> </fill> </shape> -@@ -700,10 +704,10 @@ +@@ -700,10 +705,10 @@ <type>box</type> <fill style="gradient"> <gradient direction="horizontal" alpha="50"> @@ -326,7 +347,7 @@ </gradient> </fill> </shape> -@@ -712,10 +716,10 @@ +@@ -712,10 +717,10 @@ <type>box</type> <fill style="gradient"> <gradient direction="horizontal" alpha="50"> @@ -341,7 +362,7 @@ </gradient> </fill> </shape> -@@ -863,7 +867,7 @@ +@@ -863,7 +868,7 @@ <type>roundbox</type> <fill color="#1a1a1a" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -350,7 +371,7 @@ </shape> <shape name="select_bar_top_highlight"> <area>0,0,100%,2</area> -@@ -956,7 +960,7 @@ +@@ -956,7 +961,7 @@ <type>roundbox</type> <fill color="#333333" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -359,7 +380,7 @@ </shape> </group> -@@ -967,7 +971,7 @@ +@@ -967,7 +972,7 @@ <type>roundbox</type> <fill color="#1a1a1a" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -368,7 +389,7 @@ </shape> <shape name="select_bar_top_highlight"> <area>0,0,100%,2</area> -@@ -1060,7 +1064,7 @@ +@@ -1060,7 +1065,7 @@ <type>roundbox</type> <fill color="#333333" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -377,7 +398,7 @@ </shape> </group> -@@ -1071,7 +1075,7 @@ +@@ -1071,7 +1076,7 @@ <type>roundbox</type> <fill color="#1a1a1a" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -386,7 +407,7 @@ </shape> <shape name="select_bar_top_highlight"> <area>0,0,100%,2</area> -@@ -1164,7 +1168,7 @@ +@@ -1164,7 +1169,7 @@ <type>roundbox</type> <fill color="#1a1a1a" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -395,7 +416,7 @@ </shape> </group> -@@ -1233,7 +1237,7 @@ +@@ -1233,7 +1238,7 @@ <type>roundbox</type> <fill color="#333333" alpha="175" /> <line color="#454545" alpha="180" width="2" /> @@ -404,7 +425,7 @@ </shape> </group> -@@ -1455,7 +1459,7 @@ +@@ -1455,7 +1460,7 @@ <area>0,0,100%,100%</area> </group> <textarea name="buttontext"> @@ -413,7 +434,7 @@ </textarea> </state> <state name="selectedinactive" from="active"> -@@ -1564,6 +1568,9 @@ +@@ -1564,6 +1569,9 @@ <group name="select_bar" from="base_select_bar_selectedinactive_group"> <area>0,0,100%,100%</area> </group> @@ -423,7 +444,7 @@ <imagetype name="buttonarrow"> <filename>images/lists_right_arrow.png</filename> <alpha>0</alpha> -@@ -1664,6 +1671,7 @@ +@@ -1664,6 +1672,7 @@ </state> </statetype> <textarea name="buttontext" from="base_text_font_state_small"> @@ -431,7 +452,40 @@ </textarea> <statetype name="buttoncheck"> <state type="off"> -@@ -2186,7 +2194,7 @@ +@@ -1732,7 +1741,7 @@ + <area>15,1,100%-15,100%</area> + <align>allcenter</align> + <font>basemedium</font> +- <font state="selected">basemedium</font> ++ <font state="selected">basemediumyellow</font> + <font state="disabled">basemediumdarkgrey</font> + </textarea> + </state> +@@ -1831,16 +1840,20 @@ + <area>0,0,30,30</area> + <statetype name="checkstate"> + <state type="off"> +- <imagetype name="background"> ++ <imagetype name="mark"> + <filename>images/unchecked.png</filename> + </imagetype> + </state> +- <state type="half" /> +- <state type="full"> ++ <state type="half"> + <imagetype name="mark"> + <filename>images/checked.png</filename> + </imagetype> + </state> ++ <state type="full"> ++ <imagetype name="mark"> ++ <filename>images/checked_selected.png</filename> ++ </imagetype> ++ </state> + </statetype> + <statetype name="background"> + <state name="active" /> +@@ -2186,7 +2199,7 @@ </shape> <shape name="popup-seperator-line" from="base_line"> @@ -440,7 +494,7 @@ </shape> <shape name="popup-third-line" from="base_highlight_line"> -@@ -2202,18 +2210,18 @@ +@@ -2202,23 +2215,23 @@ </shape> <shape name="popup-arrows-backdrop" from="base_arrows_backdrop"> @@ -463,7 +517,32 @@ <statetype name="buttonitem"> <state name="active"> <area>0,0,100%,34</area> -@@ -2244,10 +2252,10 @@ + <textarea name="buttontext"> +- <area>8,0,586,34</area> ++ <area>8,0,570,34</area> + </textarea> + <imagetype name="buttonarrow"> + <position>560,8</position> +@@ -2227,7 +2240,8 @@ + <state name="selectedactive"> + <area>0,0,100%,34</area> + <textarea name="buttontext"> +- <area>8,0,586,34</area> ++ <area>8,0,570,34</area> ++ <scroll direction="horizontal" /> + </textarea> + <imagetype name="buttonarrow"> + <position>560,8</position> +@@ -2236,7 +2250,7 @@ + <state name="selectedinactive"> + <area>0,0,100%,34</area> + <textarea name="buttontext"> +- <area>8,0,586,34</area> ++ <area>8,0,570,34</area> + </textarea> + <imagetype name="buttonarrow"> + <position>560,8</position> +@@ -2244,10 +2258,10 @@ </state> </statetype> <statetype name="upscrollarrow"> @@ -476,7 +555,7 @@ </statetype> </buttonlist> </window> -@@ -2299,7 +2307,7 @@ +@@ -2299,7 +2313,7 @@ </shape> <shape name="large-dialogbox-arrows-backdrop" from="base_arrows_backdrop"> @@ -485,7 +564,7 @@ </shape> <textarea name="messagearea" from="basetextarea"> -@@ -2332,10 +2340,10 @@ +@@ -2332,10 +2346,10 @@ </state> </statetype> <statetype name="upscrollarrow"> @@ -498,7 +577,103 @@ </statetype> </buttonlist> </window> -@@ -2795,10 +2803,10 @@ +@@ -2486,7 +2500,7 @@ + + <textarea name="message" from="basetextarea"> + <area>8,8,571,127</area> +- <font>basesmalldarkyellow</font> ++ <font>basesmall</font> + <align>allcenter</align> + <multiline>yes</multiline> + <cutdown>no</cutdown> +@@ -2501,6 +2515,7 @@ + <area>338,151,150,35</area> + <value>OK</value> + </button> ++ + </window> + + <!-- Popup search dialog used to search button lists --> +@@ -2630,12 +2645,12 @@ + + <textarea name="message" from="basetextarea"> + <area>10,14,567,36</area> +- <font>basesmalldarkyellow</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + + <textedit name="input" from="base_textedit"> +- <area>150,62,287,40</area> ++ <area>50,62,487,40</area> + </textedit> + + <button name="ok" from="base_button"> +@@ -2708,6 +2723,63 @@ + + </window> + ++ <window name="MythSpinBoxDialog"> ++ <area>-1,-1,587,178</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="Myth-spinbox-backdrop" from="base_popup_backdrop"> ++ <area>0,0,587,178</area> ++ </shape> ++ ++ <shape name="Myth-spinbox-backdrop-line" from="base_backdrop_line"> ++ <area>1,1,585,176</area> ++ </shape> ++ ++ <shape name="Myth-spinbox-dialog-top-line" from="base_highlight_line"> ++ <area>2,2,583,2</area> ++ </shape> ++ ++ <shape name="Myth-spinbox-dialog-bottom-line" from="base_highlight_line"> ++ <area>2,174,583,2</area> ++ </shape> ++ ++ <shape name="Myth-spinbox-dialog-left-line" from="base_highlight_vertical_line"> ++ <area>2,4,2,170</area> ++ </shape> ++ ++ <shape name="Myth-spinbox-dialog-right-line" from="base_highlight_vertical_line"> ++ <area>583,4,2,170</area> ++ </shape> ++ ++ <textarea name="message" from="basetextarea"> ++ <area>10,14,567,36</area> ++ <font>basesmall</font> ++ <align>allcenter</align> ++ </textarea> ++ ++ <spinbox name="input" from="base_spinbox"> ++ <position>253,62</position> ++ </spinbox> ++ ++ <button name="ok" from="base_button"> ++ <area>218,124,150,35</area> ++ <value>OK</value> ++ </button> ++ </window> ++ + <window name="MythSearchDialog"> + <area>-1,-1,602,488</area> + +@@ -2795,10 +2867,10 @@ </state> </statetype> <statetype name="upscrollarrow"> @@ -511,3 +686,187 @@ </statetype> </buttonlist> +@@ -2819,7 +2891,7 @@ + <group name="fanart-group" from="base_fanart_group" /> + + <textarea name="heading" from="base_heading"> +- <value>FileBrowser</value> ++ <value>File Browser</value> + </textarea> + + <shape name="fullpath-backdrop" from="base_backdrop"> +@@ -2836,87 +2908,85 @@ + </shape> + + <shape name="file-browser-preview-backdrop" from="base_backdrop"> +- <area>20,92,615,592</area> ++ <area>645,92,615,592</area> + </shape> + + <shape name="file-browser-preview-backdrop-line" from="base_backdrop_line"> +- <area>21,93,613,590</area> ++ <area>646,93,613,590</area> + </shape> + + <shape name="file-browser-preview-top-line" from="base_highlight_line"> +- <area>22,94,611,2</area> ++ <area>647,94,611,2</area> + </shape> + + <shape name="file-browser-preview-bottom-line" from="base_highlight_line"> +- <area>22,680,611,2</area> ++ <area>647,680,611,2</area> + </shape> + + <shape name="file-browser-preview-left-line" from="base_highlight_vertical_line"> +- <area>22,96,2,584</area> ++ <area>647,96,2,584</area> + </shape> + + <shape name="file-browser-preview-right-line" from="base_highlight_vertical_line"> +- <area>631,96,2,584</area> ++ <area>1256,96,2,584</area> + </shape> + + <shape name="file-browser-preview-image-line" from="base_backdrop_line"> +- <area>42,158,571,324</area> ++ <area>667,107,571,324</area> + </shape> + + <shape name="file-browser-preview-image-top-line" from="base_highlight_line"> +- <area>43,159,569,2</area> ++ <area>668,108,569,2</area> + </shape> + + <shape name="file-browser-preview-image-bottom-line" from="base_highlight_line"> +- <area>43,479,569,2</area> ++ <area>668,428,569,2</area> + </shape> + + <shape name="file-browser-preview-image-left-line" from="base_highlight_vertical_line"> +- <area>43,161,2,318</area> ++ <area>668,110,2,318</area> + </shape> + + <shape name="file-browser-preview-image-right-line" from="base_highlight_vertical_line"> +- <area>610,161,2,318</area> ++ <area>1235,110,2,318</area> + </shape> + + <shape name="file-browser-backdrop" from="base_backdrop"> +- <area>645,92,615,592</area> ++ <area>20,92,615,592</area> + </shape> + + <shape name="file-browser-backdrop-line" from="base_backdrop_line"> +- <area>646,93,613,590</area> ++ <area>21,93,613,590</area> + </shape> + + <shape name="file-browser-top-line" from="base_highlight_line"> +- <area>647,94,611,2</area> ++ <area>22,94,611,2</area> + </shape> + + <shape name="file-browser-bottom-line" from="base_highlight_line"> +- <area>647,680,611,2</area> ++ <area>22,680,611,2</area> + </shape> + + <shape name="file-browser-left-line" from="base_highlight_vertical_line"> +- <area>647,96,2,584</area> ++ <area>22,96,2,584</area> + </shape> + + <shape name="file-browser-right-line" from="base_highlight_vertical_line"> +- <area>1256,96,2,584</area> ++ <area>631,96,2,584</area> + </shape> + + <shape name="file-browser-arrows-backdrop" from="base_arrows_backdrop"> +- <area>1207,684,50,10</area> ++ <area>582,684,50,10</area> + </shape> + + <textarea name="fullpath" from="basetextarea"> +- <area>24,39,1224,37</area> + <cutdown>yes</cutdown> +- <font>basesmallblue</font> +- <align>allcenter</align> +- <value>Filename</value> ++ <font>basesmall</font> ++ <align>allcenter</align> + </textarea> + + <buttonlist name="filelist" from="base_list"> +- <area>653,100,599,578</area> ++ <area>28,100,599,578</area> + <statetype name="buttonitem"> + <state name="active"> + <area>0,0,599,54</area> +@@ -3029,52 +3099,53 @@ + </buttonlist> + + <textedit name="location" from="base_textedit"> +- <area>40,107,575,40</area> ++ <area>665,446,575,40</area> + </textedit> + + <imagetype name="no_preview"> +- <area>46,161,563,318</area> ++ <area>671,110,563,318</area> + <filename>images/file_browser_no_preview.png</filename> + <mask>images/masks/file_browser_preview_mask.png</mask> + <preserveaspect>true</preserveaspect> + </imagetype> + + <imagetype name="preview"> +- <area>46,161,563,318</area> ++ <area>671,110,563,318</area> + <mask>images/masks/file_browser_preview_mask.png</mask> + <preserveaspect>true</preserveaspect> + </imagetype> + + <button name="back" from="base_button"> +- <area>252,493,150,35</area> ++ <area>750,560,150,35</area> + <value>Up Level</value> + </button> + + <button name="home" from="base_button"> +- <area>252,540,150,35</area> ++ <area>1005,560,150,35</area> + <value>Home</value> + </button> + + <button name="cancel" from="base_button"> +- <area>252,587,150,35</area> ++ <area>750,630,150,35</area> + <value>Cancel</value> + </button> + + <button name="ok" from="base_button"> +- <area>252,634,150,35</area> ++ <area>1005,630,150,35</area> + <value>OK</value> + </button> + + <textarea name="info_label" from="basetextarea"> +- <area>408,554,221,24</area> +- <align>allcenter</align> ++ <area>865,501,80,24</area> ++ <font>basesmaller</font> ++ <align>right</align> + <value>File Size:</value> + </textarea> + + <textarea name="info" from="basetextarea"> +- <area>408,584,221,24</area> +- <font>baseevensmallerblue</font> +- <align>allcenter</align> ++ <area>955,501,100,24</area> ++ <font>basesmaller</font> ++ <align>left</align> + </textarea> + + <group name="clock-backdrop-group" from="base_clock_backdrop_group" /> diff --git a/abs/core/linhes-theme/browser-ui.xml.patch b/abs/core/linhes-theme/browser-ui.xml.patch index b307572..4fc4d0e 100644 --- a/abs/core/linhes-theme/browser-ui.xml.patch +++ b/abs/core/linhes-theme/browser-ui.xml.patch @@ -1,5 +1,14 @@ ---- browser-ui.xml.orig 2017-06-07 14:40:58.276800749 +0000 -+++ browser-ui.xml 2017-06-07 14:39:39.636910230 +0000 +--- browser-ui.xml.orig 2017-10-26 18:22:20.964735039 +0000 ++++ browser-ui.xml 2017-10-26 18:22:03.746982358 +0000 +@@ -322,7 +322,7 @@ + + <textarea name="description" from="basetextarea"> + <area>239,468,802,145</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <multiline>yes</multiline> + <align>allcenter</align> + </textarea> @@ -411,40 +411,50 @@ </textarea> diff --git a/abs/core/linhes-theme/config-ui.xml.patch b/abs/core/linhes-theme/config-ui.xml.patch new file mode 100644 index 0000000..0ce47cf --- /dev/null +++ b/abs/core/linhes-theme/config-ui.xml.patch @@ -0,0 +1,408 @@ +--- config-ui.xml.orig 2017-12-01 19:19:08.627784142 +0000 ++++ config-ui.xml 2017-12-01 19:10:38.513844323 +0000 +@@ -645,7 +645,7 @@ + <textarea name="helptext" from="basetextarea"> + <area>231,372,818,227</area> + <multiline>yes</multiline> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -734,7 +734,7 @@ + <textarea name="helptext" from="basetextarea"> + <area>231,372,818,227</area> + <multiline>yes</multiline> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -901,7 +901,7 @@ + <textarea name="helptext" from="basetextarea"> + <area>233,488,814,111</area> + <multiline>yes</multiline> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -1000,7 +1000,7 @@ + <textarea name="helptext" from="basetextarea"> + <area>231,372,818,227</area> + <multiline>yes</multiline> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -1016,4 +1016,369 @@ + + </window> + ++ <window name="backendselection"> ++ ++ <textarea name="heading" from="base_heading"> ++ <value>MythTV Servers</value> ++ </textarea> ++ ++ <shape name="beconnect-backdrop" from="base_backdrop"> ++ <area>115,36,1050,649</area> ++ </shape> ++ ++ <shape name="beconnect-backdrop-line" from="base_backdrop_line"> ++ <area>116,37,1048,500</area> ++ </shape> ++ ++ <shape name="beconnect-top-line" from="base_highlight_line"> ++ <area>117,38,1046,2</area> ++ </shape> ++ ++ <shape name="beconnect-bottom-line" from="base_highlight_line"> ++ <area>117,534,1046,2</area> ++ </shape> ++ ++ <shape name="beconnect-left-line" from="base_highlight_vertical_line"> ++ <area>117,40,2,494</area> ++ </shape> ++ ++ <shape name="beconnect-right-line" from="base_highlight_vertical_line"> ++ <area>1161,40,2,494</area> ++ </shape> ++ ++ <shape name="beconnect-bottom-backdrop-line" from="base_backdrop_line"> ++ <area>116,547,1048,137</area> ++ </shape> ++ ++ <shape name="beconnect-bottom-top-line" from="base_highlight_line"> ++ <area>117,548,1046,2</area> ++ </shape> ++ ++ <shape name="beconnect-bottom-bottom-line" from="base_highlight_line"> ++ <area>117,681,1046,2</area> ++ </shape> ++ ++ <shape name="beconnect-bottom-left-line" from="base_highlight_vertical_line"> ++ <area>117,550,2,131</area> ++ </shape> ++ ++ <shape name="beconnect-bottom-right-line" from="base_highlight_vertical_line"> ++ <area>1161,550,2,131</area> ++ </shape> ++ ++ <shape name="beconnect-bottom-seperator-first-line" from="base_line"> ++ <area>138,620,1004,2</area> ++ </shape> ++ ++ <buttonlist name="backends" from="base_list_state"> ++ <area>123,44,1034,494</area> ++ <statetype name="buttonitem"> ++ <state name="active"> ++ <area>0,0,1034,30</area> ++ <group name="select_bar" from="base_select_bar_active_group"> ++ <area>0,0,100%,100%</area> ++ </group> ++ <textarea name="buttontext" from="basetextarea"> ++ <area>8,0,420,100%</area> ++ <align>left,vcenter</align> ++ </textarea> ++ <textarea name="modelname" from="buttontext" /> <!-- Workaround for vanishing buttontext bug --> ++ <textarea name="protocollabel" from="buttontext" depends="protocolversion"> ++ <area>432,0,100,100%</area> ++ <cutdown>yes</cutdown> ++ <align>right,vcenter</align> ++ <value>Protocol:</value> ++ <font>basesmallerblue</font> ++ </textarea> ++ <textarea name="protocolversion" from="buttontext"> ++ <area>538,0,50,100%</area> ++ <cutdown>yes</cutdown> ++ <align>left,vcenter</align> ++ <font>basesmaller</font> ++ </textarea> ++ <textarea name="versionlabel" from="protocollabel" depends="version"> ++ <area>596,0,100,100%</area> ++ <value>Version:</value> ++ </textarea> ++ <textarea name="version" from="protocolversion"> ++ <area>704,0,242,100%</area> ++ </textarea> ++ <statetype name="connection"> ++ <area>8,0,100%-8,100%</area> ++ <state name="good"> ++ <area>0,0,100%,100%</area> ++ </state> ++ <state name="protocolmismatch"> ++ <area>0,0,100%,100%</area> ++ <textarea name="description"> ++ <area>0,0,100%,100%</area> ++ <align>allcenter</align> ++ <value>Version Mismatch Between Client and Server</value> ++ <font>basesmallred</font> ++ </textarea> ++ </state> ++ <state name="blocked" from="protocolmismatch"> ++ <textarea name="description"> ++ <area>0,0,100%,100%</area> ++ <align>allcenter</align> ++ <value>Firewall is Blocking the Server</value> ++ <font>basesmallred</font> ++ </textarea> ++ </state> ++ </statetype> ++ <statetype name="securitypin"> ++ <area>946,0,80,100%</area> ++ <state name="yes"> ++ <area>0,0,80,100%</area> ++ <textarea name="description"> ++ <area>0,0,80,100%</area> ++ <align>allcenter</align> ++ <value>LOCKED</value> ++ <font>basesupersmallred</font> ++ </textarea> ++ </state> ++ <state name="no" from="yes"> ++ <textarea name="description"> ++ <value>UNLOCKED</value> ++ <font>basesupersmallgreen</font> ++ </textarea> ++ </state> ++ </statetype> ++ </state> ++ <state name="inactive" from="active" /> ++ <state name="selectedactive" from="active"> ++ <area>0,0,1034,64</area> ++ <group name="select_bar" from="base_select_bar_selectedactive_group"> ++ <area>0,0,100%,100%</area> ++ </group> ++ <textarea name="buttontext" from="basetextarea"> ++ <area>8,0,420,100%</area> ++ <align>left,vcenter</align> ++ <font>basesmallyellow</font> ++ </textarea> ++ <textarea name="modelname" from="buttontext" /> <!-- Workaround for vanishing buttontext bug --> ++ <textarea name="protocolversion" from="buttontext"> ++ <area>538,0,50,100%</area> ++ <cutdown>yes</cutdown> ++ <align>left,vcenter</align> ++ <font>basesmalleryellow</font> ++ </textarea> ++ <textarea name="version" from="protocolversion"> ++ <area>704,0,242,100%</area> ++ </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>998,494</position> ++ </statetype> ++ <statetype name="downscrollarrow"> ++ <position>1018,494</position> ++ </statetype> ++ <helptext>Select a server.</helptext> ++ </buttonlist> ++ ++ <textarea name="helptext" from="basetextarea"> ++ <area>139,552,1003,66</area> ++ <font>basesmaller</font> ++ <cutdown>yes</cutdown> ++ <align>allcenter</align> ++ <multiline>yes</multiline> ++ </textarea> ++ <button name="cancel" from="base_button"> ++ <area>265,632,150,40</area> ++ <value>Cancel</value> ++ <helptext>Close without saving the selected server.</helptext> ++ </button> ++ <button name="manual" from="base_button"> ++ <area>565,632,150,40</area> ++ <value>Manual</value> ++ <helptext>Manually select a server.</helptext> ++ </button> ++ <button name="save" from="base_button"> ++ <area>865,632,150,40</area> ++ <value>Save</value> ++ <helptext>Save the selected server.</helptext> ++ </button> ++ </window> ++ ++ <window name="guistartup"> ++ ++ <textarea name="heading" from="base_heading"> ++ <value>MythTV Startup Status</value> ++ </textarea> ++ ++ <shape name="startup-backdrop" from="base_backdrop"> ++ <area>115,36,1050,649</area> ++ </shape> ++ ++ <shape name="startup-backdrop-line" from="base_backdrop_line"> ++ <area>116,37,1048,506</area> ++ </shape> ++ ++ <shape name="startup-top-line" from="base_highlight_line"> ++ <area>117,38,1046,2</area> ++ </shape> ++ ++ <shape name="startup-bottom-line" from="base_highlight_line"> ++ <area>117,540,1046,2</area> ++ </shape> ++ ++ <shape name="startup-left-line" from="base_highlight_vertical_line"> ++ <area>117,40,2,500</area> ++ </shape> ++ ++ <shape name="startup-right-line" from="base_highlight_vertical_line"> ++ <area>1161,40,2,500</area> ++ </shape> ++ ++ <shape name="startup-bottom-backdrop-line" from="base_backdrop_line"> ++ <area>116,547,1048,137</area> ++ </shape> ++ ++ <shape name="startup-bottom-top-line" from="base_highlight_line"> ++ <area>117,548,1046,2</area> ++ </shape> ++ ++ <shape name="startup-bottom-bottom-line" from="base_highlight_line"> ++ <area>117,681,1046,2</area> ++ </shape> ++ ++ <shape name="startup-bottom-left-line" from="base_highlight_vertical_line"> ++ <area>117,550,2,131</area> ++ </shape> ++ ++ <shape name="startup-bottom-right-line" from="base_highlight_vertical_line"> ++ <area>1161,550,2,131</area> ++ </shape> ++ ++ <shape name="startup-bottom-seperator-first-line" from="base_line"> ++ <area>138,620,1004,2</area> ++ </shape> ++ ++ <progressbar name="progress" from="baseprogressbar"> ++ <position>372,214</position> ++ </progressbar> ++ ++ <statetype name="statusstate"> ++ <area>129,255,1022,40</area> ++ <state name="start"> ++ <area>0,0,1022,40</area> ++ <textarea name="status" from="basetextarea"> ++ <area>0,0,1022,40</area> ++ <font>basemedium</font> ++ <align>allcenter</align> ++ <value>Waking up Database Machine</value> ++ <multiline>true</multiline> ++ </textarea> ++ </state> ++ <state name="startFail" from="start"> ++ <textarea name="status"> ++ <value>Database Machine Failed to Wake Up</value> ++ </textarea> ++ </state> ++ <state name="dbAwake" from="start"> ++ <textarea name="status"> ++ <value>Waiting for Database to Start</value> ++ </textarea> ++ </state> ++ <state name="dbAwakeFail" from="start"> ++ <textarea name="status"> ++ <value>Database Failed to Start</value> ++ </textarea> ++ </state> ++ <state name="dbStarted" from="start"> ++ <textarea name="status"> ++ <value>Attempting to Connect to Database</value> ++ </textarea> ++ </state> ++ <state name="dbStartedFail" from="start"> ++ <textarea name="status"> ++ <value>Unable to Connect to Database</value> ++ </textarea> ++ </state> ++ <state name="beWOL" from="start"> ++ <textarea name="status"> ++ <value>Attempting to Wake Master Backend</value> ++ </textarea> ++ </state> ++ <state name="beWOLFail" from="start"> ++ <textarea name="status"> ++ <value>Master Backend Failed to Wake</value> ++ </textarea> ++ </state> ++ <state name="beAwake" from="start"> ++ <textarea name="status"> ++ <value>Attempting to Connect to Master Backend</value> ++ </textarea> ++ </state> ++ <state name="beAwakeFail" from="start"> ++ <textarea name="status"> ++ <value>Unable to Connect to Master Backend</value> ++ </textarea> ++ </state> ++ </statetype> ++ ++ <statetype name="messagestate"> ++ <area>129,316,1022,40</area> ++ <state name="makeselection"> ++ <area>0,0,100%,100%</area> ++ <textarea name="message" from="basetextarea"> ++ <area>0,0,100%,100%</area> ++ <font>basemedium</font> ++ <align>allcenter</align> ++ <value></value> ++ <multiline>true</multiline> ++ </textarea> ++ </state> ++ <state name="empty" from="makeselection"> ++ <textarea name="message"> ++ <value></value> ++ </textarea> ++ </state> ++ </statetype> ++ ++ <textarea name="helptext" from="basetextarea"> ++ <area>139,552,1003,66</area> ++ <font>basesmaller</font> ++ <cutdown>yes</cutdown> ++ <align>allcenter</align> ++ <multiline>yes</multiline> ++ </textarea> ++ ++ <button name="dummy" from="base_button"> ++ <area>0%,80%,0,0</area> ++ <value></value> ++ <helptext></helptext> ++ </button> ++ ++ <button name="retry" from="base_button"> ++ <area>205,632,150,40</area> ++ <value>Retry</value> ++ <helptext>Try again to establish connections.</helptext> ++ </button> ++ ++ <button name="search" from="base_button"> ++ <area>445,632,150,40</area> ++ <value>Search</value> ++ <helptext>Search the local network for the MythTV Backend.</helptext> ++ </button> ++ ++ <button name="setup" from="base_button"> ++ <area>685,632,150,40</area> ++ <value>Setup</value> ++ <helptext>Use Database setup to enter database parameters.</helptext> ++ </button> ++ ++ <button name="exit" from="base_button"> ++ <area>925,632,150,40</area> ++ <value>Exit</value> ++ <helptext>Exit from MythTV.</helptext> ++ </button> ++ </window> ++ + </mythuitheme> diff --git a/abs/core/linhes-theme/controls-ui.xml.patch b/abs/core/linhes-theme/controls-ui.xml.patch index 6da0bcd..2e20aa5 100644 --- a/abs/core/linhes-theme/controls-ui.xml.patch +++ b/abs/core/linhes-theme/controls-ui.xml.patch @@ -1,5 +1,5 @@ --- controls-ui.xml.orig 2016-12-13 20:38:02.325765836 +0000 -+++ controls-ui.xml 2016-12-13 20:34:54.356551993 +0000 ++++ controls-ui.xml 2017-10-26 17:04:02.966374691 +0000 @@ -73,7 +73,7 @@ <area>0,0,1280,720</area> @@ -9,3 +9,12 @@ </textarea> <shape name="edit-keys-backdrop" from="base_backdrop"> +@@ -225,7 +225,7 @@ + + <textarea name="description" from="basetextarea"> + <area>229,510,822,84</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <multiline>yes</multiline> + <align>allcenter</align> + </textarea> diff --git a/abs/core/linhes-theme/musicsettings-ui.xml.patch b/abs/core/linhes-theme/musicsettings-ui.xml.patch new file mode 100644 index 0000000..a667eab --- /dev/null +++ b/abs/core/linhes-theme/musicsettings-ui.xml.patch @@ -0,0 +1,366 @@ +--- musicsettings-ui.xml.orig 2017-10-26 18:28:30.226541178 +0000 ++++ musicsettings-ui.xml 2017-10-26 19:57:07.944986189 +0000 +@@ -60,7 +60,7 @@ + <textarea name="musiclocation_label" from="basetextarea"> + <area>129,72,428,40</area> + <align>right,vcenter</align> +- <value>Directory to hold music:</value> ++ <value>Directory to Hold Music:</value> + </textarea> + + <textedit name="musiclocation" from="base_textedit"> +@@ -70,7 +70,7 @@ + <textarea name="musiccddevice_label" from="basetextarea"> + <area>129,143,428,40</area> + <align>right,vcenter</align> +- <value>CD device:</value> ++ <value>CD Device:</value> + </textarea> + + <textedit name="musiccddevice" from="base_textedit"> +@@ -80,7 +80,7 @@ + <textarea name="musicaudiodevice_label" from="basetextarea"> + <area>129,214,428,40</area> + <align>right,vcenter</align> +- <value>Audio device:</value> ++ <value>Audio Device:</value> + </textarea> + + <textedit name="musicaudiodevice" from="base_textedit"> +@@ -90,7 +90,7 @@ + <textarea name="musicdefaultupmix_label" from="basetextarea"> + <area>129,285,429,30</area> + <align>right,vcenter</align> +- <value>Convert stereo to 5.1 sound:</value> ++ <value>Convert Stereo to 5.1 Surround:</value> + </textarea> + + <checkbox name="musicdefaultupmix" from="base_checkbox"> +@@ -120,7 +120,7 @@ + <textarea name="allowtagwriting_label" from="basetextarea"> + <area>129,478,428,30</area> + <align>right,vcenter</align> +- <value>Allow metadata to be written to tags:</value> ++ <value>Allow Metadata to be Written to Tags:</value> + </textarea> + + <checkbox name="allowtagwriting" from="base_checkbox"> +@@ -129,19 +129,20 @@ + + <textarea name="helptext" from="basetextarea"> + <area>139,552,1003,66</area> +- <font>basesmallerblue</font> ++ <font>basesmaller</font> + <cutdown>yes</cutdown> + <align>allcenter</align> + <multiline>yes</multiline> + </textarea> + +- <button name="save" from="base_button"> ++ <button name="cancel" from="base_button"> + <area>233,632,350,40</area> +- <value>Save</value> ++ <value>Cancel</value> + </button> +- <button name="cancel" from="base_button"> ++ ++ <button name="save" from="base_button"> + <area>697,632,350,40</area> +- <value>Cancel</value> ++ <value>Save</value> + </button> + </window> + +@@ -213,7 +214,7 @@ + <textarea name="filenametemplate_label" from="basetextarea"> + <area>128,127,430,40</area> + <align>right,vcenter</align> +- <value>File storage location:</value> ++ <value>File Storage Location:</value> + </textarea> + + <textedit name="filenametemplate" from="base_textedit"> +@@ -223,7 +224,7 @@ + <textarea name="nowhitespace_label" from="basetextarea"> + <area>128,190,430,30</area> + <align>right,vcenter</align> +- <value>Replace space with underscore:</value> ++ <value>Replace Space with Underscore:</value> + </textarea> + + <checkbox name="nowhitespace" from="base_checkbox"> +@@ -253,7 +254,7 @@ + <textarea name="mp3usevbr_label" from="basetextarea"> + <area>128,369,430,30</area> + <align>right,vcenter</align> +- <value>Use variable bitrates:</value> ++ <value>Use Variable Bitrates:</value> + </textarea> + + <checkbox name="mp3usevbr" from="base_checkbox"> +@@ -263,7 +264,7 @@ + <textarea name="ejectcd_label" from="basetextarea"> + <area>128,422,430,30</area> + <align>right,vcenter</align> +- <value>Automatically eject CDs after ripping:</value> ++ <value>Automatically Eject CDs After Ripping:</value> + </textarea> + + <checkbox name="ejectcd" from="base_checkbox"> +@@ -282,20 +283,20 @@ + + <textarea name="helptext" from="basetextarea"> + <area>139,552,1003,66</area> +- <font>basesmallerblue</font> ++ <font>basesmaller</font> + <cutdown>yes</cutdown> + <align>allcenter</align> + <multiline>yes</multiline> + </textarea> + +- <button name="save" from="base_button"> ++ <button name="cancel" from="base_button"> + <area>233,632,350,40</area> +- <value>Save</value> ++ <value>Cancel</value> + </button> + +- <button name="cancel" from="base_button"> ++ <button name="save" from="base_button"> + <area>697,632,350,40</area> +- <value>Cancel</value> ++ <value>Save</value> + </button> + </window> + +@@ -307,109 +308,140 @@ + </textarea> + + <shape name="player-settings-backdrop" from="base_backdrop"> +- <area>215,36,850,649</area> ++ <area>115,36,1050,649</area> + </shape> + + <shape name="player-settings-backdrop-line" from="base_backdrop_line"> +- <area>216,37,848,506</area> ++ <area>116,37,1048,506</area> + </shape> + + <shape name="player-settings-top-line" from="base_highlight_line"> +- <area>217,38,846,2</area> ++ <area>117,38,1046,2</area> + </shape> + + <shape name="player-settings-bottom-line" from="base_highlight_line"> +- <area>217,540,846,2</area> ++ <area>117,540,1046,2</area> + </shape> + + <shape name="player-settings-left-line" from="base_highlight_vertical_line"> +- <area>217,40,2,500</area> ++ <area>117,40,2,500</area> + </shape> + + <shape name="player-settings-right-line" from="base_highlight_vertical_line"> +- <area>1061,40,2,500</area> ++ <area>1161,40,2,500</area> + </shape> + + <shape name="player-settings-bottom-backdrop-line" from="base_backdrop_line"> +- <area>216,547,848,137</area> ++ <area>116,547,1048,137</area> + </shape> + + <shape name="player-settings-bottom-top-line" from="base_highlight_line"> +- <area>217,548,846,2</area> ++ <area>117,548,1046,2</area> + </shape> + + <shape name="player-settings-bottom-bottom-line" from="base_highlight_line"> +- <area>217,681,846,2</area> ++ <area>117,681,1046,2</area> + </shape> + + <shape name="player-settings-bottom-left-line" from="base_highlight_vertical_line"> +- <area>217,550,2,131</area> ++ <area>117,550,2,131</area> + </shape> + + <shape name="player-settings-bottom-right-line" from="base_highlight_vertical_line"> +- <area>1061,550,2,131</area> ++ <area>1161,550,2,131</area> + </shape> + + <shape name="player-settings-bottom-seperator-first-line" from="base_line"> +- <area>238,613,804,2</area> ++ <area>138,620,1004,2</area> + </shape> + + <textarea name="resumemode_label" from="basetextarea"> +- <area>315,112,300,40</area> ++ <area>129,72,428,40</area> + <align>right,vcenter</align> +- <value>Resume mode:</value> ++ <value>Playlist Resume Mode:</value> + </textarea> + + <buttonlist name="resumemode" from="base_selector"> +- <area>625,112,300,40</area> ++ <area>567,72,550,40</area> ++ </buttonlist> ++ ++ <textarea name="resumemodeeditor_label" from="basetextarea"> ++ <area>129,143,428,40</area> ++ <align>right,vcenter</align> ++ <value>Editor Resume Mode:</value> ++ </textarea> ++ ++ <buttonlist name="resumemodeeditor" from="base_selector"> ++ <area>567,143,550,40</area> ++ </buttonlist> ++ ++ <textarea name="resumemoderadio_label" from="basetextarea"> ++ <area>129,214,428,40</area> ++ <align>right,vcenter</align> ++ <value>Radio Resume Mode:</value> ++ </textarea> ++ ++ <buttonlist name="resumemoderadio" from="base_selector"> ++ <area>567,214,550,40</area> ++ </buttonlist> ++ ++ <textarea name="jumpaction_label" from="basetextarea"> ++ <area>129,285,429,30</area> ++ <align>right,vcenter</align> ++ <value>Action on Jump Point:</value> ++ </textarea> ++ ++ <buttonlist name="jumpaction" from="resumemode"> ++ <position>567,285</position> + </buttonlist> + + <textarea name="exitaction_label" from="basetextarea"> +- <area>315,224,300,40</area> ++ <area>129,346,428,40</area> + <align>right,vcenter</align> +- <value>Action on exit:</value> ++ <value>Action on Exit:</value> + </textarea> + + <buttonlist name="exitaction" from="resumemode"> +- <area>625,224,300,40</area> ++ <area>567,346,550,40</area> + </buttonlist> + + <textarea name="autolookupcd_label" from="basetextarea"> +- <area>315,336,300,30</area> ++ <area>129,417,428,30</area> + <align>right,vcenter</align> +- <value>Automatically lookup CDs:</value> ++ <value>Automatically Lookup CDs:</value> + </textarea> + + <checkbox name="autolookupcd" from="base_checkbox"> +- <position>625,336</position> ++ <position>567,417</position> + </checkbox> + + <textarea name="autoplaycd_label" from="basetextarea"> +- <area>315,438,300,30</area> ++ <area>129,478,428,30</area> + <align>right,vcenter</align> + <value>Automatically Play CDs:</value> + </textarea> + + <checkbox name="autoplaycd" from="base_checkbox"> +- <position>625,438</position> ++ <position>567,478</position> + </checkbox> + + <textarea name="helptext" from="basetextarea"> +- <area>239,559,802,44</area> +- <font>basesmallerblue</font> ++ <area>139,552,1003,66</area> ++ <font>basesmaller</font> + <cutdown>yes</cutdown> + <align>allcenter</align> + <multiline>yes</multiline> + </textarea> + +- <button name="save" from="base_button"> +- <area>273,628,350,40</area> +- <value>Save</value> +- </button> + <button name="cancel" from="base_button"> +- <area>657,628,350,40</area> ++ <area>233,632,350,40</area> + <value>Cancel</value> + </button> ++ ++ <button name="save" from="base_button"> ++ <area>697,632,350,40</area> ++ <value>Save</value> ++ </button> + </window> + + <window name="ratingsettings"> +@@ -508,23 +540,22 @@ + </spinbox> + + <textarea name="helptext" from="basetextarea"> +- <area>239,559,802,44</area> +- <font>basesmallerblue</font> ++ <area>239,553,802,50</area> ++ <font>basesmaller</font> + <cutdown>yes</cutdown> + <align>allcenter</align> + <multiline>yes</multiline> + </textarea> + +- <button name="save" from="base_button"> +- <area>273,628,350,40</area> +- <value>Save</value> +- </button> +- + <button name="cancel" from="base_button"> +- <area>657,628,350,40</area> ++ <area>233,632,350,40</area> + <value>Cancel</value> + </button> + ++ <button name="save" from="base_button"> ++ <area>697,632,350,40</area> ++ <value>Save</value> ++ </button> + </window> + + <window name="visualizationsettings"> +@@ -624,21 +655,21 @@ + + <textarea name="helptext" from="basetextarea"> + <area>239,559,802,44</area> +- <font>basesmallerblue</font> ++ <font>basesmaller</font> + <cutdown>yes</cutdown> + <align>allcenter</align> + <multiline>yes</multiline> + </textarea> + +- <button name="save" from="base_button"> +- <area>273,628,350,40</area> +- <value>Save</value> +- </button> +- + <button name="cancel" from="base_button"> +- <area>657,628,350,40</area> ++ <area>233,632,350,40</area> + <value>Cancel</value> + </button> ++ ++ <button name="save" from="base_button"> ++ <area>697,632,350,40</area> ++ <value>Save</value> ++ </button> + </window> + + </mythuitheme> diff --git a/abs/core/linhes-theme/mytharchive-ui.xml.patch b/abs/core/linhes-theme/mytharchive-ui.xml.patch new file mode 100644 index 0000000..78271f9 --- /dev/null +++ b/abs/core/linhes-theme/mytharchive-ui.xml.patch @@ -0,0 +1,38 @@ +--- mytharchive-ui.xml.orig 2017-12-01 19:19:38.943858051 +0000 ++++ mytharchive-ui.xml 2017-12-01 19:13:29.711674546 +0000 +@@ -70,7 +70,7 @@ + + <textarea name="destination_text" from="basetextarea"> + <area>139,552,1003,66</area> +- <font>basesmallerblue</font> ++ <font>basesmaller</font> + <cutdown>yes</cutdown> + <align>allcenter</align> + <multiline>yes</multiline> +@@ -549,7 +549,7 @@ + </statetype> + <imagetype name="buttonimage"> + <area>28,2,77,50</area> +- <filename>images/file_browser_no_preview.png</filename> ++ <filename>images/file_browser_folder.png</filename> + <preserveaspect>true</preserveaspect> + </imagetype> + <textarea name="buttontext"> +@@ -576,7 +576,7 @@ + </statetype> + <imagetype name="buttonimage"> + <area>38,4,138,104</area> +- <filename>images/file_browser_no_preview.png</filename> ++ <filename>images/file_browser_folder.png</filename> + <preserveaspect>true</preserveaspect> + </imagetype> + <textarea name="buttontext"> +@@ -1046,7 +1046,7 @@ + + <textarea name="logitem_text" from="basetextarea"> + <area>139,538,1003,82</area> +- <font>basesmallerblue</font> ++ <font>basesmaller</font> + <cutdown>yes</cutdown> + <align>allcenter</align> + <multiline>yes</multiline> diff --git a/abs/core/linhes-theme/mythburn-ui.xml.patch b/abs/core/linhes-theme/mythburn-ui.xml.patch new file mode 100644 index 0000000..52737e7 --- /dev/null +++ b/abs/core/linhes-theme/mythburn-ui.xml.patch @@ -0,0 +1,20 @@ +--- mythburn-ui.xml.orig 2017-10-26 17:12:51.497611372 +0000 ++++ mythburn-ui.xml 2017-10-26 17:04:02.976373390 +0000 +@@ -264,7 +264,7 @@ + + <textarea name="themedescription" from="basetextarea"> + <area>139,552,1003,66</area> +- <font>basesmallerblue</font> ++ <font>basesmaller</font> + <cutdown>yes</cutdown> + <align>allcenter</align> + <multiline>yes</multiline> +@@ -922,7 +922,7 @@ + + <textarea name="help_text" from="basetextarea"> + <area>139,552,1003,66</area> +- <font>basesmallerblue</font> ++ <font>basesmaller</font> + <cutdown>yes</cutdown> + <align>allcenter</align> + <multiline>yes</multiline> diff --git a/abs/core/linhes-theme/mythnative-ui.xml.patch b/abs/core/linhes-theme/mythnative-ui.xml.patch new file mode 100644 index 0000000..18c1750 --- /dev/null +++ b/abs/core/linhes-theme/mythnative-ui.xml.patch @@ -0,0 +1,20 @@ +--- mythnative-ui.xml.orig 2017-10-26 17:13:24.073372813 +0000 ++++ mythnative-ui.xml 2017-10-26 17:04:02.976373390 +0000 +@@ -304,7 +304,7 @@ + </statetype> + <imagetype name="buttonimage"> + <area>28,2,77,50</area> +- <filename>images/file_browser_no_preview.png</filename> ++ <filename>images/file_browser_folder.png</filename> + <preserveaspect>true</preserveaspect> + </imagetype> + <textarea name="buttontext"> +@@ -331,7 +331,7 @@ + </statetype> + <imagetype name="buttonimage"> + <area>38,4,138,104</area> +- <filename>images/file_browser_no_preview.png</filename> ++ <filename>images/file_browser_folder.png</filename> + <preserveaspect>true</preserveaspect> + </imagetype> + <textarea name="buttontext"> diff --git a/abs/core/linhes-theme/notification-ui.xml.patch b/abs/core/linhes-theme/notification-ui.xml.patch index 98b1287..923f712 100644 --- a/abs/core/linhes-theme/notification-ui.xml.patch +++ b/abs/core/linhes-theme/notification-ui.xml.patch @@ -1,5 +1,5 @@ ---- notification-ui.xml.orig 2016-10-10 19:55:20.796354375 +0000 -+++ notification-ui.xml 2016-10-10 19:40:05.992756927 +0000 +--- notification-ui.xml.orig 2017-12-05 21:58:48.987074621 +0000 ++++ notification-ui.xml 2017-12-05 22:00:42.962305760 +0000 @@ -3,11 +3,9 @@ <mythuitheme> @@ -102,23 +102,24 @@ - <textarea name="progress_text" from="basetextarea" depends="progress"> - <area>370,113,396,30</area> -+ <area>14,80,206,30</area> - <font>basesomewhatsmaller</font> +- <font>basesomewhatsmaller</font> ++ <area>14,72,438,30</area> ++ <font>baseevensmaller</font> <align>right</align> + <scroll direction="left" startdelay="1"/> </textarea> <progressbar name="progress" from="baseprogressbar"> - <position>14,148</position> -+ <position>230,90</position> ++ <position>14,96</position> <imagetype name="background"> - <area>0,0,752,10</area> -+ <area>0,0,226,10</area> ++ <area>0,0,438,10</area> <filename>images/progressbar/progressbar_background.png</filename> </imagetype> <imagetype name="progressimage"> - <area>0,0,752,10</area> -+ <area>0,0,220,10</area> ++ <area>0,0,438,10</area> <filename>images/progressbar/progressbar_fill.png</filename> </imagetype> </progressbar> @@ -201,7 +202,7 @@ </imagetype> </state> <state name="warning"> -@@ -194,65 +188,60 @@ +@@ -194,79 +188,74 @@ <imagetype name="imageerror"> <filename>images/warning.png</filename> <mask>images/masks/notification_image_mask.png</mask> @@ -284,8 +285,28 @@ - </textarea> - <textarea name="progress_text" from="basetextarea" depends="progress"> - <area>370,113,398,30</area> - <font>basesomewhatsmaller</font> +- <area>370,113,398,30</area> +- <font>basesomewhatsmaller</font> ++ <area>14,72,324,30</area> ++ <font>baseevensmaller</font> + <align>right</align> + </textarea> +- ++ + <progressbar name="progress" from="baseprogressbar"> +- <position>170,148</position> ++ <position>14,96</position> + <imagetype name="background"> +- <area>0,0,598,10</area> ++ <area>0,0,324,10</area> + <filename>images/progressbar/progressbar_background.png</filename> + </imagetype> + <imagetype name="progressimage"> +- <area>0,0,598,10</area> ++ <area>0,0,324,10</area> + <filename>images/progressbar/progressbar_fill.png</filename> + </imagetype> + </progressbar> @@ -283,12 +272,12 @@ </shape> @@ -334,7 +355,7 @@ <area>0,0,100%,100%</area> <preserveaspect>true</preserveaspect> </imagetype> -@@ -325,22 +314,16 @@ +@@ -325,7 +314,7 @@ <state name="busy"> <area>0,0,100%,100%</area> <imagetype name="imagebusy"> @@ -343,15 +364,18 @@ <area>0,0,100%,100%</area> <preserveaspect>true</preserveaspect> </imagetype> - </state> +@@ -333,14 +322,14 @@ </statetype> -- <imagetype name="image" depends="!mediastate&!errorstate"> + <imagetype name="image" depends="!mediastate&!errorstate"> - <filename>images/damaged_fullscreen.png</filename> - <area>0,0,100%,100%</area> - <preserveaspect>true</preserveaspect> -- </imagetype> -- ++ <filename>images/error.png</filename> ++ <mask>images/masks/notification_image_mask.png</mask> ++ <area>423,20,435,435</area> + </imagetype> + <textarea name="title" from="basetextarea"> <area>170,475,940,45</area> - <font>baseextralargebold</font> diff --git a/abs/core/linhes-theme/schedule-ui.xml.patch b/abs/core/linhes-theme/schedule-ui.xml.patch index 0ed5ba4..00e1066 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 2017-01-12 02:24:06.812272686 +0000 -+++ schedule-ui.xml 2017-01-12 02:24:53.802894035 +0000 ++++ schedule-ui.xml 2017-10-26 17:04:02.976373390 +0000 @@ -126,7 +126,7 @@ <conflictingcolor>#ff6600</conflictingcolor> <cutdown>no</cutdown> @@ -9,6 +9,15 @@ <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> +@@ -1084,7 +1084,7 @@ + + <textarea name="helptext"> + <area>0,39,1280,34</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + <value>(1) Channel (2) Priority</value> + </textarea> @@ -1437,10 +1437,10 @@ </state> </statetype> @@ -35,7 +44,111 @@ </statetype> </buttonlist> -@@ -3098,10 +3098,10 @@ +@@ -1854,7 +1854,7 @@ + + </window> + +- <window name="progdetails"> ++ <window name="programdetails"> + <area>0,0,1280,720</area> + + <textarea name="heading" from="base_heading"> +@@ -1885,12 +1885,90 @@ + <area>1256,40,2,641</area> + </shape> + +- <webbrowser name="browser"> ++ <shape name="arrows-backdrop" from="base_arrows_backdrop"> ++ <area>1210,685,50,13</area> ++ </shape> ++ ++ <buttonlist name="infolist"> ++ <layout>vertical</layout> ++ <spacing>4</spacing> ++ <arrange>stack</arrange> ++ <wrapstyle>items</wrapstyle> ++ <align>top</align> + <area>26,42,1228,637</area> +- <zoom>1.0</zoom> +- <background color="#000000" alpha="1"/> +- </webbrowser> ++ <buttonarea>0,0,100%,100%</buttonarea> ++ ++ <statetype name="buttonitem"> ++ <area>0,0,100%,124</area> ++ <minsize shrink="short">100%,5</minsize> ++ <state name="active"> ++ <area>0,0,100%,100%</area> ++ <minsize shrink="short">100%,6</minsize> ++ <shape name="background"> ++ <!-- work around a stack / minsize display bug by using ++ empty image to help spacing --> ++ <area>0,0,100%,100%</area> ++ <minsize shrink="short">100%,5</minsize> ++ </shape> ++ <textarea name="name" from="basetextarea"> ++ <area>5,3,24%,-3</area> ++ <minsize shrink="short">100%,5</minsize> ++ <multiline>yes</multiline> ++ <cutdown>no</cutdown> ++ <align>top,right</align> ++ <font>basesmallblue</font> ++ </textarea> ++ <textarea name="sep"> ++ <area>25%,3,10,-3</area> ++ <minsize shrink="short">100%,5</minsize> ++ <align>top,left</align> ++ <value>:</value> ++ <font>basesmallblue</font> ++ </textarea> ++ <textarea name="value"> ++ <area>25%+15,3,-10,-3</area> ++ <minsize shrink="short">100%,5</minsize> ++ <multiline>yes</multiline> ++ <cutdown>no</cutdown> ++ <align>top,left</align> ++ <font>basesmall</font> ++ </textarea> ++ </state> ++ <state name="selectedactive" from="active" /> ++ <state name="selectedinactive" from="active" /> ++ </statetype> + ++ <statetype name="upscrollarrow"> ++ <position>1192,645</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>1212,645</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> + </window> + + <window name="searchpopup"> +@@ -3098,10 +3176,10 @@ </state> </statetype> <statetype name="upscrollarrow"> diff --git a/abs/core/linhes-theme/settings-ui.xml.patch b/abs/core/linhes-theme/settings-ui.xml.patch new file mode 100644 index 0000000..d7b082a --- /dev/null +++ b/abs/core/linhes-theme/settings-ui.xml.patch @@ -0,0 +1,11 @@ +--- settings-ui.xml.orig 2017-10-26 17:20:33.167538071 +0000 ++++ settings-ui.xml 2017-10-26 17:04:02.976373390 +0000 +@@ -103,7 +103,7 @@ + + <textarea name="label-text" from="basetextarea"> + <area>244,470,792,69</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + diff --git a/abs/core/linhes-theme/standardsetting-ui.xml b/abs/core/linhes-theme/standardsetting-ui.xml new file mode 100644 index 0000000..a50e985 --- /dev/null +++ b/abs/core/linhes-theme/standardsetting-ui.xml @@ -0,0 +1,441 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd"> + +<mythuitheme> + <window name="settingssetup"> + <textarea name="title" from="base_heading"> + <value>Settings</value> + </textarea> +<!-- + <shape name="group-help-backdrop" from="base_backdrop" depends="grouphelp"> + <area>20,86,1240,420</area> + <area>20,36,1240,40</area> + </shape> + + <shape name="group-help-backdrop-line" from="base_backdrop_line" depends="grouphelp"> + <area>21,87,1238,418</area> + <area>21,37,1238,37</area> + </shape> + + <shape name="group-help-top-line" from="base_highlight_line" depends="grouphelp"> + <area>22,88,1236,2</area> + <area>22,38,1236,2</area> + </shape> + + <shape name="group-help-bottom-line" from="base_highlight_line" depends="grouphelp"> + <area>22,502,1236,2</area> + <area>22,72,1236,2</area> + </shape> + + <shape name="group-help-left-line" from="base_highlight_vertical_line" depends="grouphelp"> + <area>22,90,2,412</area> + <area>22,40,2,32</area> + </shape> + + <shape name="group-help-right-line" from="base_highlight_vertical_line" depends="grouphelp"> + <area>1256,90,2,412</area> + <area>1256,40,2,32</area> + </shape> +--> + + <shape name="group-help-backdrop" from="base_backdrop"> + <area>0,36,1280,40</area> + <type>box</type> + </shape> + + <shape name="group-help-top-line" from="base_line"> + <area>0,37,1280,2</area> + </shape> + + <shape name="group-help-bottom-line" from="base_line"> + <area>0,73,1280,2</area> + </shape> + + <shape name="settings-list-backdrop" from="base_backdrop"> + <area>20,86,1240,420</area> + </shape> + + <shape name="settings-list-backdrop-line" from="base_backdrop_line"> + <area>21,87,1238,418</area> + </shape> + + <shape name="settings-list-top-line" from="base_highlight_line"> + <area>22,88,1236,2</area> + </shape> + + <shape name="settings-list-bottom-line" from="base_highlight_line"> + <area>22,502,1236,2</area> + </shape> + + <shape name="settings-list-left-line" from="base_highlight_vertical_line"> + <area>22,90,2,412</area> + </shape> + + <shape name="settings-list-right-line" from="base_highlight_vertical_line"> + <area>1256,90,2,412</area> + </shape> + + <shape name="settings-list-arrows-backdrop" from="base_arrows_backdrop"> + <area>1207,506,50,11</area> + </shape> + + <shape name="settings-bottom-backdrop" from="base_backdrop"> + <area>20,516,1240,169</area> + </shape> + + <shape name="settings-bottom-backdrop-line" from="base_backdrop_line"> + <area>21,517,1238,167</area> + </shape> + + <shape name="settings-bottom-top-line" from="base_highlight_line"> + <area>22,518,1236,2</area> + </shape> + + <shape name="settings-bottom-bottom-line" from="base_highlight_line"> + <area>22,681,1236,2</area> + </shape> + + <shape name="settings-bottom-left-line" from="base_highlight_vertical_line"> + <area>22,520,2,161</area> + </shape> + + <shape name="settings-bottom-right-line" from="base_highlight_vertical_line"> + <area>1256,520,2,161</area> + </shape> + + <shape name="settings-bottom-seperator-first-line" from="base_line"> + <area>43,554,1194,2</area> + </shape> + + <buttonlist name="settingslist" from="base_list"> + <area>28,94,1224,404</area> + <layout>vertical</layout> + <spacing>4</spacing> + <scrollstyle>free</scrollstyle> + <arrange>stack</arrange> + <wrapstyle>items</wrapstyle> + <buttonarea>0,0,100%,100%</buttonarea> + <statetype name="buttonitem"> + <state name="active"> + <area>0,0,1224,30</area> + <group name="select_bar" from="base_select_bar_active_group"> + <area>0,0,100%,100%</area> + </group> + <textarea name="buttontext"> + <area>15,0,50%-5,30</area> + </textarea> + + <group name="widgets"> + <area>50%+5,0,100%,100%</area> + <statetype name="widgettype"> + <area>0,0,100%-24,100%</area> + <state name="standard"> + <area>0,0,100%,100%</area> + </state> + <state name="group"> + <area>0,0,100%,100%</area> + </state> + <state name="checkbox"> + <area>0,0,100%,100%</area> + </state> + <state name="textedit"> + <area>0,0,100%,100%</area> + <group name="texteditgroup"> + <area>0,0,100%,100%</area> + </group> + </state> + <state name="filebrowser"> + <area>0,0,100%,100%</area> + </state> + <state name="spinbox" from="textedit" /> + <state name="combobox" from="textedit" /> + <state name="button"> + <area>0,0,100%,100%</area> + </state> + </statetype> + <!-- we can not put more than one textarea with the same name + The textarea can no be in a custom state + We can not put the textarea in a state from statetype neither + Which mean we can not theme them differently according to the statetype + --> + <textarea name="value"> + <area>5,0,100%-35,100%</area> + <font>basesmall</font> + <cutdown>yes</cutdown> + <align>right,vcenter</align> + </textarea> + </group> + + <statetype name="buttoncheck"> + <position>100%-56,50%-15</position> + <state type="off"> + <imagetype name="checkoff"> + <filename>images/unchecked.png</filename> + </imagetype> + </state> + <state type="half"> + <imagetype name="checkhalf"> + <filename>images/checked.png</filename> + </imagetype> + </state> + <state type="full"> + <imagetype name="checkfull"> + <filename>images/checked_selected.png</filename> + </imagetype> + </state> + </statetype> + + <imagetype name="buttonarrow"> + <position>100%-20,50%-8</position> + <filename>images/lists_right_arrow.png</filename> + </imagetype> + </state> + + <state name="selectedactive" from="active"> + <area>0,0,1224,64</area> + <group name="select_bar" from="base_select_bar_selectedactive_group"> + <area>0,0,100%,100%</area> + </group> + <textarea name="buttontext"> + <area>15,0,1194,64</area> + <font>basesmallyellow</font> + <align>left,vcenter</align> + <scroll direction="horizontal" /> + </textarea> + + <group name="widgets"> + <statetype name="widgettype"> + <state name="textedit"> + <area>0,0,100%,100%</area> + <group name="texteditgroup" from="base_textedit_select_bar_selectedactive_group"> + <area>0,5%,100%,95%</area> + </group> + </state> + <state name="filebrowser"> + <area>0,0,100%,100%</area> + <group name="filebrowsergroup" from="base_textedit_select_bar_selectedactive_group"> + <area>0,5%,100%,95%</area> + </group> + </state> + <state name="spinbox" from="textedit" /> + <state name="combobox" from="textedit" /> + <state name="standard"> + <area>0,0,100%,100%</area> + <group name="buttongroup" from="base_textedit_select_bar_selectedactive_group"> + <area>100%-150,5%,100%,95%</area> + </group> + <textarea name="buttonpress"> + <area>100%-150,0,100%,100%</area> + <font>basesmallyellow</font> + <cutdown>yes</cutdown> + <align>allcenter</align> + <value>OK</value> + </textarea> + </state> + </statetype> + <textarea name="value"> + <font>basesmallyellow</font> + <scroll direction="horizontal" /> + </textarea> + </group> + + <statetype name="buttoncheck"> + <shape name="select_bar_top_highlight"> + <area>0,-1,100%,2</area> + <type>box</type> + <fill style="gradient"> + <gradient direction="horizontal" alpha="255"> + <stop position="0" color="#000000"/> + <stop position="50" color="#d6d6d6"/> + <stop position="100" color="#000000"/> + </gradient> + </fill> + </shape> + <shape name="select_bar_bottom_highlight"> + <area>0,100%-1,100%,2</area> + <type>box</type> + <fill style="gradient"> + <gradient direction="horizontal" alpha="255"> + <stop position="0" color="#000000"/> + <stop position="50" color="#d6d6d6"/> + <stop position="100" color="#000000"/> + </gradient> + </fill> + </shape> + <shape name="select_bar_left_highlight"> + <area>-1,0,2,100%</area> + <type>box</type> + <fill style="gradient"> + <gradient direction="vertical" alpha="255"> + <stop position="0" color="#000000"/> + <stop position="50" color="#3a9aff"/> + <stop position="100" color="#000000"/> + </gradient> + </fill> + </shape> + <shape name="select_bar_right_highlight"> + <area>100%-1,0,2,100%</area> + <type>box</type> + <fill style="gradient"> + <gradient direction="vertical" alpha="255"> + <stop position="0" color="#000000"/> + <stop position="50" color="#3a9aff"/> + <stop position="100" color="#000000"/> + </gradient> + </fill> + </shape> + </statetype> + + </state> + <state name="disabledactive" from="active"> + <textarea name="buttontext"> + <font>basesmalllightgrey</font> + </textarea> + <group name="widgets"> + <textarea name="value"> + <font>basesmalllightgrey</font> + </textarea> + </group> + </state> + <state name="disabledinactive" from="disabledactive"> + </state> + <state name="selectedinactive" from="active"> + </state> + </statetype> + <statetype name="upscrollarrow"> + <position>1186,413</position> + </statetype> + <statetype name="downscrollarrow"> + <position>1206,413</position> + </statetype> + </buttonlist> + + <!-- optional, display the help for the current group of settings --> + <textarea name="grouphelp" from="basetextarea"> + <area>0,37,1280,37</area> + <font>basesmall</font> + <align>allcenter</align> + <multiline>no</multiline> + <scroll direction="horizontal" returnrate="2000" /> + </textarea> + + <textarea name="helplabel"> + <area>44,520,1192,34</area> + <font>basemediumyellow</font> + <align>left,vcenter</align> + <value>Details</value> + </textarea> + + <!-- optional, display the help for the currently selected setting --> + <textarea name="selectedsettinghelp" from="basetextarea"> + <area>44,561,1192,124</area> + <font>basesmall</font> + <align>left</align> + <multiline>yes</multiline> + </textarea> + </window> + + <window name="terminal"> + <textarea name="heading" from="base_heading"> + <value>Terminal</value> + </textarea> + + <shape name="terminal-backdrop" from="base_backdrop"> + <area>115,36,1050,488</area> + </shape> + + <shape name="terminal-backdrop-line" from="base_backdrop_line"> + <area>116,37,1048,486</area> + </shape> + + <shape name="terminal-top-line" from="base_highlight_line"> + <area>117,38,1046,2</area> + </shape> + + <shape name="terminal-bottom-line" from="base_highlight_line"> + <area>117,520,1046,2</area> + </shape> + + <shape name="terminal-left-line" from="base_highlight_vertical_line"> + <area>117,40,2,500</area> + </shape> + + <shape name="terminal-right-line" from="base_highlight_vertical_line"> + <area>1161,40,2,500</area> + </shape> + + <shape name="terminal-arrows-backdrop" from="base_arrows_backdrop"> + <area>1112,523,50,12</area> + </shape> + + <shape name="terminal-bottom-backdrop" from="base_backdrop"> + <area>115,534,1050,151</area> + </shape> + + <shape name="terminal-bottom-backdrop-line" from="base_backdrop_line"> + <area>116,535,1048,149</area> + </shape> + + <shape name="terminal-bottom-top-line" from="base_highlight_line"> + <area>117,536,1046,2</area> + </shape> + + <shape name="terminal-bottom-bottom-line" from="base_highlight_line"> + <area>117,681,1046,2</area> + </shape> + + <shape name="terminal-bottom-left-line" from="base_highlight_vertical_line"> + <area>117,538,2,143</area> + </shape> + + <shape name="terminal-bottom-right-line" from="base_highlight_vertical_line"> + <area>1161,538,2,143</area> + </shape> + + <shape name="terminal-bottom-seperator-first-line" from="base_line"> + <area>138,620,1004,2</area> + </shape> + + <buttonlist name="output" from="base_list"> + <area>123,44,1034,488</area> + <statetype name="buttonitem"> + <state name="active"> + <area>0,0,1034,30</area> + <textarea name="buttontext"> + <area>8,0,1018,30</area> + <font>basesmaller</font> + </textarea> + </state> + <state name="selectedactive"> + <area>0,0,1034,64</area> + <textarea name="buttontext"> + <area>8,0,1018,64</area> + <align>vcenter</align> + <multiline>yes</multiline> + </textarea> + </state> + <state name="selectedinactive"> + <area>0,0,1034,64</area> + <textarea name="buttontext"> + <area>8,0,1018,64</area> + <align>vcenter</align> + <multiline>yes</multiline> + </textarea> + </state> + </statetype> + <statetype name="upscrollarrow"> + <position>997,481</position> + </statetype> + <statetype name="downscrollarrow"> + <position>1017,481</position> + </statetype> + </buttonlist> + <textedit name="textedit" from="base_textedit"> + <area>139,558,1003,42</area> + </textedit> + <button name="enter" from="base_button"> + <area>540,631,200,40</area> + <value>Enter</value> + </button> + </window> +</mythuitheme> diff --git a/abs/core/linhes-theme/video-ui.xml.patch b/abs/core/linhes-theme/video-ui.xml.patch index 5c84fcd..e3a9f7d 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-12-13 20:43:30.600314830 +0000 -+++ video-ui.xml 2016-12-13 20:34:54.359884898 +0000 ++++ video-ui.xml 2017-10-26 19:57:07.944986189 +0000 @@ -171,6 +171,7 @@ <textarea name="description" from="basetextarea"> <area>24,51,515,393</area> @@ -1171,6 +1171,60 @@ </textarea> <group name="clock-backdrop-group" from="base_clock_backdrop_group" /> +@@ -2205,40 +2269,40 @@ + </textedit> + + <textarea name="default_text" from="basetextarea"> +- <area>560,320,280,30</area> +- <value>Use default player</value> +- <align>vcenter</align> ++ <area>238,320,192,30</area> ++ <value>Use Default Player:</value> ++ <align>right,vcenter</align> + </textarea> + + <checkbox name="default_check" from="base_checkbox"> +- <position>520,320</position> ++ <position>435,320</position> + </checkbox> + + <textarea name="ignore_text" from="basetextarea"> +- <area>560,417,100,30</area> ++ <area>238,417,192,30</area> + <value>Ignore:</value> +- <align>vcenter</align> ++ <align>right,vcenter</align> + </textarea> + + <checkbox name="ignore_check" from="base_checkbox"> +- <position>520,417</position> ++ <position>435,417</position> + </checkbox> + +- <button name="done_button" from="base_button"> ++ <button name="delete_button" from="base_button"> + <area>320,624,150,35</area> +- <value>Done</value> ++ <value>Delete</value> + </button> +- ++ + <button name="new_button" from="base_button"> + <area>565,624,150,35</area> + <value>New</value> + </button> + +- <button name="delete_button" from="base_button"> ++ <button name="done_button" from="base_button"> + <area>810,624,150,35</area> +- <value>Delete</value> ++ <value>Done</value> + </button> +- ++ + </window> + + <window name="edit_metadata"> @@ -2947,82 +3011,84 @@ <multiline>no</multiline> <font>basesmalldarkyellow</font> @@ -1273,3 +1327,82 @@ <align>vcenter</align> </textarea> +@@ -3200,12 +3266,13 @@ + </buttonlist> + + <checkbox name="altcheck" from="base_checkbox"> +- <position>750,413</position> ++ <position>442,413</position> + </checkbox> + + <textarea name="altcheck_text" from="basetextarea"> +- <area>475,413,265,30</area> ++ <area>242,397,190,60</area> + <align>right,vcenter</align> ++ <multiline>yes</multiline> + <value>Enable Alternate Player:</value> + </textarea> + +@@ -3221,19 +3288,19 @@ + + <textarea name="helptext" from="basetextarea"> + <area>239,551,802,61</area> +- <font>basesmallerblue</font> ++ <font>basesmaller</font> + <multiline>true</multiline> + <align>allcenter</align> + </textarea> + +- <button name="ok" from="base_button"> ++ <button name="cancel" from="base_button"> + <area>273,628,350,40</area> +- <value>OK</value> ++ <value>Cancel</value> + </button> + +- <button name="cancel" from="base_button"> ++ <button name="ok" from="base_button"> + <area>657,628,350,40</area> +- <value>Cancel</value> ++ <value>Save</value> + </button> + + </window> +@@ -3313,7 +3380,7 @@ + <position>390,175</position> + </checkbox> + +- <textarea name="trailerplay_text" from="basetextarea"> ++ <textarea name="trailerplay_text" from="basetextarea" depends="randomtrailercheck"> + <area>245,259,175,40</area> + <value>Trailers to Play:</value> + <align>right,vcenter</align> +@@ -3345,21 +3412,21 @@ + + <textarea name="helptext" from="basetextarea"> + <area>239,523,802,76</area> +- <font>basesmallerblue</font> ++ <font>basesmaller</font> + <multiline>true</multiline> + <align>allcenter</align> + </textarea> + +- <button name="ok" from="base_button"> +- <area>273,622,350,40</area> +- <value>OK</value> +- </button> +- + <button name="cancel" from="base_button"> +- <area>657,622,350,40</area> ++ <area>273,628,350,40</area> + <value>Cancel</value> + </button> + ++ <button name="ok" from="base_button"> ++ <area>657,628,350,40</area> ++ <value>Save</value> ++ </button> ++ + </window> + + </mythuitheme> diff --git a/abs/core/linhes-theme/weather-ui.xml.patch b/abs/core/linhes-theme/weather-ui.xml.patch new file mode 100644 index 0000000..01c058a --- /dev/null +++ b/abs/core/linhes-theme/weather-ui.xml.patch @@ -0,0 +1,126 @@ +--- weather-ui.xml.orig 2017-10-26 17:16:29.549239075 +0000 ++++ weather-ui.xml 2017-10-26 17:04:02.976373390 +0000 +@@ -111,7 +111,7 @@ + + <textarea name="cclocation" from="basetextarea"> + <area>232,90,816,42</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -217,7 +217,7 @@ + + <textarea name="3dlocation" from="basetextarea"> + <area>232,90,816,42</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -385,7 +385,7 @@ + + <textarea name="6dlocation" from="basetextarea"> + <area>232,90,816,42</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -662,7 +662,7 @@ + + <textarea name="smdesc" from="basetextarea"> + <area>232,90,816,42</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -698,7 +698,7 @@ + + <textarea name="amdesc" from="basetextarea"> + <area>232,90,816,42</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -746,7 +746,7 @@ + + <textarea name="swlocation" from="basetextarea"> + <area>233,90,816,42</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -775,7 +775,7 @@ + + <textarea name="18hrlocation" from="basetextarea"> + <area>232,90,816,42</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -1205,7 +1205,7 @@ + + <textarea name="inactivehdr" from="basetextarea"> + <area>215,40,415,38</area> +- <font>basesmallyellow</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + +@@ -1263,7 +1263,7 @@ + <area>8,0,383,64</area> + <multiline>yes</multiline> + </textarea> +- <imagetype name="rightarrow" from="buttonarrow"> ++ <imagetype name="rightarrow" from="buttonarrow"> + <position>399,22</position> + </imagetype> + </state> +@@ -1285,7 +1285,7 @@ + + <textarea name="helptxt" from="basetextarea"> + <area>223,446,847,158</area> +- <font>basesomewhatsmallerblue</font> ++ <font>basesomewhatsmaller</font> + <multiline>yes</multiline> + <align>allcenter</align> + </textarea> +@@ -1438,7 +1438,7 @@ + + <textarea name="srcinfo" from="basetextarea"> + <area>164,470,952,130</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <multiline>yes</multiline> + <align>allcenter</align> + </textarea> +@@ -1542,7 +1542,7 @@ + + <textarea name="helptxt" from="basetextarea"> + <area>330,40,620,90</area> +- <font>basesmallerblue</font> ++ <font>basesmaller</font> + <value>Enter your current location, nearest large town or city. In some countries postal codes are also supported. Hit the right or down arrow to continue. </value> + <multiline>yes</multiline> + <align>allcenter</align> +@@ -1594,13 +1594,13 @@ + + <textarea name="numresults" from="basetextarea"> + <area>330,517,620,42</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + + <textarea name="source" from="basetextarea"> + <area>330,559,620,42</area> +- <font>basesmallblue</font> ++ <font>basesmall</font> + <align>allcenter</align> + </textarea> + |