interactive progress bar

beatmasterRS · Apr 13, 2024 · ba370a6 · ba370a6
1 parent d0036a9
commit ba370a6
Show file tree

Hide file tree

Showing 79 changed files with 403 additions and 8 deletions.
diff --git a/1080i/Custom_VideoSetting.xml b/1080i/Custom_VideoSetting.xml
@@ -105,6 +105,14 @@
                     <selected>Skin.HasSetting(cutlist.markers)</selected>
                     <onclick>Skin.ToggleSetting(cutlist.markers)</onclick>
                 </control>
+                <control type="radiobutton" id="420">
+                    <description>Filter</description>
+                    <include>DefContextButtonGradient</include>
+                    <label>31723</label>
+                    <align>left</align>
+                    <selected>Skin.HasSetting(osd.seekableprogressbar)</selected>
+                    <onclick>Skin.ToggleSetting(osd.seekableprogressbar)</onclick>
+                </control>
                 <control type="radiobutton" id="84">
                     <description>Filter</description>
                     <include>DefContextButtonGradient</include>

diff --git a/1080i/Includes.xml b/1080i/Includes.xml
@@ -2989,6 +2989,17 @@
         <defaultcontrol always="false">300</defaultcontrol>
     </include>
 
+    <include name="DefSeekableProgressBarNib">
+        <bottom>2</bottom>
+        <left>0</left>
+        <width>100%</width>
+        <height>24</height>
+        <texturesliderbar colordiffuse="00FFFFFF">osd/progress-end-circle.png</texturesliderbar>
+        <textureslidernib colordiffuse="$VAR[ColorHighlight]">osd/progress-end-circle.png</textureslidernib>
+        <textureslidernibfocus colordiffuse="$VAR[ColorHighlight]">osd/progress-end-circle.png</textureslidernibfocus>
+        <visible>!String.IsEmpty(Window(home).Property(seekableprogressbarfocused))</visible>
+    </include>
+
     <include name="ProgressBar">
         <control type="ranges">
             <visible>Skin.HasSetting(cutlist.markers)</visible>
@@ -3027,6 +3038,7 @@
             <width>100%</width>
             <bottom>10</bottom>
             <height>8</height>
+            <info>Player.SeekBar</info>
             <visible>Player.Seeking</visible>
         </control>
         <control type="progress" id="404">
@@ -3047,6 +3059,21 @@
             <righttexture>osd/ch.png</righttexture>
             <info>Player.Chapters</info>
         </control>
+        <control type="slider">
+            <include>DefSeekableProgressBarNib</include>
+            <info>Player.Progress</info>
+            <visible>!Player.Seeking</visible>
+        </control>
+        <control type="slider">
+            <include>DefSeekableProgressBarNib</include>
+            <info>Player.SeekBar</info>
+            <visible>Player.Seeking</visible>
+        </control>
+        <control type="slider">
+            <include>DefSeekableProgressBarNib</include>
+            <info>PVR.EpgEventProgress</info>
+            <visible>Pvr.IsPlayingTv</visible>
+        </control>
     </include>
 
     <include name="ProgressBarInfo">
@@ -3073,7 +3100,7 @@
             <righttexture colordiffuse="Highlight2">osd/progress-end.png</righttexture>
             <visible>!Pvr.IsPlayingTv</visible>
         </control>
-        <control type="progress">
+        <control type="progress" id="23">
             <description>Progress Bar</description>
             <width>100%</width>
             <bottom>10</bottom>
@@ -3082,11 +3109,12 @@
             <visible>!Player.Seeking</visible>
             <visible>!Pvr.IsPlayingTv</visible>
         </control>
-        <control type="progress">
+        <control type="progress" id="401">
             <description>Progress Bar</description>
             <width>100%</width>
             <bottom>10</bottom>
             <height>8</height>
+            <info>Player.SeekBar</info>
             <visible>Player.Seeking</visible>
         </control>
         <control type="progress">
@@ -3107,6 +3135,21 @@
             <righttexture>osd/ch.png</righttexture>
             <info>Player.Chapters</info>
         </control>
+        <control type="slider">
+            <include>DefSeekableProgressBarNib</include>
+            <info>Player.Progress</info>
+            <visible>!Player.Seeking</visible>
+        </control>
+        <control type="slider">
+            <include>DefSeekableProgressBarNib</include>
+            <info>Player.SeekBar</info>
+            <visible>Player.Seeking</visible>
+        </control>
+        <control type="slider">
+            <include>DefSeekableProgressBarNib</include>
+            <info>PVR.EpgEventProgress</info>
+            <visible>Pvr.IsPlayingTv</visible>
+        </control>
     </include>
 
     <!-- Code from https://github.com/jurialmunkey/skin.arctic.zephyr.2/ -->

diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
@@ -859,8 +859,30 @@
 
             <!-- WENN PVR NIIIICHT läuft-->
             <visible>!VideoPlayer.Content(LiveTV)</visible>
