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 effect chain menu button #4593

Merged
merged 1 commit into from
Jan 1, 2022
Merged

LateNight: add effect chain menu button #4593

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
5 changes: 5 additions & 0 deletions res/skins/LateNight/classic/buttons/btn__fx_settings.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions res/skins/LateNight/fx/singletons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,24 @@
</Children>
</SingletonDefinition>

<SingletonDefinition>
<ObjectName>FxUnit<Variable name="FxUnit"/>_PresetButton</ObjectName>
<Children>
<WidgetGroup>
<ObjectName>MixmodePflContainer</ObjectName>
<SizePolicy>min,min</SizePolicy>
<Layout>horizontal</Layout>
<Children>
<EffectChainPresetButton>
<EffectUnit><Variable name="FxUnit"/></EffectUnit>
<Size>22f,22f</Size>
<ObjectName>EffectChainSelector</ObjectName>
</EffectChainPresetButton>
</Children>
</WidgetGroup>
</Children>
</SingletonDefinition>

<SingletonDefinition>
<ObjectName>FxUnit<Variable name="FxUnit"/>_SuperKnob</ObjectName>
<Children>
Expand Down
4 changes: 4 additions & 0 deletions res/skins/LateNight/fx/unit_parameters_hidden.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@
<ObjectName>FxUnit<Variable name="FxUnit"/>_DryWetKnob</ObjectName>
</SingletonContainer>

<SingletonContainer>
<ObjectName>FxUnit<Variable name="FxUnit"/>_PresetButton</ObjectName>
</SingletonContainer>

<SingletonContainer>
<ObjectName>FxUnit<Variable name="FxUnit"/>_MixmodePfl</ObjectName>
</SingletonContainer>
Expand Down
9 changes: 8 additions & 1 deletion res/skins/LateNight/fx/unit_parameters_visible.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,18 @@
<Layout>vertical</Layout>
<SizePolicy>max,min</SizePolicy>
<Children>

<SingletonContainer>
<ObjectName>FxUnit<Variable name="FxUnit"/>_MixmodePfl</ObjectName>
</SingletonContainer>

<WidgetGroup><Size>,3f</Size></WidgetGroup>
<WidgetGroup><Size>,1f</Size></WidgetGroup>

<SingletonContainer>
<ObjectName>FxUnit<Variable name="FxUnit"/>_PresetButton</ObjectName>
</SingletonContainer>

<WidgetGroup><Size>,1f</Size></WidgetGroup>

<WidgetGroup>
<SizePolicy>min,me</SizePolicy>
Expand Down
5 changes: 5 additions & 0 deletions res/skins/LateNight/palemoon/buttons/btn__fx_settings.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 15 additions & 2 deletions res/skins/LateNight/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ WSearchLineEdit::item:selected,

