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

(POC) LateNight: allow to show 4 decks in a row #13724

Draft
wants to merge 1 commit into
base: 2.5
Choose a base branch
from
Draft

(POC) LateNight: allow to show 4 decks in a row #13724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 36 additions & 0 deletions res/skins/LateNight/decks/decks_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,41 @@
</WidgetGroup>

</Children>
<Connection>
<ConfigKey>[Skin],show_4decks_row</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform><Not/></Transform>
</Connection>
</WidgetGroup>

<WidgetGroup>
<ObjectName>DecksLeft</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>
<SingletonContainer>
<ObjectName>Deck3_Src</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey>[Skin],show_4decks</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<SingletonContainer>
<ObjectName>Deck1_Src</ObjectName>
</SingletonContainer>

</Children>
<Connection>
<ConfigKey>[Skin],show_4decks_row</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Template>
36 changes: 36 additions & 0 deletions res/skins/LateNight/decks/decks_left_mini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,41 @@
</WidgetGroup>

</Children>
<Connection>
<ConfigKey>[Skin],show_4decks_row</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform><Not/></Transform>
</Connection>
</WidgetGroup>

<WidgetGroup>
<ObjectName>DecksLeft</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>
<SingletonContainer>
<ObjectName>Deck3_Mini</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey>[Skin],show_4decks</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<SingletonContainer>
<ObjectName>Deck1_Mini</ObjectName>
</SingletonContainer>

</Children>
<Connection>
<ConfigKey>[Skin],show_4decks_row</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Template>
38 changes: 37 additions & 1 deletion res/skins/LateNight/decks/decks_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Template>
<SetVariable name="Type">deck</SetVariable>
<WidgetGroup>
<ObjectName>DecksRight</ObjectName>
<ObjectName>DecksLeft</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>
Expand All @@ -25,5 +25,41 @@
</WidgetGroup>

</Children>
<Connection>
<ConfigKey>[Skin],show_4decks_row</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform><Not/></Transform>
</Connection>
</WidgetGroup>

<WidgetGroup>
<ObjectName>DecksLeft</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>

<SingletonContainer>
<ObjectName>Deck2_Src</ObjectName>
</SingletonContainer>

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>
<SingletonContainer>
<ObjectName>Deck4_Src</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey>[Skin],show_4decks</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

</Children>
<Connection>
<ConfigKey>[Skin],show_4decks_row</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Template>
40 changes: 38 additions & 2 deletions res/skins/LateNight/decks/decks_right_mini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Template>
<SetVariable name="Type">deck</SetVariable>
<WidgetGroup>
<ObjectName>DecksRight</ObjectName>
<ObjectName>DecksLeft</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>
Expand All @@ -25,5 +25,41 @@
</WidgetGroup>

</Children>
</WidgetGroup><!-- DecksRight -->
<Connection>
<ConfigKey>[Skin],show_4decks_row</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform><Not/></Transform>
</Connection>
</WidgetGroup>

<WidgetGroup>
<ObjectName>DecksLeft</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>

<SingletonContainer>
<ObjectName>Deck2_Mini</ObjectName>
</SingletonContainer>

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>me,min</SizePolicy>
<Children>
<SingletonContainer>
<ObjectName>Deck4_Mini</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey>[Skin],show_4decks</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

</Children>
<Connection>
<ConfigKey>[Skin],show_4decks_row</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Template>
2 changes: 1 addition & 1 deletion 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 @@ -107,7 +107,7 @@

<WidgetGroup><!-- HotCues -->
<Layout>vertical</Layout>
<SizePolicy>max,min</SizePolicy>
<SizePolicy>max,max</SizePolicy>
<Children>
<WidgetGroup><!-- HotCues 1-2 / 1-4 -->
<Layout>horizontal</Layout>
Expand Down
16 changes: 14 additions & 2 deletions res/skins/LateNight/mixer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,22 @@
<WidgetGroup>
<ObjectName>MixerDecks</ObjectName>
<SizePolicy>max,min</SizePolicy>
<Layout>vertical</Layout>
<!-- <Layout>vertical</Layout> -->
<Layout>horizontal</Layout>
<Children>
<Template src="skins:LateNight/mixer/mixer_2decks.xml"/>
<Template src="skins:LateNight/mixer/mixer_4decks.xml"/>
<WidgetGroup>
<SizePolicy>max,min</SizePolicy>
<Layout>horizontal</Layout>
<Children>
<Template src="skins:LateNight/mixer/mixer_4decks_stacked.xml"/>
<Template src="skins:LateNight/mixer/mixer_4decks_row.xml"/>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_main_head_mixer</ConfigKey>
Expand Down
51 changes: 18 additions & 33 deletions res/skins/LateNight/mixer/channel_4decks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>

