Skip to content

show Passthrough cover on track overview #2616

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

Merged
Holzhaus merged 3 commits into from
Apr 15, 2020
Merged

show Passthrough cover on track overview #2616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
389bb23
draw passthrough overlay on overview waveform
ronso0 Apr 14, 2020
6a81b54
passthrough cover: add default & skin styles
ronso0 Apr 14, 2020
eea31b5
Tango: remove Passthrough hint from VC toggle & Play button
ronso0 Apr 15, 2020
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
7 changes: 7 additions & 0 deletions res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,13 @@ WOverview {
text-transform: none;
}

/* Passthrough label on overview waveform */
WOverview #PassthroughLabel {
font-size: 16px;
font-weight: bold;
color: #73b3f7;
}

/* Start spacing for Deck overview row (small waveform, option grid) */
#OptionGrid, #ButtonGrid {
background-color: #333333;
Expand Down
7 changes: 7 additions & 0 deletions res/skins/LateNight/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,13 @@ WCoverArtMenu,
#FxButtonLabel {
qproperty-alignment: 'AlignLeft | AlignVCenter';
}

/* Passthrough label on overview waveform */
WOverview #PassthroughLabel {
font-weight: bold;
color: #d09300;
}

/************** font colors **************************************************/
/************** font settings *************************************************/

Expand Down
7 changes: 7 additions & 0 deletions res/skins/Shade/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ WOverview {
font-family: "Ubuntu";
}

/* Passthrough label on overview waveform */
WOverview #PassthroughLabel {
font-size: 12px;
font-weight: bold;
color: #55F764;
}

WBeatSpinBox,
/* For some mysterious reason #DlgAutoDJ QSpinBox
wouldn't style the respective spinbox in Shade (anymore),
Expand Down
5 changes: 5 additions & 0 deletions res/skins/Shade/style_dark.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ WCoverArtMenu::item {
background-color: #3F3041;
}

/* Passthrough label on overview waveform */
WOverview #PassthroughLabel {
color: #00aaff;
}



#LibraryContainer QTableView:focus,
Expand Down
5 changes: 5 additions & 0 deletions res/skins/Shade/style_summer_sunset.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ WCoverArtMenu::item {
background-color: #706633;
}

/* Passthrough label on overview waveform */
WOverview #PassthroughLabel {
color: #FF9900;
}

#DlgMissing > QPushButton:enabled,
#DlgHidden > QPushButton:enabled,
#DlgAutoDJ > QPushButton:enabled,
Expand Down
46 changes: 6 additions & 40 deletions res/skins/Tango/deck_row_overview_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,46 +33,12 @@ Variables:

<Template src="skin:vinyl_controls_left.xml"/>

<WidgetGroup><!-- Vinyl Controls toggles -->
<Size>15f,50f</Size>
<Layout>vertical</Layout>
<Children>
<WidgetGroup><!-- Vinyl Controls toggle with passthrough -->
<Size>15f,50f</Size>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerLeftPassthrough</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup><!-- Vinyl Controls toggle without passthrough -->
<Size>15f,50f</Size>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
</WidgetGroup><!-- /Vinyl Controls toggles -->
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>

<!-- Small Cover/Spinny when explicitly set 'small' -->
<WidgetGroup>
Expand Down
46 changes: 6 additions & 40 deletions res/skins/Tango/deck_row_overview_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,46 +71,12 @@ Variables:
</Connection>
</WidgetGroup><!-- / Small Cover/Spinny 2 -->

<WidgetGroup><!-- Vinyl Controls toggles -->
<Size>15f,50f</Size>
<Layout>vertical</Layout>
<Children>
<WidgetGroup><!-- Vinyl Controls toggle with passthrough -->
<Size>15f,50f</Size>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerRightPassthrough</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup><!-- Vinyl Controls toggle without passthrough -->
<Size>15f,50f</Size>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerRight</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
</WidgetGroup><!-- /Vinyl Controls toggles -->
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>

<WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>

Expand Down
32 changes: 0 additions & 32 deletions res/skins/Tango/deck_row_transport_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,18 +207,6 @@ Variables:
<Children>
<!-- index 0 due to bug -->
<WidgetGroup><Size>0f,0f</Size></WidgetGroup>

