summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorronso0 <ronso0@mixxx.org>2020-11-03 11:07:13 +0100
committerronso0 <ronso0@mixxx.org>2020-11-04 22:17:36 +0100
commita94918f4dd04c677a34c8dffe577c47acceeacfe (patch)
treedf194e03229ef30f979cb0fb470c7d0b4d6ffa13 /res
parent2b0f0fe5228f7db2397a7db73167dfef9ec034b3 (diff)
LateNight: Master > Main
Diffstat (limited to 'res')
-rw-r--r--res/skins/LateNight/mixer.xml4
-rw-r--r--res/skins/LateNight/mixer/mixer_main_headphone.xml (renamed from res/skins/LateNight/mixer/mixer_master_headphone.xml)2
-rw-r--r--res/skins/LateNight/skin.xml2
-rw-r--r--res/skins/LateNight/skin_settings.xml4
4 files changed, 6 insertions, 6 deletions
diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml
index aa35146118..cda2293b97 100644
--- a/res/skins/LateNight/mixer.xml
+++ b/res/skins/LateNight/mixer.xml
@@ -21,12 +21,12 @@
<Template src="skin:/mixer/mixer_4decks.xml"/>
</Children>
<Connection>
- <ConfigKey persist="true">[Skin],show_master_head_mixer</ConfigKey>
+ <ConfigKey persist="true">[Skin],show_main_head_mixer</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</WidgetGroup>
- <Template src="skin:/mixer/mixer_master_headphone.xml"/>
+ <Template src="skin:/mixer/mixer_main_headphone.xml"/>
</Children>
</WidgetGroup><!-- MixerContainer -->
diff --git a/res/skins/LateNight/mixer/mixer_master_headphone.xml b/res/skins/LateNight/mixer/mixer_main_headphone.xml
index a133b8eefb..fb86ce127a 100644
--- a/res/skins/LateNight/mixer/mixer_master_headphone.xml
+++ b/res/skins/LateNight/mixer/mixer_main_headphone.xml
@@ -286,7 +286,7 @@
</Children>
<Connection>
- <ConfigKey persist="true">[Skin],show_master_head_mixer</ConfigKey>
+ <ConfigKey persist="true">[Skin],show_main_head_mixer</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index 965e57594a..a668ad00cc 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -72,7 +72,7 @@
<!-- Mixer -->
<attribute persist="true" config_key="[Master],show_mixer">1</attribute>
- <attribute persist="true" config_key="[Skin],show_master_head_mixer">1</attribute>
+ <attribute persist="true" config_key="[Skin],show_main_head_mixer">1</attribute>
<attribute persist="true" config_key="[Skin],show_eq_knobs">1</attribute>
<attribute persist="true" config_key="[Skin],show_eq_kill_buttons">1</attribute>
<attribute persist="true" config_key="[Skin],show_xfader">1</attribute>
diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml
index cb4bb53ace..f19816163e 100644
--- a/res/skins/LateNight/skin_settings.xml
+++ b/res/skins/LateNight/skin_settings.xml
@@ -555,8 +555,8 @@ Description:
<Children>
<Template src="skin:/helpers/skin_settings_button_2state.xml">
- <SetVariable name="Text">Master / Headphone Mixer</SetVariable>
- <SetVariable name="Setting">[Skin],show_master_head_mixer</SetVariable>
+ <SetVariable name="Text">Main / Headphone Mixer</SetVariable>
+ <SetVariable name="Setting">[Skin],show_main_head_mixer</SetVariable>
</Template>
<Template src="skin:/helpers/skin_settings_button_2state.xml">