diff options
| author | tamland <thomas.amland@gmail.com> | 2018-02-19 16:58:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 16:58:01 +0100 |
| commit | 313d88b0a820e13c8453603aa22ca139ea0bc261 (patch) | |
| tree | d1295b7500b0c2876e2dc6f7c24361e2f88aa4be /addons/skin.estuary | |
| parent | 0b5259120082fa6f5f0b0080a2af22c4437cb9e4 (diff) | |
| parent | cb59f6d52925fc263e3d4ebc006169d0dad781d8 (diff) | |
Merge pull request #13525 from tamland/subtitle_dialog
Consolidate subtitle dialogs
Diffstat (limited to 'addons/skin.estuary')
| -rw-r--r-- | addons/skin.estuary/language/resource.language.en_gb/strings.po | 5 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/Custom_1101_SettingsList.xml | 50 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/VideoOSD.xml | 4 |
3 files changed, 8 insertions, 51 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 314854acc8..1cc02165cb 100644 --- a/addons/skin.estuary/language/resource.language.en_gb/strings.po +++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po @@ -259,10 +259,7 @@ msgctxt "#31050" msgid "Press [B]OK[/B] to stop" msgstr "" -#: /xml/VideoOSD.xml -msgctxt "#31051" -msgid "Toggle language" -msgstr "" +#empty string with id 31051 #: /xml/Includes.xml msgctxt "#31052" diff --git a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml index c0dbfd133a..eb2fef4b62 100644 --- a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml +++ b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml @@ -33,6 +33,12 @@ <label>$LOCALIZE[13396]</label> <onclick>ActivateWindow(osdaudiosettings)</onclick> </control> + <control type="button" id="11106"> + <width>700</width> + <include>DialogSettingButton</include> + <label>$LOCALIZE[24133]</label> + <onclick>ActivateWindow(osdsubtitlesettings)</onclick> + </control> <control type="button" id="11102"> <width>700</width> <include>DialogSettingButton</include> @@ -68,50 +74,6 @@ <visible>Player.HasPrograms</visible> </control> </control> - <control type="grouplist" id="12100"> - <visible>String.IsEqual(window(home).Property(settingslist_content),subtitle)</visible> - <width>700</width> - <height>360</height> - <itemgap>0</itemgap> - <onup>12100</onup> - <ondown>12100</ondown> - <orientation>vertical</orientation> - <control type="radiobutton" id="12104"> - <width>700</width> - <include>DialogSettingButton</include> - <label>$LOCALIZE[449]</label> - <radioposx>590</radioposx> - <onclick>ShowSubtitles</onclick> - <selected>VideoPlayer.SubtitlesEnabled + VideoPlayer.HasSubtitles</selected> - <enable>VideoPlayer.HasSubtitles</enable> - </control> - <control type="button" id="12101"> - <description>Download with Subtitles script</description> - <width>700</width> - <label>33003</label> - <include>DialogSettingButton</include> - <onclick>Close</onclick> - <onclick>Dialog.Close(VideoOSD)</onclick> - <onclick>ActivateWindow(SubtitleSearch)</onclick> - <enable>!VideoPlayer.Content(LiveTV)</enable> - </control> - <control type="button" id="12102"> - <width>700</width> - <include>DialogSettingButton</include> - <label>$LOCALIZE[22006]</label> - <label2>$INFO[Player.SubtitleDelay,[B],[/B]]</label2> - <onclick>SubtitleDelay</onclick> - <enable>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</enable> - </control> - <control type="button" id="12103"> - <width>700</width> - <include>DialogSettingButton</include> - <label>$LOCALIZE[31051]</label> - <label2>$INFO[VideoPlayer.SubtitlesLanguage,[B],[/B]]</label2> - <onclick>CycleSubtitle</onclick> - <enable>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</enable> - </control> - </control> <control type="grouplist" id="13100"> <visible>String.IsEqual(window(home).Property(settingslist_content),3d)</visible> <width>700</width> diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml index 66e24c6c9a..7b59b8c2cd 100644 --- a/addons/skin.estuary/xml/VideoOSD.xml +++ b/addons/skin.estuary/xml/VideoOSD.xml @@ -161,9 +161,7 @@ <include content="OSDButton"> <param name="texture" value="osd/fullscreen/buttons/settings-subtitle.png"/> </include> - <onclick>SetProperty(settingslist_content,subtitle,home)</onclick> - <onclick>SetProperty(settingslist_header,$LOCALIZE[24012],home)</onclick> - <onclick>ActivateWindow(1101)</onclick> + <onclick>ActivateWindow(osdsubtitlesettings)</onclick> <visible>!VideoPlayer.Content(LiveTV) | VideoPlayer.HasSubtitles</visible> </control> <control type="radiobutton" id="255"> |