Fixes and cleanup

gade01 · Oct 6, 2022 · 4549417 · 4549417
1 parent c6a21f8
commit 4549417
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/720p/DialogPlayerProcessInfo.xml b/720p/DialogPlayerProcessInfo.xml
@@ -14,7 +14,7 @@
 
 		<control type="group">
 			<description>Player Process Information</description>
-			<visible>![Window.IsActive(OSDVideoSettings) | Window.IsActive(OSDAudioSettings) | Window.IsActive(osdsubtitlesettings) | Window.IsActive(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(pvrchannelguide) | Window.IsActive(subtitlesearch) | Window.IsActive(osdcmssettings)]</visible>
+			<visible>![Window.IsActive(OSDVideoSettings) | Window.IsActive(OSDAudioSettings) | Window.IsActive(OSDSubtitleSettings) | Window.IsActive(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(pvrchannelguide) | Window.IsActive(subtitlesearch) | Window.IsActive(osdcmssettings)]</visible>
 			<depth>DepthOSD</depth>
 			<include>FSMediaInfoOpenCloseAnim</include>
 			<left>28</left>
@@ -429,7 +429,7 @@
 
 		<control type="group">
 			<visible>[[Pvr.IsPlayingTv + Window.IsActive(FullscreenVideo)] | [Pvr.IsPlayingRadio | Window.IsActive(visualisation)]] + system.getbool(pvrplayback.signalquality) +
-			![Player.ShowInfo | Window.IsActive(OSDVideoSettings) | Window.IsActive(OSDAudioSettings) | Window.IsActive(osdsubtitlesettings) | Window.IsActive(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(pvrchannelguide) | Window.IsActive(subtitlesearch) | Window.IsActive(osdcmssettings)]</visible>
+			![Player.ShowInfo | Window.IsActive(OSDVideoSettings) | Window.IsActive(OSDAudioSettings) | Window.IsActive(OSDSubtitleSettings) | Window.IsActive(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(pvrchannelguide) | Window.IsActive(subtitlesearch) | Window.IsActive(osdcmssettings)]</visible>
 			<depth>DepthOSD</depth>
 			<include>FSMediaInfoOpenCloseAnim</include>
 			<left>28</left>

diff --git a/720p/DialogSeekBar.xml b/720p/DialogSeekBar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<zorder>2</zorder>
-	<visible>[Player.Seeking | Player.DisplayAfterSeek | Player.Forwarding | Player.Rewinding | Player.Paused | Player.Caching | Player.ShowInfo | Player.ShowTime | Player.IsTempo | Player.HasSceneMarkers] + ![Window.IsVisible(VideoOSD) | Window.IsVisible(MusicOSD) | Skin.HasSetting(HideSeekBarOSD) | Window.IsActive(script.pseudotv.TVOverlay.xml) | Window.IsActive(script.pseudotv.live.TVOverlay.xml)]</visible>
+	<visible>[Player.Seeking | Player.HasPerformedSeek(3) | Player.Forwarding | Player.Rewinding | Player.Paused | Player.Caching | Player.ShowInfo | Player.ShowTime | Player.IsTempo | Player.HasSceneMarkers] + ![Window.IsVisible(VideoOSD) | Window.IsVisible(MusicOSD) | Skin.HasSetting(HideSeekBarOSD) | Window.IsActive(script.pseudotv.TVOverlay.xml) | Window.IsActive(script.pseudotv.live.TVOverlay.xml)]</visible>
 	<depth>DepthOSD</depth>
 
 	<controls>

diff --git a/720p/DialogSettings.xml b/720p/DialogSettings.xml
@@ -11,7 +11,7 @@
 		<control type="group">
 			<visible>![[Window.Is(osdaudiosettings) | Window.Is(osdvideosettings)] + [Window.IsActive(SliderDialog) | Window.IsActive(DialogSelect.xml)]]</visible>
 			<visible>![[Window.IsActive(MyPVRTimers.xml) | Window.Is(contentsettings)] + Window.IsActive(DialogSelect.xml)]</visible>
-			<visible>![Window.Is(osdsubtitlesettings) + [Window.IsActive(subtitlesearch) | Window.IsActive(filebrowser) | Window.IsActive(sliderdialog)]]</visible>
+			<visible>![Window.Is(OSDSubtitleSettings) + [Window.IsActive(subtitlesearch) | Window.IsActive(filebrowser) | Window.IsActive(sliderdialog)]]</visible>
 			<depth>DepthOSD</depth>
 			<include>DialogOpenCloseAnim</include>
 			<animation effect="fade" start="100" end="30" time="250" condition="Window.Is(LockSettings) + [Window.IsActive(ContextMenu) | Window.IsActive(NumericInput) | Window.IsActive(OKDialog)]">Conditional</animation>
@@ -63,7 +63,7 @@
 				<width>600</width>
 				<height>4</height>
 				<texture />
-				<visible>![Window.Is(osdaudiosettings) | Window.Is(osdvideosettings) | Window.Is(osdsubtitlesettings)]</visible>
+				<visible>![Window.Is(osdaudiosettings) | Window.Is(osdvideosettings) | Window.Is(OSDSubtitleSettings)]</visible>
 			</control>
 
 			<control type="edit" id="12">