summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2017-10-26 20:08:04 (GMT)
committerBritney Fransen <brfransen@gmail.com>2017-10-26 20:08:04 (GMT)
commit47e7deb54e50202647e7436d1e0ef5ddc51486d2 (patch)
tree31bfef7e57014f71b71aa7416a7c916a43e52217
parent8daa6d62e101464d309797d25fd275f368fe86be (diff)
downloadlinhes_pkgbuild-47e7deb54e50202647e7436d1e0ef5ddc51486d2.zip
linhes_pkgbuild-47e7deb54e50202647e7436d1e0ef5ddc51486d2.tar.gz
linhes_pkgbuild-47e7deb54e50202647e7436d1e0ef5ddc51486d2.tar.bz2
linhes-theme: adjust music and video setting screens
-rwxr-xr-xabs/core/linhes-theme/PKGBUILD6
-rw-r--r--abs/core/linhes-theme/musicsettings-ui.xml.patch303
-rw-r--r--abs/core/linhes-theme/video-ui.xml.patch115
3 files changed, 402 insertions, 22 deletions
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 9b13ba4..d3b77c8 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.5
-pkgrel=1
+pkgrel=2
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -106,7 +106,7 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60'
'b90b745c72a057c78ebd0b6f2c5530b9'
'a0ea2d3e386c0b483b31aa1a2703f9eb'
'8f8c27146e11954f60913da6d1fce073'
- '1c086689fea12b35da378526c4864453'
+ '09806f2e1d1e6050cc0d10cc6c5daf36'
'128984d8de805e3227a4de279f292f46'
'52bb1c1a6c693adc8c04227fb124955a'
'643e7d548587b8742ed5accb6d736257'
@@ -117,7 +117,7 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60'
'384871202030f41148536e2e89bb1801'
'4d01487b534e45c631734501ec0da501'
'8312aff444945f80a76100696c81cb2e'
- 'e25cf6e1783545b2c3a90f4497de407c'
+ '81a2706cd36a16a1e0c54d87f3a0857b'
'4125880d1739b196a8041ecc3d773ee2'
'5a8fb2a5f0e657d52be6f0a6a006ce72'
'36952501471b05395e4f061557447b2f'
diff --git a/abs/core/linhes-theme/musicsettings-ui.xml.patch b/abs/core/linhes-theme/musicsettings-ui.xml.patch
index d0181ac..a667eab 100644
--- a/abs/core/linhes-theme/musicsettings-ui.xml.patch
+++ b/abs/core/linhes-theme/musicsettings-ui.xml.patch
@@ -1,6 +1,51 @@
--- musicsettings-ui.xml.orig 2017-10-26 18:28:30.226541178 +0000
-+++ musicsettings-ui.xml 2017-10-26 18:28:11.558977405 +0000
-@@ -129,7 +129,7 @@
++++ 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>
@@ -9,7 +54,24 @@
<cutdown>yes</cutdown>
<align>allcenter</align>
<multiline>yes</multiline>
-@@ -213,7 +213,7 @@
+ </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>
@@ -18,7 +80,7 @@
</textarea>
<textedit name="filenametemplate" from="base_textedit">
-@@ -223,7 +223,7 @@
+@@ -223,7 +224,7 @@
<textarea name="nowhitespace_label" from="basetextarea">
<area>128,190,430,30</area>
<align>right,vcenter</align>
@@ -27,7 +89,7 @@
</textarea>
<checkbox name="nowhitespace" from="base_checkbox">
-@@ -253,7 +253,7 @@
+@@ -253,7 +254,7 @@
<textarea name="mp3usevbr_label" from="basetextarea">
<area>128,369,430,30</area>
<align>right,vcenter</align>
@@ -36,7 +98,7 @@
</textarea>
<checkbox name="mp3usevbr" from="base_checkbox">
-@@ -263,7 +263,7 @@
+@@ -263,7 +264,7 @@
<textarea name="ejectcd_label" from="basetextarea">
<area>128,422,430,30</area>
<align>right,vcenter</align>
@@ -45,7 +107,7 @@
</textarea>
<checkbox name="ejectcd" from="base_checkbox">
-@@ -282,7 +282,7 @@
+@@ -282,20 +283,20 @@
<textarea name="helptext" from="basetextarea">
<area>139,552,1003,66</area>
@@ -54,16 +116,195 @@
<cutdown>yes</cutdown>
<align>allcenter</align>
<multiline>yes</multiline>
-@@ -396,7 +396,7 @@
+ </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>
+- <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>
-@@ -508,8 +508,8 @@
+ </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">
@@ -74,7 +315,27 @@
<cutdown>yes</cutdown>
<align>allcenter</align>
<multiline>yes</multiline>
-@@ -624,7 +624,7 @@
+ </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>
@@ -83,3 +344,23 @@
<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/video-ui.xml.patch b/abs/core/linhes-theme/video-ui.xml.patch
index 52305bb..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 2017-10-26 17:04:02.976373390 +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>
@@ -889,8 +889,9 @@
- <area>604,444,124,42</area>
+ <textarea name="length" from="basetextarea">
+ <area>707,444,139,42</area>
-+ <font>basesmall</font>
-+ <align>left,vcenter</align>
+ <font>basesmall</font>
+ <align>left,vcenter</align>
+- <value>UserRating:</value>
+ </textarea>
+
+ <textarea name="yrlbl" from="basetextarea">
@@ -908,7 +909,7 @@
+
+ <textarea name="description" from="basetextarea">
+ <area>40,495,1001,136</area>
- <font>basesmall</font>
++ <font>basesmall</font>
+ <align>justify</align>
+ <multiline>yes</multiline>
+ <scroll direction="up" rate="20" startdelay="5"/>
@@ -918,8 +919,7 @@
+ <textarea name="userratinglabel" from="basetextarea">
+ <area>40,641,80,42</area>
+ <font>baseextrasmallblue</font>
- <align>left,vcenter</align>
-- <value>UserRating:</value>
++ <align>left,vcenter</align>
+ <value>User Rating:</value>
</textarea>
@@ -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>
@@ -1289,7 +1343,7 @@
<value>Enable Alternate Player:</value>
</textarea>
-@@ -3221,7 +3288,7 @@
+@@ -3221,19 +3288,19 @@
<textarea name="helptext" from="basetextarea">
<area>239,551,802,61</area>
@@ -1298,7 +1352,32 @@
<multiline>true</multiline>
<align>allcenter</align>
</textarea>
-@@ -3345,7 +3412,7 @@
+
+- <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>
@@ -1307,3 +1386,23 @@
<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>