+            <control type="label">
+                <visible>Player.Seeking</visible>
+                <left>0</left>
+                <include content="def_width" condition="Skin.HasSetting(ClockOSD) + !Skin.HasSetting(osd.usethemeNewOSD)">
+                    <param name="width" value="1140" />
+                </include>
+                <include content="def_width" condition="Skin.HasSetting(ClockOSD) + Skin.HasSetting(osd.usethemeNewOSD)">
+                    <param name="width" value="970" />
+                </include>
+                <include content="def_width" condition="!Skin.HasSetting(osd.usethemeNewOSD)">
+                    <param name="width" value="940" />
+                </include>
+                <include content="def_width" condition="Skin.HasSetting(osd.usethemeNewOSD)">
+                    <param name="width" value="770" />
+                </include>
+                <width>940</width>
+                <bottom>30</bottom>
+                <height>40</height>
+                <font>Tiny</font>
+                <textcolor>$VAR[OSDPanelWhite70]</textcolor>
+                <label>$VAR[PlayerStatus]</label>
+            </control>
             <control type="fadelabel">
-                <visible>!VideoPlayer.Content(episodes)</visible>
+                <visible>!VideoPlayer.Content(episodes) + !Player.Seeking</visible>
                 <left>0</left>
                 <include content="def_width" condition="Skin.HasSetting(ClockOSD) + !Skin.HasSetting(osd.usethemeNewOSD)">
                     <param name="width" value="1140" />
@@ -888,7 +910,7 @@
                 <label>$INFO[Player.FinishTime,$LOCALIZE[31013] ]</label>
             </control>
             <control type="fadelabel">
-                <visible>VideoPlayer.Content(episodes)</visible>
+                <visible>VideoPlayer.Content(episodes) + !Player.Seeking</visible>
                 <left>0</left>
                 <include content="def_width" condition="Skin.HasSetting(ClockOSD) + !Skin.HasSetting(osd.usethemeNewOSD)">
                     <param name="width" value="1140" />
@@ -1074,8 +1096,9 @@
     </include>
 
     <include name="DefOSDUpDown">
-        <onup condition="String.IsEmpty(Window(home).Property(osdshowinfo)) + !Window.IsVisible(MusicOSD.xml)">SetProperty(osdshowinfo,1,home)</onup>
-        <onup condition="!String.IsEmpty(Window(home).Property(osdshowinfo)) + !Window.IsVisible(MusicOSD.xml)">ClearProperty(osdshowinfo,home)</onup>
+        <onup condition="Skin.HasSetting(osd.seekableprogressbar) + !Window.IsVisible(MusicOSD.xml)">2137</onup>
+        <onup condition="String.IsEmpty(Window(home).Property(osdshowinfo)) + !Skin.HasSetting(osd.seekableprogressbar) + !Window.IsVisible(MusicOSD.xml)">SetProperty(osdshowinfo,1,home)</onup>
+        <onup condition="!String.IsEmpty(Window(home).Property(osdshowinfo)) + !Skin.HasSetting(osd.seekableprogressbar) + !Window.IsVisible(MusicOSD.xml)">ClearProperty(osdshowinfo,home)</onup>
         <ondown condition="String.IsEmpty(Window(home).Property(osdshowinfo)) + !Window.IsVisible(MusicOSD.xml)">SetProperty(osdshowinfo,1,home)</ondown>
         <ondown condition="!String.IsEmpty(Window(home).Property(osdshowinfo)) + !Window.IsVisible(MusicOSD.xml)">ClearProperty(osdshowinfo,home)</ondown>
         <onup condition="Window.IsVisible(MusicOSD.xml)">9100</onup>
@@ -1093,6 +1116,21 @@
         <onfocus condition="$EXP[HasHomemenuAutoSlideOutAnimation]">CancelAlarm(slide_out,true)</onfocus>
     </include>
 
+    <include name="OSDHiddenSeekableProgressBar">
+        <control type="button" id="2137">
+            <visible>Skin.HasSetting(osd.seekableprogressbar) + !Window.IsVisible(MusicOSD.xml)</visible>
+            <include>HiddenButton</include>
+            <onup condition="String.IsEmpty(Window(home).Property(osdshowinfo)) + !Window.IsVisible(MusicOSD.xml)">SetProperty(osdshowinfo,1,home)</onup>
+            <onup condition="!String.IsEmpty(Window(home).Property(osdshowinfo)) + !Window.IsVisible(MusicOSD.xml)">ClearProperty(osdshowinfo,home)</onup>
+            <ondown>$PARAM[osdId]</ondown>
+            <onleft>StepBack</onleft>
+            <onright>StepForward</onright>
+            <onclick>PlayerControl(Play)</onclick>
+            <onfocus>SetProperty(seekableprogressbarfocused,1,home)</onfocus>
+            <onunfocus>ClearProperty(seekableprogressbarfocused,home)</onunfocus>
+        </control>
+    </include>
+
     <include name="OSDVideosRight">
         <control type="button" id="5">
             <description>3D Mode</description>
@@ -2434,7 +2472,7 @@
     <include name="OSD1">
 
         <!-- Normal -->
-        <control type="group">
+        <control type="group" id="2136">
             <height>74</height>
             <bottom>15</bottom>
             <animation type="WindowOpen">
