aboutsummaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorGarrett Brown <themagnificentmrb@gmail.com>2017-09-02 09:36:13 -0700
committerGarrett Brown <themagnificentmrb@gmail.com>2017-09-27 11:34:53 -0700
commitab37bb9bb3d5b3e62d18a80bc07c3e6cfce41b23 (patch)
tree3ad638422e67edc0c26d31c2fd92934f0e83cf41 /addons
parent7b51786ff3a48514d9ed4bdf5532c66ad52e12ba (diff)
Add Volume setting to Game OSD
Diffstat (limited to 'addons')
-rw-r--r--addons/resource.language.en_gb/resources/strings.po2
-rw-r--r--addons/skin.estuary/xml/Custom_1101_SettingsList.xml8
-rw-r--r--addons/skin.estuary/xml/DialogVolumeBar.xml2
3 files changed, 11 insertions, 1 deletions
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 3d506247b9..52d36d5cc9 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -6452,6 +6452,8 @@ msgctxt "#13375"
msgid "Enable device"
msgstr ""
+#: addons/skin.estuary/xml/Custom_1101_SettingsList.xml
+#: xbmc/games/dialogs/osd/DialogGameVolume.cpp
msgctxt "#13376"
msgid "Volume"
msgstr ""
diff --git a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml
index de72aa7d49..2d01af7718 100644
--- a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml
+++ b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml
@@ -160,6 +160,14 @@
<label>$LOCALIZE[629]</label>
<onclick>ActivateWindow(GameViewMode)</onclick>
</control>
+ <control type="button" id="14104">
+ <description>Volume button</description>
+ <width>700</width>
+ <include>DialogSettingButton</include>
+ <label>$LOCALIZE[13376]</label>
+ <label2>[COLOR grey]Select + Right Stick[/COLOR]</label2>
+ <onclick>ActivateWindow(GameVolume)</onclick>
+ </control>
<control type="button" id="14103">
<description>Input settings button</description>
<width>700</width>
diff --git a/addons/skin.estuary/xml/DialogVolumeBar.xml b/addons/skin.estuary/xml/DialogVolumeBar.xml
index f605285c90..2ac0aa6e0b 100644
--- a/addons/skin.estuary/xml/DialogVolumeBar.xml
+++ b/addons/skin.estuary/xml/DialogVolumeBar.xml
@@ -3,7 +3,7 @@
<zorder>4</zorder>
<controls>
<control type="group">
- <visible>!Window.IsActive(startup)</visible>
+ <visible>!Window.IsActive(startup) + !Window.IsActive(GameVolume)</visible>
<centerleft>50%</centerleft>
<width>112</width>
<top>0</top>