aboutsummaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorMiguel Borges de Freitas <enen92@users.noreply.github.com>2022-05-23 21:46:59 +0100
committerGitHub <noreply@github.com>2022-05-23 21:46:59 +0100
commit01dc46f11860b098caf84417747859ced7114eba (patch)
treec8604f51e7eee6689923e6b69604850b4a3e0fd4 /addons
parent586b89e18d27336402388e15377922e10a072752 (diff)
parent0cb83ba02fd0cedcb2f63f2b8fc6dc1c02515b56 (diff)
Merge pull request #21355 from enen92/estuaryautoclose
[Estuary] auto-close video OSD feature
Diffstat (limited to 'addons')
-rw-r--r--addons/skin.estuary/language/resource.language.en_gb/strings.po26
-rw-r--r--addons/skin.estuary/xml/SkinSettings.xml29
-rw-r--r--addons/skin.estuary/xml/Timers.xml11
-rw-r--r--addons/skin.estuary/xml/Variables.xml5
4 files changed, 70 insertions, 1 deletions
diff --git a/addons/skin.estuary/language/resource.language.en_gb/strings.po b/addons/skin.estuary/language/resource.language.en_gb/strings.po
index 885ee9defa..3ae40652cd 100644
--- a/addons/skin.estuary/language/resource.language.en_gb/strings.po
+++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po
@@ -814,7 +814,31 @@ msgctxt "#31169"
msgid "Artwork related settings."
msgstr ""
-#empty strings from id 31170 to 31599
+#: /xml/SkinSettings.xml
+#. Label for OSD settings category
+msgctxt "#31170"
+msgid "On screen display"
+msgstr ""
+
+#: /xml/SkinSettings.xml
+#. Helper text for the label of OSD settings category
+msgctxt "#31171"
+msgid "On screen display (OSD) related settings"
+msgstr ""
+
+#: /xml/SkinSettings.xml
+#. Setting Automatically close video OSD
+msgctxt "#31172"
+msgid "Automatically close video OSD"
+msgstr ""
+
+#: /xml/SkinSettings.xml
+#. Setting auto close time for video osd
+msgctxt "#31173"
+msgid "Video OSD autoclose time (seconds)"
+msgstr ""
+
+#empty strings from id 31174 to 31599
#: /xml/DialogPlayerProcessInfo.xml
#. Label to show the video codec name
diff --git a/addons/skin.estuary/xml/SkinSettings.xml b/addons/skin.estuary/xml/SkinSettings.xml
index 3e81afbb49..f1b620797d 100644
--- a/addons/skin.estuary/xml/SkinSettings.xml
+++ b/addons/skin.estuary/xml/SkinSettings.xml
@@ -251,6 +251,31 @@
<onclick>Skin.ToggleSetting(HomeMenuNoWeatherButton)</onclick>
</control>
</control>
+ <control type="grouplist" id="622">
+ <top>133</top>
+ <left>0</left>
+ <right>0</right>
+ <bottom>140</bottom>
+ <onleft>9000</onleft>
+ <onright>60</onright>
+ <onup>610</onup>
+ <pagecontrol>60</pagecontrol>
+ <ondown>610</ondown>
+ <visible>Container(9000).HasFocus(4)</visible>
+ <control type="radiobutton" id="623">
+ <label>$LOCALIZE[31172]</label>
+ <include>DefaultSettingButton</include>
+ <selected>Skin.HasSetting(OSDAutoClose)</selected>
+ <onclick>Skin.ToggleSetting(OSDAutoClose)</onclick>
+ </control>
+ <control type="button" id="624">
+ <label>- $LOCALIZE[31173]</label>
+ <label2>$VAR[SkinSettingOSDAutoCloseTime]</label2>
+ <include>DefaultSettingButton</include>
+ <onclick>Skin.SetNumeric(OSDAutoCloseTime)</onclick>
+ <enable>Skin.HasSetting(OSDAutoClose)</enable>
+ </control>
+ </control>
<control type="image">
<description>Dialog Header image</description>
<left>0</left>
@@ -324,6 +349,10 @@
<label>$LOCALIZE[31159]</label>
<onclick>noop</onclick>
</item>
+ <item id="4">
+ <label>$LOCALIZE[31170]</label>
+ <onclick>noop</onclick>
+ </item>
</content>
</control>
</control>
diff --git a/addons/skin.estuary/xml/Timers.xml b/addons/skin.estuary/xml/Timers.xml
new file mode 100644
index 0000000000..1633cc29f6
--- /dev/null
+++ b/addons/skin.estuary/xml/Timers.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<timers>
+ <timer>
+ <name>autoclosevideoosd</name>
+ <description>Timer to auto close the video OSD (if enabled in the skin settings)</description>
+ <start reset="true">Window.IsActive(videoosd) + Skin.HasSetting(OSDAutoClose)</start>
+ <reset>Window.IsActive(videoosd) + !System.IdleTime(1) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(autoclosevideoosd), 1)</reset>
+ <stop>!Window.IsActive(videoosd) | String.IsEmpty(Skin.String(OSDAutoCloseTime)) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(autoclosevideoosd), 4) | !String.IsEmpty(Skin.String(OSDAutoCloseTime)) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(autoclosevideoosd),Skin.Numeric(OSDAutoCloseTime))</stop>
+ <onstop>Dialog.Close(videoosd)</onstop>
+ </timer>
+</timers>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index 31a0b2a92c..d875941d08 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -288,6 +288,11 @@
<value condition="Container(9000).HasFocus(1)">$LOCALIZE[31129]</value>
<value condition="Container(9000).HasFocus(2)">$LOCALIZE[31130]</value>
<value condition="Container(9000).HasFocus(3)">$LOCALIZE[31169]</value>
+ <value condition="Container(9000).HasFocus(4)">$LOCALIZE[31171]</value>
+ </variable>
+ <variable name="SkinSettingOSDAutoCloseTime">
+ <value condition="!String.IsEmpty(Skin.String(OSDAutoCloseTime))">$INFO[Skin.String(OSDAutoCloseTime)]</value>
+ <value condition="String.IsEmpty(Skin.String(OSDAutoCloseTime))">4</value> <!-- Default value -->
</variable>
<variable name="VolumeIconVar">
<value condition="Player.Muted">dialogs/volume/mute.png</value>