Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Interactive progress bar #1074

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Interactive progress bar #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions 1080i/Custom_VideoSetting.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
47 changes: 45 additions & 2 deletions 1080i/Includes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand All @@ -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">
Expand All @@ -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>
Expand All @@ -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">
Expand All @@ -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/ -->
Expand Down
56 changes: 50 additions & 6 deletions 1080i/Includes_OSD.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
4 changes: 4 additions & 0 deletions language/resource.language.af_za/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2617,6 +2617,10 @@ msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""

#~ msgctxt "#31722"
#~ msgid "Extras"
#~ msgstr "Ekstras"
4 changes: 4 additions & 0 deletions language/resource.language.am_et/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,3 +2616,7 @@ msgstr ""
msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""
4 changes: 4 additions & 0 deletions language/resource.language.ar_sa/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,3 +2616,7 @@ msgstr ""
msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""
4 changes: 4 additions & 0 deletions language/resource.language.ast_es/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,3 +2616,7 @@ msgstr ""
msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""
4 changes: 4 additions & 0 deletions language/resource.language.az_az/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,3 +2616,7 @@ msgstr ""
msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""
4 changes: 4 additions & 0 deletions language/resource.language.be_by/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,3 +2616,7 @@ msgstr ""
msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""
4 changes: 4 additions & 0 deletions language/resource.language.bg_bg/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,3 +2616,7 @@ msgstr ""
msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""
4 changes: 4 additions & 0 deletions language/resource.language.bs_ba/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,3 +2616,7 @@ msgstr ""
msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""
4 changes: 4 additions & 0 deletions language/resource.language.ca_es/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2617,6 +2617,10 @@ msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""

#~ msgctxt "#31722"
#~ msgid "Extras"
#~ msgstr "Extres"
4 changes: 4 additions & 0 deletions language/resource.language.cs_cz/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 4 additions & 0 deletions language/resource.language.cy_gb/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,3 +2616,7 @@ msgstr ""
msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""
4 changes: 4 additions & 0 deletions language/resource.language.da_dk/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions language/resource.language.de_de/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions language/resource.language.el_gr/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,3 +2616,7 @@ msgstr ""
msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""
4 changes: 4 additions & 0 deletions language/resource.language.en_au/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
4 changes: 4 additions & 0 deletions language/resource.language.en_gb/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,3 +2616,7 @@ msgstr ""
msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""
4 changes: 4 additions & 0 deletions language/resource.language.en_nz/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2617,6 +2617,10 @@ msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""

#~ msgctxt "#31722"
#~ msgid "Extras"
#~ msgstr "Extras"
Expand Down
4 changes: 4 additions & 0 deletions language/resource.language.en_us/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
4 changes: 4 additions & 0 deletions language/resource.language.eo/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,3 +2616,7 @@ msgstr ""
msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""

msgctxt "#31723"
msgid "Interactive progress bar"
msgstr ""
Loading