Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LateNight: add toggles to show loop and beatjump controls #4713

Merged
merged 2 commits into from
May 29, 2022
Merged

LateNight: add toggles to show loop and beatjump controls #4713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a768f90
Add tooltip strings for loop and beatjump controls
Russe Mar 24, 2022
f00441c
LateNight skin: add toggles to show loop and beatjump controls
Russe Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions res/skins/LateNight/decks/row_5_transportLoopJump.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,10 @@
</Children>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey>[Skin],show_loop_controls</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup><!-- /Loop buttons + beatloop size spinbox -->

<WidgetGroup><Size>2f,0min</Size></WidgetGroup><!-- = 2-80px wide -->
Expand Down Expand Up @@ -351,6 +355,10 @@
</Children>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey>[Skin],show_beatjump_controls</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup><!-- /Jump buttons + beatjump size spinbox -->

<WidgetGroup><Size>2f,0min</Size></WidgetGroup>
Expand Down
23 changes: 17 additions & 6 deletions res/skins/LateNight/decks/row_5_transportLoopJump_compact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,24 @@
<BindProperty>highlight</BindProperty>
</Connection> -->
</BeatSpinBox>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_loop_controls_compact</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup>
<SizePolicy>me,min</SizePolicy>
<MinimumSize>2,</MinimumSize>
<MaximumSize>20,</MaximumSize>
</WidgetGroup>
<WidgetGroup>
<SizePolicy>me,min</SizePolicy>
<MinimumSize>2,</MinimumSize>
<MaximumSize>40,</MaximumSize>
</WidgetGroup>

<WidgetGroup>
<ObjectName>BeatjumpControls</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>
<BeatSpinBox>
<TooltipId>beatjump_size</TooltipId>
<ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
Expand All @@ -138,7 +149,7 @@
</BeatSpinBox>
</Children>
<Connection>
<ConfigKey persist="true">[LateNight],show_loopjump_controls_compact</ConfigKey>
<ConfigKey persist="true">[Skin],show_beatjump_controls_compact</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
Expand Down
23 changes: 16 additions & 7 deletions res/skins/LateNight/helpers/skin_settings_compact_deck.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,24 @@ Description:
<Layout>vertical</Layout>
<Children>

<WidgetGroup><Size>0me,6f</Size></WidgetGroup>
<WidgetGroup><Size>0me,18f</Size></WidgetGroup>

<!-- Loop/Jump Controls in compact decks-->
<!-- Loop Controls in compact decks -->
<Template src="skin:/helpers/skin_settings_button_2state.xml">
<SetVariable name="TooltipId"></SetVariable>
<SetVariable name="Text">Loop / Jump Controls</SetVariable>
<SetVariable name="Setting">[LateNight],show_loopjump_controls_compact</SetVariable>
<SetVariable name="TooltipId">show_loop_controls</SetVariable>
<SetVariable name="Text">Loop Controls</SetVariable>
<SetVariable name="Setting">[Skin],show_loop_controls_compact</SetVariable>
</Template>

<!-- Beatjump Controls in compact decks -->
<Template src="skin:/helpers/skin_settings_button_2state.xml">
<SetVariable name="TooltipId">show_beatjump_controls</SetVariable>
<SetVariable name="Text">Beatjump Controls</SetVariable>
<SetVariable name="Setting">[Skin],show_beatjump_controls_compact</SetVariable>
</Template>

<WidgetGroup><Size>0me,5f</Size></WidgetGroup>

<!-- Rate Control -->
<Template src="skin:/helpers/skin_settings_button_2state.xml">
<SetVariable name="TooltipId">rate_toggle</SetVariable>
Expand Down Expand Up @@ -57,15 +66,15 @@ Description:
<SetVariable name="Setting">[VinylControl],show_vinylcontrol</SetVariable>
</Template>

<WidgetGroup><Size>0me,6f</Size></WidgetGroup>

<!-- Level meters -->
<Template src="skin:/helpers/skin_settings_button_2state.xml">
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Text">VU meters</SetVariable>
<SetVariable name="Setting">[Skin],show_vumeters_compact</SetVariable>
</Template>

<WidgetGroup><Size>0me,5f</Size></WidgetGroup>

<!-- Spinny -->
<Template src="skin:/helpers/skin_settings_button_2state.xml">
<SetVariable name="TooltipId">show_spinny</SetVariable>
Expand Down
18 changes: 16 additions & 2 deletions res/skins/LateNight/helpers/skin_settings_full_deck.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,21 @@ Description:
<SetVariable name="Setting">[Skin],show_intro_outro_cues</SetVariable>
</Template>

