Skip to content

Commit 77a4eb8

Browse files
HitcherHitcher
authored
Add streams dialog (#307)
* Add streams dialog Refactor video OSD * Fix alignment * Add audio object type Split video version textbox into 2 separate labels one can scroll * Typo * Capitalise properties Shorten audio codec labels * Remove extra space * Re-enable video type flagging
1 parent d3ce3f6 commit 77a4eb8

15 files changed

+836
-149
lines changed

‎1080p/Custom_1102_OptionsDialog.xml

+184-92
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,203 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<window id="1102" type="dialog">
3-
<defaultcontrol always="true">11000</defaultcontrol>
4-
<onload condition="String.IsEqual(window(home).Property(optionsdialog_content),options)">SetFocus(11100)</onload>
5-
<onload condition="String.IsEqual(window(home).Property(optionsdialog_content),3d)">SetFocus(11200)</onload>
3+
<defaultcontrol always="true">11100</defaultcontrol>
64
<include>dialogeffect</include>
75
<onunload>ClearProperty(optionsdialog_header,Home)</onunload>
86
<onunload>ClearProperty(optionsdialog_content,Home)</onunload>
97
<coordinates>
10-
<left>360</left>
8+
<left>510</left>
119
<top>213</top>
1210
</coordinates>
1311
<controls>
14-
<control type="group" id="11000">
15-
<centerleft>50%</centerleft>
16-
<centertop>50%</centertop>
17-
<animation effect="fade" time="150">VisibleChange</animation>
18-
<include content="DialogBackgroundCommons">
19-
<param name="DialogBackgroundWidth" value="1200" />
20-
<param name="DialogBackgroundHeight" value="330" />
21-
<param name="DialogHeaderWidth" value="1080" />
22-
<param name="DialogHeaderLabel" value="$INFO[Window(home).Property(optionsdialog_header)]" />
23-
<param name="DialogHeaderId" value="1" />
24-
<param name="CloseButtonLeft" value="1065" />
25-
<param name="CloseButtonNav" value="10" />
26-
</include>
27-
<control type="grouplist" id="11100">
12+
<control type="group">
13+
<visible>![Window.IsActive(DialogSelect.xml) | Window.IsActive(DialogSettings.xml)]</visible>
14+
<control type="group">
2815
<visible>String.IsEqual(window(home).Property(optionsdialog_content),options)</visible>
16+
<centerleft>50%</centerleft>
17+
<centertop>50%</centertop>
2918
<animation effect="fade" time="150">VisibleChange</animation>
30-
<left>53</left>
31-
<top>105</top>
32-
<width>1095</width>
33-
<height>192</height>
34-
<itemgap>6</itemgap>
35-
<onleft>11100</onleft>
36-
<onright>11100</onright>
37-
<onup>11100</onup>
38-
<ondown>11100</ondown>
39-
<orientation>vertical</orientation>
40-
<control type="button" id="11101">
41-
<height>60</height>
42-
<width>1095</width>
43-
<texturefocus border="5">button-focus2.png</texturefocus>
44-
<label>31022</label>
45-
<onclick>Dialog.Close(all)</onclick>
46-
<onclick>ActivateWindow(1103)</onclick>
47-
<enable>Player.TempoEnabled</enable>
48-
</control>
49-
<control type="button" id="11102">
50-
<height>60</height>
51-
<width>1095</width>
52-
<label>10116</label>
53-
<texturefocus border="5">button-focus2.png</texturefocus>
54-
<onclick>Dialog.Close(all)</onclick>
55-
<onclick>ActivateWindow(playerprocessinfo)</onclick>
56-
<onclick>SetFocus(207)</onclick>
57-
</control>
58-
<control type="button" id="11103">
59-
<height>60</height>
60-
<width>1095</width>
61-
<label>36560</label>
62-
<texturefocus border="5">button-focus2.png</texturefocus>
63-
<onclick>Dialog.Close(1114)</onclick>
64-
<onclick>ActivateWindow(osdcmssettings)</onclick>
65-
<visible>System.HasCMS</visible>
19+
<include content="DialogBackgroundCommons">
20+
<param name="DialogBackgroundWidth" value="900"/>
21+
<param name="DialogBackgroundHeight" value="540"/>
22+
<param name="DialogHeaderWidth" value="780"/>
23+
<param name="DialogHeaderLabel" value="$INFO[Window(home).Property(optionsdialog_header)]"/>
24+
<param name="DialogHeaderId" value="1"/>
25+
<param name="CloseButtonLeft" value="765"/>
26+
<param name="CloseButtonNav" value="10"/>
27+
</include>
28+
<control type="grouplist" id="11100">
29+
<animation effect="fade" time="150">VisibleChange</animation>
30+
<left>53</left>
31+
<top>105</top>
32+
<width>795</width>
33+
<height>402</height>
34+
<itemgap>6</itemgap>
35+
<onleft>11100</onleft>
36+
<onright>11100</onright>
37+
<onup>11100</onup>
38+
<ondown>11100</ondown>
39+
<orientation>vertical</orientation>
40+
<control type="button" id="10">
41+
<height>60</height>
42+
<width>795</width>
43+
<texturefocus border="5">button-focus2.png</texturefocus>
44+
<label>13396</label>
45+
<onclick>ActivateWindow(osdaudiosettings)</onclick>
46+
</control>
47+
<control type="button" id="11">
48+
<height>60</height>
49+
<width>795</width>
50+
<texturefocus border="5">button-focus2.png</texturefocus>
51+
<label>24133</label>
52+
<onclick>ActivateWindow(osdsubtitlesettings)</onclick>
53+
</control>
54+
<control type="button" id="12">
55+
<height>60</height>
56+
<width>795</width>
57+
<texturefocus border="5">button-focus2.png</texturefocus>
58+
<label>13395</label>
59+
<onclick>ActivateWindow(osdvideosettings)</onclick>
60+
</control>
61+
<control type="button" id="13">
62+
<height>60</height>
63+
<width>795</width>
64+
<texturefocus border="5">button-focus2.png</texturefocus>
65+
<label>31022</label>
66+
<label2>[B]$INFO[Player.PlaySpeed][/B]</label2>
67+
<onclick>Dialog.Close(all)</onclick>
68+
<onclick>ActivateWindow(1103)</onclick>
69+
<enable>Player.TempoEnabled</enable>
70+
</control>
71+
<control type="button" id="14">
72+
<height>60</height>
73+
<width>795</width>
74+
<label>10116</label>
75+
<texturefocus border="5">button-focus2.png</texturefocus>
76+
<onclick>Dialog.Close(all)</onclick>
77+
<onclick>ActivateWindow(playerprocessinfo)</onclick>
78+
<onclick>SetFocus(207)</onclick>
79+
</control>
80+
<control type="button" id="15">
81+
<height>60</height>
82+
<width>795</width>
83+
<label>36560</label>
84+
<texturefocus border="5">button-focus2.png</texturefocus>
85+
<onclick>Dialog.Close(1114)</onclick>
86+
<onclick>ActivateWindow(osdcmssettings)</onclick>
87+
<visible>System.HasCMS</visible>
88+
</control>
6689
</control>
6790
</control>
68-
<control type="grouplist" id="11200">
91+
<control type="group">
6992
<visible>String.IsEqual(window(home).Property(optionsdialog_content),3d)</visible>
93+
<centerleft>50%</centerleft>
94+
<centertop>50%</centertop>
7095
<animation effect="fade" time="150">VisibleChange</animation>
71-
<left>53</left>
72-
<top>105</top>
73-
<width>1095</width>
74-
<height>192</height>
75-
<itemgap>6</itemgap>
76-
<onleft>11200</onleft>
77-
<onright>11200</onright>
78-
<onup>11200</onup>
79-
<ondown>11200</ondown>
80-
<orientation>vertical</orientation>
81-
<control type="radiobutton" id="11201">
82-
<height>60</height>
83-
<width>1095</width>
84-
<aligny>center</aligny>
85-
<label>31362</label>
86-
<radioposx>1040</radioposx>
87-
<texturefocus border="5">button-focus2.png</texturefocus>
88-
<onclick>ToggleStereoMode</onclick>
89-
<selected>Integer.IsGreater(System.StereoscopicMode,0)</selected>
90-
</control>
91-
<control type="button" id="11202">
92-
<height>60</height>
93-
<width>1095</width>
94-
<aligny>center</aligny>
95-
<texturefocus border="5">button-focus2.png</texturefocus>
96-
<label>31361</label>
97-
<label2>[B]$INFO[VideoPlayer.StereoscopicMode][/B]</label2>
98-
<onclick>StereoMode</onclick>
96+
<include content="DialogBackgroundCommons">
97+
<param name="DialogBackgroundWidth" value="900"/>
98+
<param name="DialogBackgroundHeight" value="330"/>
99+
<param name="DialogHeaderWidth" value="780"/>
100+
<param name="DialogHeaderLabel" value="$INFO[Window(home).Property(optionsdialog_header)]"/>
101+
<param name="DialogHeaderId" value="1"/>
102+
<param name="CloseButtonLeft" value="765"/>
103+
<param name="CloseButtonNav" value="10"/>
104+
</include>
105+
<control type="grouplist" id="11100">
106+
<animation effect="fade" time="150">VisibleChange</animation>
107+
<left>53</left>
108+
<top>105</top>
109+
<width>795</width>
110+
<height>192</height>
111+
<itemgap>6</itemgap>
112+
<onleft>11100</onleft>
113+
<onright>11100</onright>
114+
<onup>11100</onup>
115+
<ondown>11100</ondown>
116+
<orientation>vertical</orientation>
117+
<control type="radiobutton" id="16">
118+
<height>60</height>
119+
<width>795</width>
120+
<aligny>center</aligny>
121+
<label>31362</label>
122+
<radioposx>740</radioposx>
123+
<texturefocus border="5">button-focus2.png</texturefocus>
124+
<onclick>ToggleStereoMode</onclick>
125+
<selected>Integer.IsGreater(System.StereoscopicMode,0)</selected>
126+
</control>
127+
<control type="button" id="17">
128+
<height>60</height>
129+
<width>795</width>
130+
<aligny>center</aligny>
131+
<texturefocus border="5">button-focus2.png</texturefocus>
132+
<label>31361</label>
133+
<label2>[B]$INFO[VideoPlayer.StereoscopicMode][/B]</label2>
134+
<onclick>StereoMode</onclick>
135+
</control>
136+
<control type="radiobutton" id="18">
137+
<height>60</height>
138+
<width>795</width>
139+
<aligny>center</aligny>
140+
<label>31360</label>
141+
<radioposx>740</radioposx>
142+
<texturefocus border="5">button-focus2.png</texturefocus>
143+
<onclick>StereoModeToMono</onclick>
144+
<selected>String.IsEqual(System.StereoscopicMode,9)</selected>
145+
</control>
99146
</control>
100-
<control type="radiobutton" id="11203">
101-
<height>60</height>
102-
<width>1095</width>
103-
<aligny>center</aligny>
104-
<label>31360</label>
105-
<radioposx>1040</radioposx>
106-
<texturefocus border="5">button-focus2.png</texturefocus>
107-
<onclick>StereoModeToMono</onclick>
108-
<selected>String.IsEqual(System.StereoscopicMode,9)</selected>
147+
</control>
148+
<control type="group">
149+
<visible>String.IsEqual(window(home).Property(optionsdialog_content),streamselection)</visible>
150+
<centerleft>50%</centerleft>
151+
<centertop>50%</centertop>
152+
<animation effect="fade" time="150">VisibleChange</animation>
153+
<include content="DialogBackgroundCommons">
154+
<param name="DialogBackgroundWidth" value="1000"/>
155+
<param name="DialogBackgroundHeight" value="330"/>
156+
<param name="DialogHeaderWidth" value="880"/>
157+
<param name="DialogHeaderLabel" value="$INFO[Window(home).Property(optionsdialog_header)]"/>
158+
<param name="DialogHeaderId" value="1"/>
159+
<param name="CloseButtonLeft" value="765"/>
160+
<param name="CloseButtonNav" value="10"/>
161+
</include>
162+
<control type="grouplist" id="11100">
163+
<animation effect="fade" time="150">VisibleChange</animation>
164+
<left>53</left>
165+
<top>105</top>
166+
<width>895</width>
167+
<height>192</height>
168+
<itemgap>6</itemgap>
169+
<onleft>11100</onleft>
170+
<onright>11100</onright>
171+
<onup>11100</onup>
172+
<ondown>11100</ondown>
173+
<orientation>vertical</orientation>
174+
<control type="button" id="19">
175+
<height>60</height>
176+
<width>895</width>
177+
<label>31052</label>
178+
<label2>[B]$VAR[ActiveVideoPlayerSubtitleLanguage][/B]</label2>
179+
<texturefocus border="5">button-focus2.png</texturefocus>
180+
<onclick>DialogSelectSubtitle</onclick>
181+
<enable>VideoPlayer.HasSubtitles</enable>
182+
</control>
183+
<control type="button" id="20">
184+
<height>60</height>
185+
<width>895</width>
186+
<label>31053</label>
187+
<label2>[B]$VAR[ActiveVideoPlayerAudioLanguage]$VAR[AudioCodecVar, | ]$VAR[ObjectAudioTypeVar, | ]$VAR[AudioChannelsVar][/B]</label2>
188+
<texturefocus border="5">button-focus2.png</texturefocus>
189+
<onclick>DialogSelectAudio</onclick>
190+
<enable>Integer.IsGreater(VideoPlayer.AudioStreamCount,1)</enable>
191+
</control>
192+
<control type="button" id="21">
193+
<height>60</height>
194+
<width>895</width>
195+
<label>31054</label>
196+
<label2>[B]$VAR[VideoCodecVar]$VAR[VideoHDRTypeVar, | ]$VAR[VideoResolutionTypeVar, | ][/B]</label2>
197+
<texturefocus border="5">button-focus2.png</texturefocus>
198+
<onclick>DialogSelectVideo</onclick>
199+
<enable>Integer.IsGreater(VideoPlayer.VideoStreamCount,1)</enable>
200+
</control>
109201
</control>
110202
</control>
111203
</control>

‎1080p/DialogSelect.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
<include>dialogeffect</include>
55
<depth>DepthDialog+</depth>
66
<controls>
7-
<include condition="String.IsEmpty(Window(home).Property(CheckPreviousEpisode)) + ![Window.IsActive(selectvideoversion) | Window.IsActive(selectvideoextra) | Window.IsActive(gamesaves) | Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)]">DialogDefaultSelectLayout</include>
7+
<include condition="String.IsEmpty(Window(home).Property(CheckPreviousEpisode)) + ![Window.IsActive(dialogselectvideo) | Window.IsActive(dialogselectaudio) | Window.IsActive(dialogselectsubtitle) | Window.IsActive(selectvideoversion) | Window.IsActive(selectvideoextra) | Window.IsActive(gamesaves) | Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)]">DialogDefaultSelectLayout</include>
8+
<include condition="Window.IsActive(dialogselectvideo)">DialogSelectVideoLayout</include>
9+
<include condition="Window.IsActive(dialogselectaudio)">DialogSelectAudioLayout</include>
10+
<include condition="Window.IsActive(dialogselectsubtitle)">DialogSelectSubtitleLayout</include>
811
<include condition="Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)">DialogGameSelectLayout</include>
912
<include condition="Window.IsActive(gamesaves)">DialogGameSelectSaveLayout</include>
1013
<include condition="Window.IsActive(selectvideoversion) | Window.IsActive(selectvideoextra)">DialogVideoSelectLayout</include>

‎1080p/DialogVideoInfo.xml

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
<include>VideoCodecFlaggingConditions</include>
6161
<include>AudioCodecFlaggingConditions</include>
6262
<include>AudioChannelsFlaggingConditions</include>
63-
<include>AudioObjectsFlaggingConditions</include>
6463
<include>AspectCodecFlaggingConditions</include>
6564
<include>VideoStereoscopicsFlaggingConditions</include>
6665
</control>

0 commit comments

Comments
 (0)