Skip to content

Commit

Permalink
Move speaker configuration setup down
Browse files Browse the repository at this point in the history 
Following 825975c, the speaker setup is dependent on the audio device selected as well as the digital features checked. So having the speaker setup at the top is non-intuitive.
  • Loading branch information
@jyavenard
jyavenard committed Apr 4, 2012
1 parent 29f8994 commit 58e2527
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 60 deletions.
40 changes: 20 additions & 20 deletions mythtv/themes/Terra/config-ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,73 +209,73 @@
<value>Audio Device:</value>
</textarea>

<textarea name="speaktext_text" from="auddev_text">
<position>40,148</position>
<value>Number of Speakers:</value>
</textarea>

<textarea name="ac3_text" from="basetextarea">
<area>410,200,600,30</area>
<area>410,150,600,30</area>
<font>basesmall</font>
<value>My audio subsystem supports Dolby Digital</value>
</textarea>

<textarea name="dts_text" from="basetextarea">
<area>410,245,600,30</area>
<area>410,195,600,30</area>
<font>basesmall</font>
<value>My audio subsystem supports DTS</value>
</textarea>

<textarea name="eac3_text" from="basetextarea">
<area>410,290,600,30</area>
<area>410,240,600,30</area>
<font>basesmall</font>
<value>My audio subsystem supports E-AC-3</value>
</textarea>

<textarea name="truehd_text" from="basetextarea">
<area>410,335,600,30</area>
<area>410,285,600,30</area>
<font>basesmall</font>
<value>My audio subsystem supports TrueHD</value>
</textarea>

<textarea name="dtshd_text" from="basetextarea">
<area>410,380,600,30</area>
<area>410,330,600,30</area>
<font>basesmall</font>
<value>My audio subsystem supports DTS-HD</value>
</textarea>

<textarea name="speaktext_text" from="auddev_text">
<position>40,370</position>
<value>Number of Speakers:</value>
</textarea>

<!--Widgets-->

<buttonlist name="audiodevices" from="basewideselector">
<position>360,97</position>
</buttonlist>

<buttonlist name="speakers" from="basewideselector">
<position>360,142</position>
</buttonlist>

<checkbox name="ac3check" from="basecheckbox">
<position>360,197</position>
<position>360,145</position>
</checkbox>

<checkbox name="dtscheck" from="basecheckbox">
<position>360,242</position>
<position>360,190</position>
</checkbox>

<checkbox name="eac3check" from="basecheckbox">
<position>360,287</position>
<position>360,235</position>
</checkbox>

<checkbox name="truehdcheck" from="basecheckbox">
<position>360,332</position>
<position>360,280</position>
</checkbox>

<checkbox name="dtshdcheck" from="basecheckbox">
<position>360,377</position>
<position>360,325</position>
</checkbox>

<buttonlist name="speakers" from="basewideselector">
<position>360,365</position>
</buttonlist>

<button name="testspeakers" from="basewidebutton">
<position>360,422</position>
<position>360,407</position>
</button>

<button name="previous" from="basebutton">
Expand Down
38 changes: 19 additions & 19 deletions mythtv/themes/default-wide/config-ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,71 +512,71 @@
<value>Audio Device:</value>
</textarea>

<textarea name="speaktext_text" from="auddev_text">
<position>40,148</position>
<value>Number of Speakers:</value>
</textarea>

<textarea name="ac3_text" from="basetextarea">
<area>410,200,-20,30</area>
<area>410,155,-20,30</area>
<font>basesmall</font>
<value>My audio subsystem supports Dolby Digital</value>
</textarea>

<textarea name="dts_text" from="basetextarea">
<area>410,245,-20,30</area>
<area>410,200,-20,30</area>
<font>basesmall</font>
<value>My audio subsystem supports DTS</value>
</textarea>

<textarea name="eac3_text" from="basetextarea">
<area>410,290,-20,30</area>
<area>410,245,-20,30</area>
<font>basesmall</font>
<value>My audio subsystem supports E-AC-3</value>
</textarea>

<textarea name="truehd_text" from="basetextarea">
<area>410,335,-20,30</area>
<area>410,290,-20,30</area>
<font>basesmall</font>
<value>My audio subsystem supports TrueHD</value>
</textarea>

