From 8165b0cb5b1b86742a56428674b5bc6443f1feb2 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Mon, 15 Nov 2021 21:47:54 +0100 Subject: [PATCH] LateNight: add effect chain preset button --- .../classic/buttons/btn__fx_settings.svg | 5 +++ res/skins/LateNight/fx/singletons.xml | 18 ++++++++ .../LateNight/fx/unit_parameters_hidden.xml | 4 ++ .../LateNight/fx/unit_parameters_visible.xml | 9 +++- .../palemoon/buttons/btn__fx_settings.svg | 5 +++ res/skins/LateNight/style.qss | 17 +++++++- res/skins/LateNight/style_classic.qss | 28 ++++++++++++ res/skins/LateNight/style_palemoon.qss | 43 ++++++++++++++++--- 8 files changed, 121 insertions(+), 8 deletions(-) create mode 100644 res/skins/LateNight/classic/buttons/btn__fx_settings.svg create mode 100644 res/skins/LateNight/palemoon/buttons/btn__fx_settings.svg diff --git a/res/skins/LateNight/classic/buttons/btn__fx_settings.svg b/res/skins/LateNight/classic/buttons/btn__fx_settings.svg new file mode 100644 index 00000000000..e5ea012bed0 --- /dev/null +++ b/res/skins/LateNight/classic/buttons/btn__fx_settings.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/res/skins/LateNight/fx/singletons.xml b/res/skins/LateNight/fx/singletons.xml index 2a4c5972bee..c6c35554c1a 100644 --- a/res/skins/LateNight/fx/singletons.xml +++ b/res/skins/LateNight/fx/singletons.xml @@ -147,6 +147,24 @@ + + FxUnit_PresetButton + + + MixmodePflContainer + min,min + horizontal + + + + 22f,22f + EffectChainSelector + + + + + + FxUnit_SuperKnob diff --git a/res/skins/LateNight/fx/unit_parameters_hidden.xml b/res/skins/LateNight/fx/unit_parameters_hidden.xml index 9fe21ee27b8..24dc48406cd 100644 --- a/res/skins/LateNight/fx/unit_parameters_hidden.xml +++ b/res/skins/LateNight/fx/unit_parameters_hidden.xml @@ -128,6 +128,10 @@ FxUnit_DryWetKnob + + FxUnit_PresetButton + + FxUnit_MixmodePfl diff --git a/res/skins/LateNight/fx/unit_parameters_visible.xml b/res/skins/LateNight/fx/unit_parameters_visible.xml index 1bcf0b0411a..60822566f9f 100644 --- a/res/skins/LateNight/fx/unit_parameters_visible.xml +++ b/res/skins/LateNight/fx/unit_parameters_visible.xml @@ -139,11 +139,18 @@ vertical max,min + FxUnit_MixmodePfl - ,3f + ,1f + + + FxUnit_PresetButton + + + ,1f min,me diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_settings.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_settings.svg new file mode 100644 index 00000000000..06e8d45d371 --- /dev/null +++ b/res/skins/LateNight/palemoon/buttons/btn__fx_settings.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index 9faf53b041c..33ecdeb2e8c 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -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; @@ -461,7 +462,7 @@ WSpinny { /* /************** Mixer ********************************************************/ #MixerContainer { - qproperty-layoutAlignment: 'AlignTop'; + qproperty-layoutAlignment: 'AlignHCenter | AlignTop'; } #MixerDecks { @@ -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 *******************************************************/ diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss index c5a1bf708a4..ce7bb858f59 100644 --- a/res/skins/LateNight/style_classic.qss +++ b/res/skins/LateNight/style_classic.qss @@ -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; @@ -1102,6 +1106,8 @@ WTrackMenu, WTrackMenu QMenu, WTrackMenu QMenu QCheckBox, QLineEdit QMenu, +WEffectChainPresetButton QMenu, +WEffectChainPresetButton QMenu QCheckBox, WCoverArtMenu, WCueMenuPopup, WCueMenuPopup QLabel, @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; } @@ -2399,6 +2415,7 @@ WCueMenuPopup, WCoverArtMenu, WEffectSelector QAbstractScrollArea, WEffectChainPresetSelector QAbstractScrollArea, +WEffectChainPresetButton QMenu, WSearchLineEdit QAbstractScrollArea, #fadeModeCombobox QAbstractScrollArea { border: 1px solid #888; @@ -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, @@ -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"], @@ -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); } @@ -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; @@ -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, diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss index d6e2fe78658..1f04f45668a 100644 --- a/res/skins/LateNight/style_palemoon.qss +++ b/res/skins/LateNight/style_palemoon.qss @@ -820,6 +820,10 @@ WBeatSpinBox::down-button, border-top-left-radius: 0px; } +WEffectChainPresetButton::menu-indicator { + image: url(skin:/palemoon/buttons/btn__fx_settings.svg) no-repeat center center; +} + #FxSlotsCollapsed { padding: 0px 0px 0px 0px; border-right: 0px; @@ -1194,6 +1198,8 @@ WLibraryTextBrowser QMenu, WTrackMenu, WTrackMenu QMenu, WTrackMenu QMenu QCheckBox, +WEffectChainPresetButton QMenu, +WEffectChainPresetButton QMenu QCheckBox, QLineEdit QMenu, WCueMenuPopup, WCueMenuPopup QLabel, @@ -2638,6 +2644,7 @@ WTrackTableViewHeader { #LibraryContainer QScrollBar, WEffectSelector QAbstractScrollArea QScrollBar, WEffectChainPresetSelector QAbstractScrollArea QScrollBar, +WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar, WSearchLineEdit QAbstractScrollArea QScrollBar { border: 0px solid #585858; background: #000; @@ -2648,6 +2655,7 @@ WSearchLineEdit QAbstractScrollArea QScrollBar { #LibraryContainer QScrollBar:horizontal, WEffectSelector QAbstractScrollArea QScrollBar:horizontal, WEffectChainPresetSelector QAbstractScrollArea QScrollBar:horizontal, + WEffectChainPresetSelector QAbstractScrollArea QScrollBar:horizontal, WSearchLineEdit QAbstractScrollArea QScrollBar:horizontal { min-width: 12px; height: 15px; @@ -2658,6 +2666,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; @@ -2675,6 +2684,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 { background-color: #333338; min-width: 25px; @@ -2682,6 +2692,7 @@ WSearchLineEdit QAbstractScrollArea QScrollBar { #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 { background-color: #333338; min-height: 25px; @@ -2694,6 +2705,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; @@ -2708,6 +2721,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; @@ -2719,7 +2734,9 @@ 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 { + border: 0px; border: 0px; background-color: #1e1e1e; } @@ -2881,9 +2898,10 @@ QLineEdit QMenu, WCueMenuPopup, WCoverArtMenu, WEffectSelector QAbstractScrollArea, +WEffectChainPresetButton QMenu, WEffectChainPresetSelector QAbstractScrollArea, -#fadeModeCombobox QAbstractScrollArea, -WSearchLineEdit QAbstractScrollArea { +WSearchLineEdit QAbstractScrollArea, +#fadeModeCombobox QAbstractScrollArea { border: 1px solid #333; border-radius: 1px; } @@ -2915,6 +2933,9 @@ WEffectSelector QAbstractScrollArea, WEffectSelector::item, WEffectChainPresetSelector QAbstractScrollArea, WEffectChainPresetSelector::item, +WEffectChainPresetButton QMenu, +WEffectChainPresetButton::item, +WEffectChainPresetButton QMenu QCheckBox, #fadeModeCombobox QAbstractScrollArea, #fadeModeCombobox::item, WSearchLineEdit QAbstractScrollArea, @@ -2940,6 +2961,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"], @@ -2955,12 +2980,14 @@ WSearchLineEdit::item:selected, } /* checked item */ WEffectSelector::item:checked, + WEffectChainPresetSelector::item:checked, WSearchLineEdit::item:checked, #fadeModeCombobox::item:checked { color: #fff; } /* hover over checked item */ WEffectSelector::item:checked:selected, + WEffectChainPresetSelector::item:checked:selected, WSearchLineEdit::item:checked:selected, #fadeModeCombobox::item:checked:selected { background-color: #2f2f2f; @@ -2990,6 +3017,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; @@ -2997,12 +3025,14 @@ QLineEdit QMenu::item:disabled { #MainMenu QMenu::right-arrow, WTrackMenu::right-arrow, - WTrackMenu QMenu::right-arrow { + WTrackMenu QMenu::right-arrow, + WEffectChainPresetButton QMenu::right-arrow { image: url(skin:/palemoon/style/menu_arrow_ivory.svg); } #MainMenu QMenu::right-arrow:selected, WTrackMenu::right-arrow:selected, - WTrackMenu QMenu::right-arrow:selected { + WTrackMenu QMenu::right-arrow:selected, + WEffectChainPresetButton QMenu::right-arrow:selected { image: url(skin:/palemoon/style/menu_arrow_white.svg); } @@ -3023,7 +3053,8 @@ QLineEdit QMenu::item:disabled { WLibrarySidebar QMenu::indicator:checked, WTrackTableViewHeader QMenu::indicator:checked, WTrackTableView::indicator:checked, - WTrackMenu QMenu QCheckBox::indicator:checked { + WTrackMenu QMenu QCheckBox::indicator:checked, + WEffectChainPresetButton QMenu QCheckBox::indicator:checked { image: url(skin:/palemoon/buttons/btn__lib_checkmark_blue.svg); } WEffectSelector::indicator:checked, @@ -3064,6 +3095,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,