Adjust now playing dialogs

- remove "/" when there's no finish playback duration - adjust video now playing dialog outside of player (similar to audio now playing dialog)
osmc · May 10, 2018 · a926893 · a926893
1 parent 0ab718d
commit a926893
Show file tree

Hide file tree

Showing 7 changed files with 255 additions and 97 deletions.
diff --git a/16x9/DialogFullScreenInfo.xml b/16x9/DialogFullScreenInfo.xml
@@ -82,7 +82,7 @@
 					<height>30</height>
 					<font>Font27</font>
 					<textcolor>DialogColor1</textcolor>
-					<label>$VAR[VideoPlayerAudioCodec,[LIGHT]$LOCALIZE[460]:[/LIGHT] , ]$VAR[VideoPlayerAudioChannels,,$COMMA ]$INFO[VideoPlayer.AudioLanguage,[UPPERCASE],[/UPPERCASE]]$INFO[VideoPlayer.SubtitlesLanguage,   [LIGHT]$LOCALIZE[462]:[/LIGHT] [UPPERCASE],[/UPPERCASE]]</label>
+					<label>$VAR[VideoPlayerAudioCodec,[LIGHT]$LOCALIZE[460]:[/LIGHT] , ]$VAR[VideoPlayerAudioChannels,,]$INFO[VideoPlayer.AudioLanguage,$COMMA [UPPERCASE],[/UPPERCASE]]$INFO[VideoPlayer.SubtitlesLanguage,   [LIGHT]$LOCALIZE[462]:[/LIGHT] [UPPERCASE],[/UPPERCASE]]</label>
 				</control>
 
 				<!-- Icon -->
@@ -234,7 +234,7 @@
 						<height>60</height>
 						<font>Font27</font>
 						<textcolor>DialogColor2</textcolor>
-						<label>$INFO[Player.Time] / $INFO[Player.Duration]</label>
+						<label>$INFO[Player.Time]$INFO[Player.Duration, / ,]</label>
 					</control>
 
 					<!--  Progress bar -->
@@ -273,7 +273,8 @@
 						<align>right</align>
 						<font>Font27</font>
 						<textcolor>DialogColor2</textcolor>
-						<label>$INFO[System.Time,$LOCALIZE[142] , / ]$INFO[Player.FinishTime,$LOCALIZE[19081] ]</label>
+						<label>$INFO[System.Time,$LOCALIZE[142] ,]$INFO[Player.FinishTime, / $LOCALIZE[19081] ,]</label>
+						<visible>Integer.IsGreater(Player.Duration,0)</visible> 
 					</control>
 
 				</control>

diff --git a/16x9/DialogPlayerProcessInfo.xml b/16x9/DialogPlayerProcessInfo.xml
@@ -273,7 +273,7 @@
 						<height>60</height>
 						<font>Font27</font>
 						<textcolor>DialogColor2</textcolor>
-						<label>$INFO[Player.Time] / $INFO[Player.Duration]</label>
+						<label>$INFO[Player.Time]$INFO[Player.Duration, / ,]</label>
 					</control>
 
 					<!--  Progress bar -->
@@ -312,7 +312,8 @@
 						<align>right</align>
 						<font>Font27</font>
 						<textcolor>DialogColor2</textcolor>
-						<label>$INFO[System.Time,$LOCALIZE[142] , / ]$INFO[Player.FinishTime,$LOCALIZE[19081] ]</label>
+						<label>$INFO[System.Time,$LOCALIZE[142] ,]$INFO[Player.FinishTime, / $LOCALIZE[19081] ,]</label>
+						<visible>Integer.IsGreater(Player.Duration,0)</visible> 
 					</control>
 
 				</control>

diff --git a/16x9/DialogSeekBar.xml b/16x9/DialogSeekBar.xml
@@ -121,7 +121,7 @@
 				<height>60</height>
 				<font>Font27</font>
 				<textcolor>DialogColor2</textcolor>
-				<label>$INFO[Player.Time] / $INFO[Player.Duration]</label>
+				<label>$INFO[Player.Time]$INFO[Player.Duration, / ,]</label>
 			</control>
 
 			<!--  Progress bar -->
@@ -160,7 +160,8 @@
 				<align>right</align>
 				<font>Font27</font>
 				<textcolor>DialogColor2</textcolor>
-				<label>$INFO[System.Time,$LOCALIZE[142] , / ]$INFO[Player.FinishTime,$LOCALIZE[19081] ]</label>
+				<label>$INFO[System.Time,$LOCALIZE[142] ,]$INFO[Player.FinishTime, / $LOCALIZE[19081] ,]</label>
+				<visible>Integer.IsGreater(Player.Duration,0)</visible> 
 			</control>
 
 		</control>