<WidgetGroup>
<ObjectName>MixerChannel_4Decks</ObjectName>
<ObjectName><Variable name="ObjectName"/></ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
Expand All @@ -19,6 +19,8 @@
<Layout>horizontal</Layout>
<SizePolicy>min,max</SizePolicy>
<Children>
<!-- AlignRight doesn't seem to work anymore with Qt6?? -->
<WidgetGroup><Size>0me,0min</Size></WidgetGroup>
<Template src="skins:LateNight/controls/knob.xml">
<SetVariable name="Size">40f,34f</SetVariable>
<SetVariable name="KnobColor">orange</SetVariable>
Expand Down Expand Up @@ -64,11 +66,9 @@
<MaximumSize>,18</MaximumSize>
<Layout>vertical</Layout>
<Children>
<EffectChainPresetSelector>
<ObjectName>QuickEffectSelectorLeft</ObjectName>
<Size>40min,18f</Size>
<EffectUnitGroup>[QuickEffectRack1_<Variable name="Group"/>]</EffectUnitGroup>
</EffectChainPresetSelector>
<SingletonContainer>
<ObjectName>QuickEffectSelector<Variable name="ChanNum"/>_Singleton</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
Expand All @@ -77,17 +77,14 @@
</WidgetGroup>

<WidgetGroup>
<ObjectName>PflBox_4Decks</ObjectName>
<ObjectName>PflBox_4Decks_Stacked</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skins:LateNight/controls/button_2state.xml">
<SetVariable name="TooltipId">pfl</SetVariable>
<SetVariable name="ObjectName">PflButton</SetVariable>
<SetVariable name="Size">26,26</SetVariable>
<SetVariable name="BtnSize">square</SetVariable>
<SetVariable name="ConfigKey"><Variable name="Group"/>,pfl</SetVariable>
</Template>
<WidgetGroup><Size>0me,0f</Size></WidgetGroup>
<SingletonContainer>
<ObjectName>PflButton<Variable name="ChanNum"/></ObjectName>
</SingletonContainer>
</Children>
</WidgetGroup>

Expand All @@ -106,31 +103,19 @@
<ObjectName>VuMeterChannel<Variable name="ChanNum"/></ObjectName>
</SingletonContainer>
</Children>
</WidgetGroup>

<SliderComposed><!-- Volume -->
<TooltipId>channel_volume</TooltipId>
<Size>42f,107f</Size>
<Handle scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/knob_volume_deck.svg</Handle>
<Slider scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/slider_volume_deck.svg</Slider>
<Horizontal>false</Horizontal>
<BarColor><Variable name="BarColorVolume"/></BarColor>
<BarWidth><Variable name="BarWidth"/></BarWidth>
<BarMargins><Variable name="BarMarginVolume"/></BarMargins>
<BarRoundCaps>true</BarRoundCaps>
<BarAxisPos>21.0</BarAxisPos>
<Connection>
<ConfigKey><Variable name="Group"/>,volume</ConfigKey>
</Connection>
</SliderComposed>
</WidgetGroup><!-- VuMeterChannel_4Decks -->

<SingletonContainer>
<ObjectName>VolumeSlider<Variable name="ChanNum"/></ObjectName>
</SingletonContainer>

</Children>
</WidgetGroup><!-- VuAndSlider_4Decks -->

<WidgetGroup>
<ObjectName>CrossfaderSwitch_4Decks</ObjectName>
<ObjectName>CrossfaderSwitch_4Decks_Stacked</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<SizePolicy>me,min</SizePolicy>
<Children>
<Template src="skins:LateNight/controls/button_xfader_deck.xml"/>
</Children>
Expand Down
Loading
Loading