<WidgetGroup><Size>0me,6f</Size></WidgetGroup>
<!-- Loop Controls -->
<Template src="skin:/helpers/skin_settings_button_2state.xml">
<SetVariable name="TooltipId">show_loop_controls</SetVariable>
<SetVariable name="Text">Loop Controls</SetVariable>
<SetVariable name="Setting">[Skin],show_loop_controls</SetVariable>
</Template>

<!-- Beatjump Controls -->
<Template src="skin:/helpers/skin_settings_button_2state.xml">
<SetVariable name="TooltipId">show_beatjump_controls</SetVariable>
<SetVariable name="Text">Beatjump Controls</SetVariable>
<SetVariable name="Setting">[Skin],show_beatjump_controls</SetVariable>
</Template>

<WidgetGroup><Size>0me,5f</Size></WidgetGroup>

<!-- Rate Controls -->
<Template src="skin:/helpers/skin_settings_button_2state.xml">
Expand Down Expand Up @@ -105,7 +119,7 @@ Description:
<SetVariable name="Setting">[VinylControl],show_vinylcontrol</SetVariable>
</Template>

<WidgetGroup><Size>0me,6f</Size></WidgetGroup>
<WidgetGroup><Size>0me,5f</Size></WidgetGroup>

<!-- Spinny -->
<Template src="skin:/helpers/skin_settings_button_2state.xml">
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/helpers/skin_settings_mini_deck.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Description:
<Layout>vertical</Layout>
<Children>

<WidgetGroup><Size>0me,120f</Size></WidgetGroup>
<WidgetGroup><Size>0me,154f</Size></WidgetGroup>

<!-- Spinny -->
<Template src="skin:/helpers/skin_settings_button_2state.xml">
Expand Down
5 changes: 4 additions & 1 deletion res/skins/LateNight/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
<attribute persist="true" config_key="[Skin],show_hotcues">1</attribute>
<attribute persist="true" config_key="[Skin],show_8_hotcues">1</attribute>
<attribute persist="true" config_key="[Skin],show_intro_outro_cues">1</attribute>
<attribute persist="true" config_key="[Skin],show_loop_controls">1</attribute>
<attribute persist="true" config_key="[Skin],show_beatjump_controls">1</attribute>
<attribute persist="true" config_key="[Skin],show_spinnies">1</attribute>
<attribute persist="true" config_key="[Skin],show_coverart">1</attribute>
<attribute persist="true" config_key="[Skin],show_big_spinny_coverart">0</attribute>
Expand All @@ -63,7 +65,8 @@
<attribute persist="true" config_key="[Skin],show_beatgrid_controls">1</attribute>
<!-- Compact deck -->
<attribute persist="true" config_key="[Skin],show_rate_controls_compact">1</attribute>
<attribute persist="true" config_key="[Skin],show_loopjump_controls_compact">1</attribute>
<attribute persist="true" config_key="[Skin],show_loop_controls_compact">1</attribute>
<attribute persist="true" config_key="[Skin],show_beatjump_controls_compact">1</attribute>
<attribute persist="true" config_key="[Skin],show_sync_button_compact">1</attribute>
<attribute persist="true" config_key="[Skin],show_key_controls">1</attribute>
<attribute persist="true" config_key="[Skin],show_key_controls_compact">1</attribute>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/skin_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Description:
<!-- Decks -->
<WidgetGroup>
<Layout>horizontal</Layout>
<Size>0me,1min</Size>
<Size>0me,23min</Size>
<Children>
<Label>
<ObjectName>CategoryLabel</ObjectName>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/style_classic.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ WSearchLineEdit,
max-height: 2px;
}
#SkinSettingsSeparator {
margin: 3px 4px 7px 4px;
margin: 1px 4px 3px 4px;
}

WBeatSpinBox,
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/style_palemoon.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ WSearchLineEdit {
margin: 0px 5px;
}
#SkinSettingsSeparator {
margin: 3px 4px 7px 4px;
margin: 1px 4px 3px 4px;
}

/* dynamic bottom border in #DeckRow1_ */
Expand Down
8 changes: 8 additions & 0 deletions src/skin/legacy/tooltips.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,14 @@ void Tooltips::addStandardTooltips() {
add("hotcue_toggle")
<< tr("Changes the number of hotcue buttons displayed in the deck");

// Show Loop Controls
add("show_loop_controls")
<< tr("Toggle visibility of Loop Controls");

// Show Beatjump Controls
add("show_beatjump_controls")
<< tr("Toggle visibility of Beatjump Controls");

// Show Rate Control
add("rate_toggle")
<< tr("Toggle visibility of Rate Control");
Expand Down