Skip to content

Commit 29c27ef

Browse files
committed
simplified config item
1 parent d5e435e commit 29c27ef

3 files changed

Lines changed: 13 additions & 25 deletions

File tree

res/skins/LateNight/decks/deck_full.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
<Template src="skins:LateNight/decks/row_5_transportLoopJump.xml" />
5757
</Children>
5858
<Connection>
59-
<ConfigKey>[Channel<Variable name="ChanNum"/>],passthrough</ConfigKey>
59+
<ConfigKey persist="true">[Channel<Variable name="ChanNum"/>],passthrough</ConfigKey>
60+
<!-- <ConfigKey persist="true">[Skin],latenight_minimize_on_passthrough</ConfigKey> -->
6061
<Transform><Not/></Transform>
6162
<BindProperty>visible</BindProperty>
6263
</Connection>
@@ -76,15 +77,17 @@
7677
<!-- this is sized and styled in css -->
7778
<Connection>
7879
<ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
79-
<Transform><Not/></Transform>
8080
<BindProperty>visible</BindProperty>
8181
</Connection>
8282
</WidgetGroup>
8383
<Template src="skins:LateNight/decks/rate_controls.xml"/>
8484
</Children>
8585
<Connection>
86-
<ConfigKey>[Channel<Variable name="ChanNum"/>],passthrough</ConfigKey>
87-
<Transform><Not/></Transform>
86+
<ConfigKey persist="true">[Channel<Variable name="ChanNum"/>],passthrough</ConfigKey>
87+
<!-- <ConfigKey
88+
persist="true">[Skin],latenight_minimize_on_passthrough</ConfigKey>
89+
-->
90+
<Transform><Not/></Transform>
8891
<BindProperty>visible</BindProperty>
8992
</Connection>
9093
</WidgetGroup>

res/skins/LateNight/helpers/skin_settings_full_deck.xml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -128,26 +128,11 @@ Description:
128128
<Template src="skins:LateNight/helpers/skin_settings_cover_inverted.xml">
129129
<SetVariable name="Setting">[Skin],show_vinylcontrol</SetVariable>
130130
</Template>
131-
<PushButton>
132-
<Tooltip>Minimize decks on vinyl passthrough mode</Tooltip>
133-
<ObjectName>SkinSettingsButton</ObjectName>
134-
<Size>180me,18f</Size>
135-
<NumberStates>2</NumberStates>
136-
<State>
137-
<Number>0</Number>
138-
<Text>&#8202;&#8202;&#9744; Minimize decks on passthrough</Text>
139-
<Alignment>left</Alignment>
140-
</State>
141-
<State>
142-
<Number>1</Number>
143-
<Text>&#8202;&#8202;&#8202;&#10004;&#8202;&#8202; Minimize decks on passthrough</Text>
144-
<Alignment>left</Alignment>
145-
</State>
146-
<Connection>
147-
<ConfigKey persist="true">[Master],latenight_minimize_on_passthrough</ConfigKey>
148-
<ButtonState>LeftButton</ButtonState>
149-
</Connection>
150-
</PushButton>
131+
<Template src="skins:LateNight/helpers/skin_settings_button_2state.xml">
132+
<SetVariable name="TooltipId">minimize_on_passthrough</SetVariable>
133+
<SetVariable name="Text">Minimize decks on passthrough</SetVariable>
134+
<SetVariable name="Setting">[Skin],latenight_minimize_on_passthrough</SetVariable>
135+
</Template>
151136
</Children>
152137
</WidgetGroup>
153138

res/skins/LateNight/skin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<attribute persist="true" config_key="[Skin],select_big_spinny_or_cover">0</attribute>
5959
<!-- ToDo: deck-independent vinyl controls? -->
6060
<attribute persist="true" config_key="[Skin],show_vinylcontrol">0</attribute>
61-
<attribute persist="true" config_key="[Master],latenight_minimize_on_passthrough">1</attribute>
61+
<attribute persist="true" config_key="[Skin],latenight_minimize_on_passthrough">1</attribute>
6262
<!-- Deck variant that is shown as soon as the mixer is hidden.
6363
See deck.xml and /helpers/skin_helper_deck_size.xml for documentation.
6464
0=mini 1=compact(default) 2=full deck -->

0 commit comments

Comments
 (0)