Skip to content

Commit 2720c49

Browse files
xerufxeruf
committed
Macros/Skin/LateNight: Create & Style MacroActivate Button with icons
1 parent f29220b commit 2720c49

File tree

3 files changed

+56
-35
lines changed

3 files changed

+56
-35
lines changed

‎res/skins/LateNight/macros/macro.xml

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,26 @@
66
<Layout>horizontal</Layout>
77
<SizePolicy>me,min</SizePolicy>
88
<Children>
9-
10-
<WidgetGroup>
11-
<ObjectName>SamplerPlayBox</ObjectName>
12-
<Layout>horizontal</Layout>
13-
<SizePolicy>min,min</SizePolicy>
14-
<Children>
15-
<Template src="skin:/controls/button_2state_right_display.xml">
16-
<!--<SetVariable name="TooltipId">macro_activate_toggle</SetVariable>-->
17-
<SetVariable name="ObjectName">PlaySampler</SetVariable>
18-
<SetVariable name="Size">34f,34f</SetVariable>
19-
<SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
20-
<SetVariable name="BtnSize">square_big</SetVariable>
21-
<SetVariable name="ConfigKey"><Variable name="MacroPrefix"/>activate</SetVariable>
22-
<SetVariable name="ConfigKeyRight"><Variable name="MacroPrefix"/>play</SetVariable>
23-
<SetVariable name="ConfigKeyDisp"><Variable name="MacroPrefix"/>play</SetVariable>
24-
</Template>
25-
</Children>
26-
</WidgetGroup>
9+
<PushButton>
10+
<!--<TooltipId>macro_activate_toggle</TooltipId>-->
11+
<ObjectName>MacroActivate</ObjectName>
12+
<Size>34f,34f</Size>
13+
<NumberStates>1</NumberStates>
14+
<Connection>
15+
<ConfigKey><Variable name="MacroPrefix"/>activate</ConfigKey>
16+
<ConnectValueToWidget>false</ConnectValueToWidget>
17+
<ButtonState>LeftButton</ButtonState>
18+
</Connection>
19+
<Connection>
20+
<ConfigKey><Variable name="MacroPrefix"/>toggle</ConfigKey>
21+
<ConnectValueToWidget>false</ConnectValueToWidget>
22+
<ButtonState>RightButton</ButtonState>
23+
</Connection>
24+
<Connection>
25+
<ConfigKey><Variable name="MacroPrefix"/>status</ConfigKey>
26+
<ConnectValueFromWidget>false</ConnectValueFromWidget>
27+
</Connection>
28+
</PushButton>
2729

2830
<WidgetGroup>
2931
<ObjectName></ObjectName>
@@ -37,13 +39,16 @@
3739
<SizePolicy>i,f</SizePolicy>
3840
<MinimumSize>,18</MinimumSize>
3941
<Children>
40-
<TrackProperty>
42+
<Label>
4143
<ObjectName>SamplerTitleMini</ObjectName>
4244
<SizePolicy>me,me</SizePolicy>
43-
<MacroSlot><Variable name="MacroSlot"/></MacroSlot>
44-
<Group><Variable name="Group"/></Group>
4545
<Elide>right</Elide>
46-
</TrackProperty>
46+
<Text>Macro <Variable name="MacroSlot"/></Text>
47+
<Connection>
48+
<ConfigKey><Variable name="MacroPrefix"/>status</ConfigKey>
49+
<BindProperty>Text</BindProperty>
50+
</Connection>
51+
</Label>
4752
</Children>
4853
</WidgetGroup>
4954

‎res/skins/LateNight/style_classic.qss

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,10 @@ WPushButton#Reverse[pressed="true"],
14241424
#MicTalk[value="1"], #AuxPlay[value="1"],
14251425
#MicDucking[value="1"], #MicDucking[value="2"],
14261426
#RecFeedback[displayValue="2"],
1427-
QPushButton#pushButtonRecording:checked {
1427+
QPushButton#pushButtonRecording:checked,
1428+
#MacroActivate[value="2"],
1429+
#MacroActivate[value="4"]
1430+
{
14281431
background-color: #db0000;
14291432
}
14301433
/* Red border for Play buttons when previewing from
@@ -1480,6 +1483,7 @@ QPushButton#pushButtonRepeatPlaylist:checked {
14801483
#GuiToggleButton[displayValue="2"],
14811484
#BroadcastButton[displayValue="1"], /* connecting: yellow */
14821485
#RecFeedback[displayValue="1"], /* initialize recording */
1486+
#MacroActivate[value="1"],
14831487
#SkinSettingsToggle[displayValue="1"],
14841488
QPushButton#pushButtonAutoDJ:checked,
14851489
QPushButton#pushButtonAnalyze:checked {
@@ -1577,7 +1581,9 @@ WPushButton#FxExpandOverlay[displayValue="0"],
15771581
WPushButton#SamplerExpand[displayValue="0"],
15781582
#BeatgridControlsToggle,
15791583
#SamplerControlsMini WPushButton,
1580-
#RecDot {
1584+
#RecDot,
1585+
#MacroActivate
1586+
{
15811587
background-color: transparent;
15821588
}
15831589

@@ -1593,10 +1599,12 @@ WPushButton#SamplerExpand[displayValue="0"],
15931599
#PlayDeckMini[value="1"] {
15941600
image: url(skin:/classic/buttons/btn__pause_deck_mini.svg) no-repeat center center;
15951601
}
1602+
#MacroActivate[value="3"],
15961603
#PlaySampler[value="0"],
15971604
#PlayPreview[displayValue="0"] {
15981605
image: url(skin:/classic/buttons/btn__play_sampler.svg) no-repeat center center;
15991606
}
1607+
#MacroActivate[value="4"],
16001608
#PlaySampler[value="1"],
16011609
#PlayPreview[displayValue="1"] {
16021610
image: url(skin:/classic/buttons/btn__pause_sampler.svg) no-repeat center center;
@@ -1896,16 +1904,17 @@ WPushButton#SamplerExpand[displayValue="0"],
18961904
image: url(skin:/classic/buttons/btn__mic_duck_manual.svg) no-repeat center center;
18971905
}
18981906