<textarea name="dtshd_text" from="basetextarea">
<area>410,380,-20,30</area>
<area>410,335,-20,30</area>
<font>basesmall</font>
<value>My audio subsystem supports DTS-HD</value>
</textarea>

<textarea name="speaktext_text" from="auddev_text">
<position>40,378</position>
<value>Number of Speakers:</value>
</textarea>

<!--Widgets-->

<buttonlist name="audiodevices" from="basewideselector">
<position>360,97</position>
</buttonlist>

<buttonlist name="speakers" from="basewideselector">
<position>360,142</position>
</buttonlist>

<checkbox name="ac3check" from="basecheckbox">
<position>360,197</position>
<position>360,152</position>
</checkbox>

<checkbox name="dtscheck" from="basecheckbox">
<position>360,242</position>
<position>360,197</position>
</checkbox>

<checkbox name="eac3check" from="basecheckbox">
<position>360,287</position>
<position>360,242</position>
</checkbox>

<checkbox name="truehdcheck" from="basecheckbox">
<position>360,332</position>
<position>360,287</position>
</checkbox>

<checkbox name="dtshdcheck" from="basecheckbox">
<position>360,377</position>
<position>360,332</position>
</checkbox>

<buttonlist name="speakers" from="basewideselector">
<position>360,372</position>
</buttonlist>

<button name="testspeakers" from="basewidebutton">
<position>360,422</position>
</button>
Expand Down
42 changes: 21 additions & 21 deletions mythtv/themes/default/config-ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,73 +539,73 @@
<value>Audio Device:</value>
</textarea>

<textarea name="speaktext_text" from="basetextarea">
<area>20,148,225,30</area>
<font>basesmall</font>
<align>right</align>
<value>Number of Speakers:</value>
</textarea>

<textarea name="ac3_text" from="basetextarea">
<area>290,200,-20,30</area>
<area>290,155,-20,30</area>
<font>basesmall</font>
<value>My audio subsystem supports Dolby Digital</value>
</textarea>

<textarea name="dts_text" from="basetextarea">
<area>290,245,-20,30</area>
<area>290,200,-20,30</area>
<font>basesmall</font>
<value>My audio subsystem supports DTS</value>
</textarea>

<textarea name="eac3_text" from="basetextarea">
<area>290,290,-20,30</area>
<area>290,245,-20,30</area>
<font>basesmall</font>
<value>My audio subsystem supports E-AC-3</value>
</textarea>

<textarea name="truehd_text" from="basetextarea">
<area>290,335,-20,30</area>
<area>290,290,-20,30</area>
<font>basesmall</font>
<value>My audio subsystem supports TrueHD</value>
</textarea>

<textarea name="dtshd_text" from="basetextarea">
<area>290,380,-20,30</area>
<area>290,335,-20,30</area>
<font>basesmall</font>
<value>My audio subsystem supports DTS-HD</value>
</textarea>

<textarea name="speaktext_text" from="basetextarea">
<area>20,378,225,30</area>
<font>basesmall</font>
<align>right</align>
<value>Number of Speakers:</value>
</textarea>

<!--Widgets-->

<buttonlist name="audiodevices" from="basewideselector">
<position>250,97</position>
</buttonlist>

<buttonlist name="speakers" from="basewideselector">
<position>250,142</position>
</buttonlist>

<checkbox name="ac3check" from="basecheckbox">
<position>250,197</position>
<position>250,153</position>
</checkbox>

<checkbox name="dtscheck" from="basecheckbox">
<position>250,242</position>
<position>250,198</position>
</checkbox>

<checkbox name="eac3check" from="basecheckbox">
<position>250,287</position>
<position>250,243</position>
</checkbox>

<checkbox name="truehdcheck" from="basecheckbox">
<position>250,332</position>
<position>250,288</position>
</checkbox>

<checkbox name="dtshdcheck" from="basecheckbox">
<position>250,377</position>
<position>250,333</position>
</checkbox>

<buttonlist name="speakers" from="basewideselector">
<position>250,372</position>
</buttonlist>

<button name="testspeakers" from="basewidebutton">
<position>250,422</position>
</button>
Expand Down

0 comments on commit 58e2527

Please sign in to comment.