diff --git a/16x9/Includes.xml b/16x9/Includes.xml
@@ -189,21 +189,228 @@
 					<visible>Player.HasMedia</visible>
 
 					<!-- Now Playing - Video -->
-					<control type="fadelabel">
-						<right>170</right>
-						<top>93</top>
-						<width>1400</width>
-						<height>33</height>
-						<aligny>top</aligny>
-						<align>right</align>
-						<label>$INFO[VideoPlayer.TVShowTitle]</label>
-						<label>$INFO[VideoPlayer.ChannelNumber,[LIGHT](,)[/LIGHT] ]$INFO[VideoPlayer.ChannelName]</label>
-						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[VideoPlayer.Title]</label>
-						<label>$INFO[VideoPlayer.EpisodeName]</label>
-						<label>$INFO[System.Time,[LIGHT]$LOCALIZE[142] [/LIGHT], / ]$INFO[Player.FinishTime,[LIGHT]$LOCALIZE[19081]: [/LIGHT]]</label>
-						<visible>Player.HasVideo</visible>
-						<pauseatend>5000</pauseatend>
+					<control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.TVShowTitle]</label> 
+						<label>$INFO[VideoPlayer.ChannelNumber,[LIGHT](,)[/LIGHT] ]$INFO[VideoPlayer.ChannelName]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[VideoPlayer.Title]</label> 
+						<label>$INFO[VideoPlayer.EpisodeName]</label> 
+						<label>$INFO[System.Time,[LIGHT]$LOCALIZE[142] [/LIGHT], / ]$INFO[Player.FinishTime,[LIGHT]$LOCALIZE[19081]: [/LIGHT]]</label> 
+						<visible>Player.HasVideo + !String.IsEmpty(VideoPlayer.EpisodeName) + !String.IsEmpty(VideoPlayer.TVShowTitle) + [!String.IsEmpty(VideoPlayer.ChannelNumberLabel) + !String.IsEmpty(VideoPlayer.ChannelName)] + Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
 					</control>