1907+
#MacroActivate[value="0"],
18991908
#RecDot[highlight="0"] {
19001909
image: url(skin:/classic/buttons/btn__rec_dot.svg) no-repeat center center;
19011910
}
1902-
#RecDot[highlight="1"],
1903-
#RecDot[highlight="2"] {
1911+
#MacroActivate[value="1"], #MacroActivate[value="2"],
1912+
#RecDot[highlight="1"], #RecDot[highlight="2"] {
19041913
image: url(skin:/classic/buttons/btn__rec_dot_active.svg) no-repeat center center;
19051914
}
19061915

19071916
#BroadcastButton[displayValue="0"] {
1908-
/* for some reason the alignment isn't rescpected, so the icons
1917+
/* for some reason the alignment isn't respected, so the icons
19091918
have to be sized like available area (button size - margin) */
19101919
image: url(skin:/classic/buttons/btn__broadcast_off.svg) no-repeat left top;
19111920
}

‎res/skins/LateNight/style_palemoon.qss

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1665,7 +1665,8 @@ WPushButton#Reverse[pressed="true"],
16651665
#PassthroughButton[displayValue="1"],
16661666
#BroadcastButton[displayValue="4"], /* warning */
16671667
QPushButton#pushButtonAutoDJ:checked,
1668-
QPushButton#pushButtonAnalyze:checked {
1668+
QPushButton#pushButtonAnalyze:checked,
1669+
#MacroActivate[value="4"] {
16691670
background-color: #b24c12;
16701671
}
16711672
/* Orange border for Play buttons when previewing from
@@ -1693,7 +1694,8 @@ WPushButton#LoopOut[pressed="true"],
16931694
/* Red */
16941695
#EQKillButtonBox WPushButton[displayValue="1"],
16951696
QPushButton#pushButtonRecording:checked,
1696-
#RecFeedback[displayValue="2"] {
1697+
#RecFeedback[displayValue="2"],
1698+
#MacroActivate[value="2"] {
16971699
background-color: #a80000;
16981700
}
16991701

@@ -1799,8 +1801,9 @@ WPushButton#FxSuperLinkInvertButton[displayValue="0"] {
17991801
}
18001802

18011803
/* Yellow */
1802-
#RecFeedback[displayValue="1"], /* initialize recording */
1803-
#BroadcastButton[displayValue="1"] { /* connecting */
1804+
#RecFeedback[displayValue="1"], /* initialize recording */
1805+
#BroadcastButton[displayValue="1"], /* connecting */
1806+
#MacroActivate[value="1"] {
18041807
background-color: #d09300;
18051808
}
18061809

@@ -1850,13 +1853,13 @@ WPushButton#CrossfaderButton[displayValue="0"],
18501853
WPushButton#CrossfaderButton[displayValue="1"],
18511854
WPushButton#RecButton[displayValue="0"],
18521855
WPushButton#RecButton[displayValue="1"],
1853-
#RecDot {
1856+
#RecDot,
1857+
#MacroActivate {
18541858
background-color: transparent;
18551859
}
18561860

1857-
1858-
18591861
/************** Button icons **************************************************/
1862+
18601863
WPushButton#PlayDeck[value="0"] {
18611864
image: url(skin:/palemoon/buttons/btn__play_deck.svg) no-repeat center center;
18621865
}
@@ -1870,10 +1873,12 @@ WPushButton#PlayDeck[value="0"] {
18701873
#PlayDeckMini[value="1"] {
18711874
image: url(skin:/palemoon/buttons/btn__pause_deck_mini.svg) no-repeat center center;
18721875
}
1876+
#MacroActivate[value="3"],
18731877
#PlaySampler[value="0"],
18741878
#PlayPreview[displayValue="0"] {
18751879
image: url(skin:/palemoon/buttons/btn__play_sampler.svg) no-repeat center center;
18761880
}
1881+
#MacroActivate[value="4"],
18771882
#PlaySampler[value="1"],
18781883
#PlayPreview[displayValue="1"] {
18791884
image: url(skin:/palemoon/buttons/btn__pause_sampler.svg) no-repeat center center;
@@ -2408,15 +2413,17 @@ WPushButton#PlayDeck[value="0"] {
24082413
image: url(skin:/palemoon/buttons/btn__mic_duck_manual.svg) no-repeat center center;
24092414
}
24102415

2416+
#MacroActivate[value="0"],
24112417
#RecDot[highlight="0"] {
24122418
image: url(skin:/palemoon/buttons/btn__rec_dot.svg) no-repeat center center;
24132419
}
2420+
#MacroActivate[value="1"], #MacroActivate[value="2"],
24142421
#RecDot[highlight="1"], #RecDot[highlight="2"] {
24152422
image: url(skin:/palemoon/buttons/btn__rec_dot_active.svg) no-repeat center center;
24162423
}
24172424

24182425
#BroadcastButton[displayValue="0"] {
2419-
/* for some reason the alignment isn't rescpected, so the icons
2426+
/* for some reason the alignment isn't respected, so the icons
24202427
have to be sized like available area (button size - margin) */
24212428
image: url(skin:/palemoon/buttons/btn__broadcast_off.svg) no-repeat left top;
24222429
}

0 commit comments

Comments
 (0)