WLibrarySidebar QMenu::indicator,
WTrackTableViewHeader QMenu::indicator,
WTrackMenu QMenu QCheckBox::indicator {
WTrackMenu QMenu QCheckBox::indicator,
WEffectChainPresetButton QMenu QCheckBox::indicator {
border: 1px solid #333;
border-radius: 1px;
background-color: #000;
Expand Down Expand Up @@ -461,7 +462,7 @@ WSpinny { /*

/************** Mixer ********************************************************/
#MixerContainer {
qproperty-layoutAlignment: 'AlignTop';
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
}

#MixerDecks {
Expand Down Expand Up @@ -671,6 +672,18 @@ WEffectChainPresetSelector {
margin: 0px;
padding: 0px;*/
}

WEffectChainPresetButton,
WEffectChainPresetButton::menu-indicator {
background-color: transparent;
border: 0px;
margin: 0px;
padding: 0px;
}
WEffectChainPresetButton::menu-indicator {
subcontrol-origin: margin;
subcontrol-position: center center;
}
/************** Effects *******************************************************/


Expand Down
28 changes: 28 additions & 0 deletions res/skins/LateNight/style_classic.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,10 @@ WLibrary {
margin-right: 2px;
}

WEffectChainPresetButton::menu-indicator {
image: url(skin:/classic/buttons/btn__fx_settings.svg) no-repeat center center;
}

#DryWetKnob,
#SuperKnob {
margin: 0px 1px;
Expand Down Expand Up @@ -1102,6 +1106,8 @@ WTrackMenu,
WTrackMenu QMenu,
WTrackMenu QMenu QCheckBox,
QLineEdit QMenu,
WEffectChainPresetButton QMenu,
WEffectChainPresetButton QMenu QCheckBox,
WCoverArtMenu,
WCueMenuPopup,
WCueMenuPopup QLabel,
Expand Down Expand Up @@ -2181,6 +2187,7 @@ WTrackTableViewHeader {
#LibraryContainer QScrollBar,
WEffectSelector QAbstractScrollArea QScrollBar,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar,
WSearchLineEdit QAbstractScrollArea QScrollBar {
border: 0px solid #585858;
background: #000;
Expand All @@ -2191,6 +2198,7 @@ WSearchLineEdit QAbstractScrollArea QScrollBar {
#LibraryContainer QScrollBar:horizontal,
WEffectSelector QAbstractScrollArea QScrollBar:horizontal,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar:horizontal,
WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar:horizontal,
WSearchLineEdit QAbstractScrollArea QScrollBar:horizontal {
min-width: 12px;
height: 15px;
Expand All @@ -2201,6 +2209,7 @@ WSearchLineEdit QAbstractScrollArea QScrollBar {
#LibraryContainer QScrollBar:vertical,
WEffectSelector QAbstractScrollArea QScrollBar:vertical,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar:vertical,
WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar:vertical,
WSearchLineEdit QAbstractScrollArea QScrollBar:vertical {
min-height: 12px;
width: 15px;
Expand All @@ -2215,6 +2224,7 @@ WSearchLineEdit QAbstractScrollArea QScrollBar {
#LibraryContainer QScrollBar::handle:horizontal,
WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::handle:horizontal,
WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::handle:horizontal,
WSearchLineEdit QAbstractScrollArea QScrollBar::handle:horizontal {
min-width: 25px;
border-radius: 2px;
Expand All @@ -2225,6 +2235,7 @@ WSearchLineEdit QAbstractScrollArea QScrollBar::handle:horizontal {
#LibraryContainer QScrollBar::handle:vertical,
WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::handle:vertical,
WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::handle:vertical,
WSearchLineEdit QAbstractScrollArea QScrollBar::handle:vertical {
min-height: 25px;
border-radius: 2px;
Expand All @@ -2240,6 +2251,8 @@ WEffectSelector QAbstractScrollArea QScrollBar::add-page,
WEffectSelector QAbstractScrollArea QScrollBar::sub-page,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::add-page,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::sub-page,
WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::add-page,
WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::sub-page,
WSearchLineEdit QAbstractScrollArea QScrollBar::add-page,
WSearchLineEdit QAbstractScrollArea QScrollBar::sub-page {
min-width: 15px;
Expand All @@ -2254,6 +2267,8 @@ WEffectSelector QAbstractScrollArea QScrollBar::add-line,
WEffectSelector QAbstractScrollArea QScrollBar::sub-line,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::add-line,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::sub-line,
WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::add-line,
WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::sub-line,
WSearchLineEdit QAbstractScrollArea QScrollBar::add-line,
WSearchLineEdit QAbstractScrollArea QScrollBar::sub-line {
width: 0px;
Expand All @@ -2265,6 +2280,7 @@ WSearchLineEdit QAbstractScrollArea QScrollBar::sub-line {
#LibraryContainer QAbstractScrollArea::corner,
WEffectSelector QAbstractScrollArea QScrollBar::corner,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::corner,
WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar:corner,
WSearchLineEdit QAbstractScrollArea QScrollBar::corner {
background-color: #1e1e1e;
}
Expand Down Expand Up @@ -2399,6 +2415,7 @@ WCueMenuPopup,
WCoverArtMenu,
WEffectSelector QAbstractScrollArea,
WEffectChainPresetSelector QAbstractScrollArea,
WEffectChainPresetButton QMenu,
WSearchLineEdit QAbstractScrollArea,
#fadeModeCombobox QAbstractScrollArea {
border: 1px solid #888;
Expand Down Expand Up @@ -2434,6 +2451,9 @@ WEffectSelector QAbstractScrollArea,
WEffectSelector::item,
WEffectChainPresetSelector QAbstractScrollArea,
WEffectChainPresetSelector::item,
WEffectChainPresetButton QMenu,
WEffectChainPresetButton::item,
WEffectChainPresetButton QMenu QCheckBox,
WSearchLineEdit QAbstractScrollArea,
WSearchLineEdit::item,
#fadeModeCombobox QAbstractScrollArea,
Expand Down Expand Up @@ -2463,6 +2483,10 @@ QLineEdit QMenu::item:selected,
WCoverArtMenu::item:selected,
WEffectSelector::item:selected,
WEffectChainPresetSelector:item:selected,
WEffectChainPresetButton QMenu::item:selected,
WEffectChainPresetButton QMenu QCheckBox:selected,
WEffectChainPresetButton QMenu QCheckBox:focus,
WEffectChainPresetButton QMenu QCheckBox:hover,
#fadeModeCombobox::item:selected,
WSearchLineEdit::item:selected,
#SkinSettingsButton[hover="true"],
Expand Down Expand Up @@ -2515,6 +2539,7 @@ QLineEdit QMenu::item:disabled {
WTrackTableViewHeader QMenu::indicator:checked,
WEffectSelector::indicator:checked,
WEffectChainPresetSelector::indicator:checked,
WEffectChainPresetButton QMenu QCheckBox::indicator:checked,
#fadeModeCombobox::indicator:checked {
image: url(skin:/classic/buttons/btn__lib_checkmark_orange.svg);
}
Expand Down Expand Up @@ -2572,6 +2597,7 @@ QLineEdit QMenu::item:disabled {
WTrackMenu QMenu::separator,
WLibraryTextBrowser QMenu::separator,
QLineEdit QMenu::separator,
WEffectChainPresetButton QMenu::separator,
#SkinSettingsSeparator {
border-top: 1px solid #000;
border-bottom: 1px solid #222;
Expand All @@ -2587,6 +2613,8 @@ WEffectSelector::indicator:unchecked,
WEffectSelector::indicator:unchecked:selected,
WEffectChainPresetSelector::indicator:unchecked,
WEffectChainPresetSelector::indicator:unchecked:selected,
WEffectChainPresetButton QMenu QCheckBox::indicator:unchecked,
WEffectChainPresetButton QMenu QCheckBox::indicator:unchecked:selected,
#fadeModeCombobox::indicator:unchecked,
#fadeModeCombobox::indicator:unchecked:selected,
WSearchLineEdit::indicator:unchecked,
Expand Down
Loading