@@ -2551,12 +2589,15 @@
                 <include condition="VideoPlayer.Content(livetv)">OSDPVRRight</include>
             </control>
         </control>
+        <include content="OSDHiddenSeekableProgressBar">
+            <param name="osdId" value="2136"/>
+        </include>
     </include>
 
     <include name="OSD2">
 
         <!-- New OSD -->
-        <control type="group">
+        <control type="group" id="2136">
             <height>74</height>
             <bottom>110</bottom>
             <animation type="WindowOpen">
@@ -2730,6 +2771,9 @@
                 <include condition="VideoPlayer.Content(livetv)">OSDPVRRightNewOSD</include>
             </control>
         </control>
+        <include content="OSDHiddenSeekableProgressBar">
+            <param name="osdId" value="2136"/>
+        </include>
     </include>
 
     <include name="OSD3">

diff --git a/language/resource.language.af_za/strings.po b/language/resource.language.af_za/strings.po
@@ -2617,6 +2617,10 @@ msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
 
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
+
 #~ msgctxt "#31722"
 #~ msgid "Extras"
 #~ msgstr "Ekstras"
diff --git a/language/resource.language.am_et/strings.po b/language/resource.language.am_et/strings.po
@@ -2616,3 +2616,7 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
diff --git a/language/resource.language.ar_sa/strings.po b/language/resource.language.ar_sa/strings.po
@@ -2616,3 +2616,7 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
diff --git a/language/resource.language.ast_es/strings.po b/language/resource.language.ast_es/strings.po
@@ -2616,3 +2616,7 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
diff --git a/language/resource.language.az_az/strings.po b/language/resource.language.az_az/strings.po
@@ -2616,3 +2616,7 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
diff --git a/language/resource.language.be_by/strings.po b/language/resource.language.be_by/strings.po
@@ -2616,3 +2616,7 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
diff --git a/language/resource.language.bg_bg/strings.po b/language/resource.language.bg_bg/strings.po
@@ -2616,3 +2616,7 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
diff --git a/language/resource.language.bs_ba/strings.po b/language/resource.language.bs_ba/strings.po
@@ -2616,3 +2616,7 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
diff --git a/language/resource.language.ca_es/strings.po b/language/resource.language.ca_es/strings.po
@@ -2617,6 +2617,10 @@ msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
 
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
+
 #~ msgctxt "#31722"
 #~ msgid "Extras"
 #~ msgstr "Extres"
diff --git a/language/resource.language.cs_cz/strings.po b/language/resource.language.cs_cz/strings.po
@@ -2617,6 +2617,10 @@ msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
 
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
+
 #~ msgctxt "#31722"
 #~ msgid "Extras"
 #~ msgstr "Extra doplňky"
diff --git a/language/resource.language.cy_gb/strings.po b/language/resource.language.cy_gb/strings.po
@@ -2616,3 +2616,7 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
diff --git a/language/resource.language.da_dk/strings.po b/language/resource.language.da_dk/strings.po
@@ -2617,6 +2617,10 @@ msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
 
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
+
 #~ msgctxt "#31719"
 #~ msgid "Add version"
 #~ msgstr "Tilføj version"

diff --git a/language/resource.language.de_de/strings.po b/language/resource.language.de_de/strings.po
@@ -2617,6 +2617,10 @@ msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
 
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
+
 #~ msgctxt "#31179"
 #~ msgid "Show clearlogo"
 #~ msgstr "Clear-Logo anzeigen"

diff --git a/language/resource.language.el_gr/strings.po b/language/resource.language.el_gr/strings.po
@@ -2616,3 +2616,7 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
diff --git a/language/resource.language.en_au/strings.po b/language/resource.language.en_au/strings.po
@@ -2617,6 +2617,10 @@ msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
 
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
+
 #~ msgctxt "Addon Summary"
 #~ msgid "Clean, minimal, elegant, simple, light. Based on the original Arctic: Zephyr skin by jurialmunkey."
 #~ msgstr "Clean, minimal, elegant, simple, light. Based on the original Arctic: Zephyr skin by jurialmunkey."

diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
@@ -2616,3 +2616,7 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
diff --git a/language/resource.language.en_nz/strings.po b/language/resource.language.en_nz/strings.po
@@ -2617,6 +2617,10 @@ msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
 
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
+
 #~ msgctxt "#31722"
 #~ msgid "Extras"
 #~ msgstr "Extras"

diff --git a/language/resource.language.en_us/strings.po b/language/resource.language.en_us/strings.po
@@ -2617,6 +2617,10 @@ msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
 
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""
+
 #~ msgctxt "Addon Summary"
 #~ msgid "Clean, minimal, elegant, simple, light. Based on the original Arctic: Zephyr skin by jurialmunkey."
 #~ msgstr "Clean, minimal, elegant, simple, light. Based on the original Arctic: Zephyr skin by jurialmunkey."

diff --git a/language/resource.language.eo/strings.po b/language/resource.language.eo/strings.po
@@ -2616,3 +2616,7 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31723"
+msgid "Interactive progress bar"
+msgstr ""