+
+					<control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.TVShowTitle]</label> 
+						<label>$INFO[VideoPlayer.ChannelNumberLabel,[LIGHT](,)[/LIGHT] ]$INFO[VideoPlayer.ChannelName]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<label>$INFO[System.Time,[LIGHT]$LOCALIZE[142] [/LIGHT], / ]$INFO[Player.FinishTime,[LIGHT]$LOCALIZE[19081]: [/LIGHT]]</label> 
+						<visible>Player.HasVideo + String.IsEmpty(VideoPlayer.EpisodeName) + !String.IsEmpty(VideoPlayer.TVShowTitle) + [!String.IsEmpty(VideoPlayer.ChannelNumberLabel) + !String.IsEmpty(VideoPlayer.ChannelName)] + Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.ChannelNumberLabel,[LIGHT](,)[/LIGHT] ]$INFO[VideoPlayer.ChannelName]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<label>$INFO[System.Time,[LIGHT]$LOCALIZE[142] [/LIGHT], / ]$INFO[Player.FinishTime,[LIGHT]$LOCALIZE[19081]: [/LIGHT]]</label> 
+						<visible>Player.HasVideo + String.IsEmpty(VideoPlayer.EpisodeName) + String.IsEmpty(VideoPlayer.TVShowTitle) + [!String.IsEmpty(VideoPlayer.ChannelNumberLabel) + !String.IsEmpty(VideoPlayer.ChannelName)] + Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.ChannelNumberLabel,[LIGHT](,)[/LIGHT] ]$INFO[VideoPlayer.ChannelName]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<label>$INFO[VideoPlayer.EpisodeName]</label> 
+						<label>$INFO[System.Time,[LIGHT]$LOCALIZE[142] [/LIGHT], / ]$INFO[Player.FinishTime,[LIGHT]$LOCALIZE[19081]: [/LIGHT]]</label> 
+						<visible>Player.HasVideo + !String.IsEmpty(VideoPlayer.EpisodeName) + String.IsEmpty(VideoPlayer.TVShowTitle) + [!String.IsEmpty(VideoPlayer.ChannelNumberLabel) + !String.IsEmpty(VideoPlayer.ChannelName)] + Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<label>$INFO[VideoPlayer.EpisodeName]</label> 
+						<label>$INFO[System.Time,[LIGHT]$LOCALIZE[142] [/LIGHT], / ]$INFO[Player.FinishTime,[LIGHT]$LOCALIZE[19081]: [/LIGHT]]</label> 
+						<visible>Player.HasVideo + !String.IsEmpty(VideoPlayer.EpisodeName) + String.IsEmpty(VideoPlayer.TVShowTitle) + [String.IsEmpty(VideoPlayer.ChannelNumberLabel) + String.IsEmpty(VideoPlayer.ChannelName)] + Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.TVShowTitle]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<label>$INFO[VideoPlayer.EpisodeName]</label> 
+						<label>$INFO[System.Time,[LIGHT]$LOCALIZE[142] [/LIGHT], / ]$INFO[Player.FinishTime,[LIGHT]$LOCALIZE[19081]: [/LIGHT]]</label> 
+						<visible>Player.HasVideo + !String.IsEmpty(VideoPlayer.EpisodeName) + !String.IsEmpty(VideoPlayer.TVShowTitle) + [String.IsEmpty(VideoPlayer.ChannelNumberLabel) + String.IsEmpty(VideoPlayer.ChannelName)] + Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.TVShowTitle]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<label>$INFO[System.Time,[LIGHT]$LOCALIZE[142] [/LIGHT], / ]$INFO[Player.FinishTime,[LIGHT]$LOCALIZE[19081]: [/LIGHT]]</label> 
+						<visible>Player.HasVideo + String.IsEmpty(VideoPlayer.EpisodeName) + !String.IsEmpty(VideoPlayer.TVShowTitle) + [String.IsEmpty(VideoPlayer.ChannelNumberLabel) + String.IsEmpty(VideoPlayer.ChannelName)] + Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<label>$INFO[System.Time,[LIGHT]$LOCALIZE[142] [/LIGHT], / ]$INFO[Player.FinishTime,[LIGHT]$LOCALIZE[19081]: [/LIGHT]]</label> 
+						<visible>Player.HasVideo + String.IsEmpty(VideoPlayer.EpisodeName) + String.IsEmpty(VideoPlayer.TVShowTitle) + [String.IsEmpty(VideoPlayer.ChannelNumberLabel) + String.IsEmpty(VideoPlayer.ChannelName)] + Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.TVShowTitle]</label> 
+						<label>$INFO[VideoPlayer.ChannelNumberLabel,[LIGHT](,)[/LIGHT] ]$INFO[VideoPlayer.ChannelName]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<label>$INFO[VideoPlayer.EpisodeName]</label> 
+						<visible>Player.HasVideo + !String.IsEmpty(VideoPlayer.EpisodeName) + !String.IsEmpty(VideoPlayer.TVShowTitle) + [!String.IsEmpty(VideoPlayer.ChannelNumberLabel) + !String.IsEmpty(VideoPlayer.ChannelName)] + !Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.TVShowTitle]</label> 
+						<label>$INFO[VideoPlayer.ChannelNumberLabel,[LIGHT](,)[/LIGHT] ]$INFO[VideoPlayer.ChannelName]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<visible>Player.HasVideo + String.IsEmpty(VideoPlayer.EpisodeName) + !String.IsEmpty(VideoPlayer.TVShowTitle) + [!String.IsEmpty(VideoPlayer.ChannelNumberLabel) + !String.IsEmpty(VideoPlayer.ChannelName)] + !Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.ChannelNumberLabel,[LIGHT](,)[/LIGHT] ]$INFO[VideoPlayer.ChannelName]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<visible>Player.HasVideo + String.IsEmpty(VideoPlayer.EpisodeName) + String.IsEmpty(VideoPlayer.TVShowTitle) + [!String.IsEmpty(VideoPlayer.ChannelNumberLabel) + !String.IsEmpty(VideoPlayer.ChannelName)] + !Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.ChannelNumberLabel,[LIGHT](,)[/LIGHT] ]$INFO[VideoPlayer.ChannelName]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<label>$INFO[VideoPlayer.EpisodeName]</label> 
+						<visible>Player.HasVideo + !String.IsEmpty(VideoPlayer.EpisodeName) + String.IsEmpty(VideoPlayer.TVShowTitle) + [!String.IsEmpty(VideoPlayer.ChannelNumberLabel) + !String.IsEmpty(VideoPlayer.ChannelName)] + !Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<label>$INFO[VideoPlayer.EpisodeName]</label> 
+						<visible>Player.HasVideo + !String.IsEmpty(VideoPlayer.EpisodeName) + String.IsEmpty(VideoPlayer.TVShowTitle) + [String.IsEmpty(VideoPlayer.ChannelNumberLabel) + String.IsEmpty(VideoPlayer.ChannelName)] + !Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.TVShowTitle]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<label>$INFO[VideoPlayer.EpisodeName]</label> 
+						<visible>Player.HasVideo + !String.IsEmpty(VideoPlayer.EpisodeName) + !String.IsEmpty(VideoPlayer.TVShowTitle) + [String.IsEmpty(VideoPlayer.ChannelNumberLabel) + String.IsEmpty(VideoPlayer.ChannelName)] + !Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$INFO[VideoPlayer.TVShowTitle]</label> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<visible>Player.HasVideo + String.IsEmpty(VideoPlayer.EpisodeName) + !String.IsEmpty(VideoPlayer.TVShowTitle) + [String.IsEmpty(VideoPlayer.ChannelNumberLabel) + String.IsEmpty(VideoPlayer.ChannelName)] + !Integer.IsGreater(Player.Duration,0)</visible> 
+						<pauseatend>5000</pauseatend> 
+				  </control> 
+
+				  <control type="fadelabel"> 
+						<right>170</right> 
+						<top>93</top> 
+						<width>1400</width> 
+						<height>33</height> 
+						<aligny>top</aligny> 
+						<align>right</align> 
+						<label>$VAR[SEplaying,[LIGHT],[/LIGHT] ]$INFO[Player.Title]</label> 
+						<visible>Player.HasVideo + String.IsEmpty(VideoPlayer.EpisodeName) + String.IsEmpty(VideoPlayer.TVShowTitle) + [String.IsEmpty(VideoPlayer.ChannelNumberLabel) + String.IsEmpty(VideoPlayer.ChannelName)] + !Integer.IsGreater(Player.Duration,0)</visible> 
+					</control> 
 
 					<!-- Now Playing - Audio -->
 					<control type="fadelabel">