<!-- Block Play button if passthrough is active,
show speaker icon instead -->
<WidgetGroup>
<ObjectName>PassthroughPlayCover</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<!-- Play -->
<Template src="skin:button_2state_right_display.xml">
<SetVariable name="ObjectName">PlayCue</SetVariable>
Expand Down Expand Up @@ -276,26 +264,6 @@ Variables:
<Children>
<!-- index 0 due to bug -->
<WidgetGroup><Size>0f,0f</Size></WidgetGroup>
<!-- Block Play button if passthrough is active,
show speaker icon instead -->
<WidgetGroup>
<ObjectName>PassthroughPlayCover</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<WidgetGroup>
<ObjectName>Spacer33</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<!-- Play -->
<Template src="skin:button_2state_right_display.xml">
<SetVariable name="ObjectName">PlayCue</SetVariable>
Expand Down
31 changes: 0 additions & 31 deletions res/skins/Tango/deck_row_transport_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,6 @@ Variables:
<Children>
<!-- index 0 due to bug -->
<WidgetGroup><Size>0f,0f</Size></WidgetGroup>
<!-- Block Play button if passthrough is active,
show speaker icon instead -->
<WidgetGroup>
<ObjectName>PassthroughPlayCover</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<WidgetGroup>
<ObjectName>Spacer33</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<!-- Play -->
<Template src="skin:button_2state_right_display.xml">
<SetVariable name="ObjectName">PlayCue</SetVariable>
Expand Down Expand Up @@ -89,17 +69,6 @@ Variables:
<Children>
<!-- index 0 due to bug -->
<WidgetGroup><Size>0f,0f</Size></WidgetGroup>
<!-- Block Play button if passthrough is active,
show speaker icon instead -->
<WidgetGroup>
<ObjectName>PassthroughPlayCover</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<!-- Play -->
<Template src="skin:button_2state_right_display.xml">
<SetVariable name="ObjectName">PlayCue</SetVariable>
Expand Down
6 changes: 6 additions & 0 deletions res/skins/Tango/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2073,6 +2073,12 @@ WTrackProperty#SamplerTitle_mini {
###### Misc ##################################################
##############################################################*/

/* Passthrough label on overview waveform */
WOverview #PassthroughLabel {
font-weight: bold;
color: #ff8f00;
}

QToolTip,
#LibraryContainer QMenu,
WBeatSpinBox QMenu,
Expand Down
9 changes: 9 additions & 0 deletions res/skins/default.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ WColorPicker QPushButton[checked="true"] {
qproperty-icon: url(:/images/ic_checkmark.svg);
}

/* Passthrough label on overview waveform */
WOverview #PassthroughLabel {
margin-left: 4px;
font-family: "Open Sans";
font-weight: bold;
font-size: 18px;
color: #ff8800;
}

/* Clear button */
#SearchClearButton {
background: none;
Expand Down
8 changes: 8 additions & 0 deletions src/waveform/renderers/waveformsignalcolors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ bool WaveformSignalColors::setup(const QDomNode &node, const SkinContext& contex
m_playedOverlayColor = Qt::transparent;
}

// This color is used to draw an overlay over the entire overview-waveforms
// if vinyl passthrough is enabled
m_passthroughOverlayColor = context.selectColor(node, "PassthroughOverlayColor");
m_passthroughOverlayColor = WSkinColor::getCorrectColor(m_passthroughOverlayColor).toRgb();
if (!m_passthroughOverlayColor.isValid()) {
m_passthroughOverlayColor = WSkinColor::getCorrectColor(QColor(187, 0, 0, 0)).toRgb();
}

m_bgColor = context.selectColor(node, "BgColor");
if (!m_bgColor.isValid()) {
m_bgColor = Qt::transparent;
Expand Down
2 changes: 2 additions & 0 deletions src/waveform/renderers/waveformsignalcolors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class WaveformSignalColors {
inline const QColor& getAxesColor() const { return m_axesColor; }
inline const QColor& getPlayPosColor() const { return m_playPosColor; }
inline const QColor& getPlayedOverlayColor() const { return m_playedOverlayColor; }
inline const QColor& getPassthroughOverlayColor() const { return m_passthroughOverlayColor; }
inline const QColor& getBgColor() const { return m_bgColor; }

protected:
Expand All @@ -42,6 +43,7 @@ class WaveformSignalColors {
QColor m_axesColor;
QColor m_playPosColor;
QColor m_playedOverlayColor;
QColor m_passthroughOverlayColor;
QColor m_bgColor;
};

Expand Down
Loading