@@ -323,9 +530,23 @@
 						<label>$INFO[Player.Title]</label>
 						<label>$INFO[VideoPlayer.ChannelNumber,[LIGHT](,)[/LIGHT] ]$INFO[VideoPlayer.ChannelName]</label>
 						<label>$INFO[System.Time,[LIGHT]$LOCALIZE[142] [/LIGHT], / ]$INFO[Player.FinishTime,[LIGHT]$LOCALIZE[19081]: [/LIGHT]]</label>
-						<visible>Player.HasAudio + !String.IsEmpty(VideoPlayer.ChannelName)</visible>
+						<visible>Player.HasAudio + !String.IsEmpty(VideoPlayer.ChannelName) + Integer.IsGreater(Player.Duration,0)</visible>
 						<pauseatend>5000</pauseatend>
 					</control>
+
+					<control type="fadelabel">
+						<right>170</right>
+						<top>93</top>
+						<width>1400</width>
+						<height>33</height>
+						<aligny>top</aligny>
+						<align>right</align>
+						<label>$INFO[Player.Title]</label>
+						<label>$INFO[VideoPlayer.ChannelNumber,[LIGHT](,)[/LIGHT] ]$INFO[VideoPlayer.ChannelName]</label>
+						<visible>Player.HasAudio + !String.IsEmpty(VideoPlayer.ChannelName) + !Integer.IsGreater(Player.Duration,0)</visible>
+						<pauseatend>5000</pauseatend>
+					</control>
+
 
 					<!-- Now Playing - Progress -->
 					<control type="label">

diff --git a/16x9/MusicVisualisation.xml b/16x9/MusicVisualisation.xml
@@ -217,18 +217,7 @@
 					<height>60</height>
 					<font>Font27</font>
 					<textcolor>DialogColor2</textcolor>
-					<label>$INFO[Player.Time] / $INFO[Player.Duration]</label>
-					<visible>Player.HasDuration</visible>
-				</control>
-
-				<control type="label">
-					<left>20</left>
-					<width>260</width>
-					<height>60</height>
-					<font>Font27</font>
-					<textcolor>DialogColor2</textcolor>
-					<label>$INFO[Player.Time]</label>
-					<visible>!Player.HasDuration</visible>
+					<label>$INFO[Player.Time]$INFO[Player.Duration, / ,]</label>
 				</control>
 
 				<!--  Progress bar -->
@@ -267,19 +256,8 @@
 					<align>right</align>
 					<font>Font27</font>
 					<textcolor>DialogColor2</textcolor>
-					<label>$INFO[System.Time,$LOCALIZE[142] , / ]$INFO[Player.FinishTime,$LOCALIZE[19081] ]</label>
-					<visible>Player.HasDuration</visible>
-				</control>
-
-				<control type="label">
-					<left>1001</left>
-					<width>600</width>
-					<height>60</height>
-					<align>right</align>
-					<font>Font27</font>
-					<textcolor>DialogColor2</textcolor>
-					<label>$INFO[System.Time,$LOCALIZE[142] ,]</label>
-					<visible>!Player.HasDuration</visible>
+					<label>$INFO[System.Time,$LOCALIZE[142] ,]$INFO[Player.FinishTime, / $LOCALIZE[19081] ,]</label>
+					<visible>Integer.IsGreater(Player.Duration,0)</visible>
 				</control>
 
 			</control>