diff options
27 files changed, 2225 insertions, 1670 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e26d77ce9f..7c7cee24f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -722,6 +722,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/widget/wstarrating.cpp src/widget/wstatuslight.cpp src/widget/wtime.cpp + src/widget/wtrackmenu.cpp src/widget/wtrackproperty.cpp src/widget/wtracktableview.cpp src/widget/wtracktableviewheader.cpp diff --git a/build/depends.py b/build/depends.py index 0d41ee7da9..bad5ca59e9 100644 --- a/build/depends.py +++ b/build/depends.py @@ -1023,6 +1023,7 @@ class MixxxCore(Feature): "src/widget/wlibrarytableview.cpp", "src/widget/wanalysislibrarytableview.cpp", "src/widget/wlibrarytextbrowser.cpp", + "src/widget/wtrackmenu.cpp", "src/database/mixxxdb.cpp", "src/database/schemamanager.cpp", diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss index 68c6284b11..f89e62e975 100644 --- a/res/skins/Deere/style.qss +++ b/res/skins/Deere/style.qss @@ -1850,7 +1850,8 @@ QToolTip, WBeatSpinBox QMenu, WCueMenuPopup, WCueMenuPopup QMenu, -WCoverArtMenu { +WCoverArtMenu, +WTrackMenu QMenu { padding: 2px; } WEffectSelector QAbstractScrollArea, @@ -1875,10 +1876,16 @@ WCueMenuPopup QMenu, WCueMenuPopup QLabel, WCueMenuPopup QMenu::item, WCoverArtMenu, -WCoverArtMenu::item { - color: #c1cabe; - background-color: #201f1f; - } +WCoverArtMenu::item, +WTrackMenu, +WTrackMenu::item, +WTrackMenu QCheckBox, +WTrackMenu QMenu, +WTrackMenu QMenu::item, +WTrackMenu QMenu QCheckBox { + color: #c1cabe; + background-color: #201f1f; +} WEffectSelector QAbstractScrollArea, #fadeModeCombobox QAbstractScrollArea, QToolTip, @@ -1886,19 +1893,29 @@ QToolTip, WBeatSpinBox QMenu, WCueMenuPopup, WCueMenuPopup QMenu, -WCoverArtMenu { +WCoverArtMenu, +WTrackMenu, +WTrackMenu QMenu { border-width: 1px; border-style: solid; border-color: #aaa; border-radius: 1px; - } +} /* hovered items */ WEffectSelector::item:selected, #fadeModeCombobox::item:selected, - #LibraryContainer QMenu::item:selected, WBeatSpinBox QMenu::item:selected, WCueMenuPopup QMenu::item:selected, WCoverArtMenu::item:selected, + WTrackMenu::item:selected, + WTrackMenu QCheckBox:selected, + WTrackMenu QCheckBox:focus, + WTrackMenu QCheckBox:hover, + WTrackMenu QMenu::item:selected, + WTrackMenu QMenu QCheckBox:selected, + WTrackMenu QMenu QCheckBox:focus, + WTrackMenu QMenu QCheckBox:hover, + #LibraryContainer QMenu::item:selected, #LibraryContainer QMenu QCheckBox:selected, #LibraryContainer QMenu QCheckBox:focus, /* selected by keyboard */ #LibraryContainer QMenu QCheckBox:hover /* mouse hover */ { @@ -1978,7 +1995,10 @@ WEffectSelector { WBeatSpinBox QMenu::item, WCueMenuPopup QMenu::item, WCoverArtMenu::item, - #LibraryContainer QMenu QCheckBox { + WTrackMenu::item, + WTrackMenu QCheckBox, + WTrackMenu QMenu::item, + WTrackMenu QMenu QCheckBox { padding: 0px; margin: 0px; image: none; @@ -1988,7 +2008,9 @@ WEffectSelector { #LibraryContainer QMenu::separator, WBeatSpinBox QMenu::separator, WCueMenuPopup QMenu::separator, - WCoverArtMenu::separator { + WCoverArtMenu::separator, + WTrackMenu::separator, + WTrackMenu QMenu::separator { height: 0px; border-top: 1px solid #0a0a0a; margin: 4px; @@ -1996,7 +2018,9 @@ WEffectSelector { #LibraryContainer QMenu::item, WBeatSpinBox QMenu::item, WCueMenuPopup QMenu::item, - WCoverArtMenu::item { + WCoverArtMenu::item, + WTrackMenu::item, + WTrackMenu QMenu::item { /* right padding creates a margin to the menu expand arrow, left padding should be bigger than menu icon width + menu icon margin */ @@ -2004,20 +2028,32 @@ WEffectSelector { } /* icons in editline menu (searchbox, editable track properties) */ #LibraryContainer QMenu::icon, + #LibraryContainer QMenu QCheckBox::indicator, + #LibraryContainer QMenu::indicator, WBeatSpinBox QMenu::icon, WCueMenuPopup QMenu::icon, WCoverArtMenu::icon, - #LibraryContainer QMenu QCheckBox::indicator, - #LibraryContainer QMenu::indicator, + WTrackMenu::icon, + WTrackMenu QCheckBox::indicator, + WTrackMenu::indicator, + WTrackMenu QMenu::icon, + WTrackMenu QMenu QCheckBox::indicator, + WTrackMenu QMenu::indicator, WCoverArtMenu::indicator { margin: 0px 4px 0px 2px; padding: 1px; } - #LibraryContainer QMenu QCheckBox { + #LibraryContainer QMenu QCheckBox, + WTrackMenu QCheckBox, + WTrackMenu QMenu QCheckBox { padding: 2px 10px 2px 3px; } #LibraryContainer QMenu QCheckBox::indicator, - #LibraryContainer QMenu::indicator { + #LibraryContainer QMenu::indicator, + WTrackMenu QCheckBox::indicator, + WTrackMenu::indicator, + WTrackMenu QMenu QCheckBox::indicator, + WTrackMenu QMenu::indicator { width: 13px; height: 13px; border: 1px solid #555; @@ -2027,11 +2063,19 @@ WEffectSelector { outline: none; } #LibraryContainer QMenu QCheckBox::indicator:selected, - #LibraryContainer QMenu::indicator:selected { + #LibraryContainer QMenu::indicator:selected, + WTrackMenu QCheckBox::indicator:selected, + WTrackMenu::indicator:selected, + WTrackMenu QMenu QCheckBox::indicator:selected, + WTrackMenu QMenu::indicator:selected { border: 1px solid #999; } #LibraryContainer QMenu QCheckBox::indicator:checked, - #LibraryContainer QMenu::indicator:checked { + #LibraryContainer QMenu::indicator:checked, + WTrackMenu QCheckBox::indicator:checked, + WTrackMenu::indicator:checked, + WTrackMenu QMenu QCheckBox::indicator:checked, + WTrackMenu QMenu::indicator:checked { image: url(skin:/icon/ic_library_checkmark.svg); } /* disabled menu item and checkbox */ @@ -2039,20 +2083,34 @@ WEffectSelector { WBeatSpinBox QMenu::item:!enabled, WCueMenuPopup QMenu::item:!enabled, WCoverArtMenu::item:!enabled, + WTrackMenu::item:!enabled, + WTrackMenu QCheckBox:!enabled, + WTrackMenu QMenu::item:!enabled, + WTrackMenu QMenu QCheckBox:!enabled, #LibraryContainer QMenu QCheckBox:!enabled { color: #555; } - #LibraryContainer QMenu QCheckBox::indicator:!enabled { + #LibraryContainer QMenu QCheckBox::indicator:!enabled, + WTrackMenu QCheckBox::indicator:!enabled, + WTrackMenu QMenu QCheckBox::indicator:!enabled { border: 1px solid #222; background-color: #333; } #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked, #LibraryContainer QMenu QCheckBox::indicator:indeterminate, - #LibraryContainer QCheckBox::indicator:indeterminate:!enabled { + #LibraryContainer QCheckBox::indicator:indeterminate:!enabled, + WTrackMenu QCheckBox::indicator:!enabled:checked, + WTrackMenu QCheckBox::indicator:indeterminate, + WTrackMenu QCheckBox::indicator:indeterminate:!enabled, + WTrackMenu QMenu QCheckBox::indicator:!enabled:checked, + WTrackMenu QMenu QCheckBox::indicator:indeterminate, + WTrackMenu QMenu QCheckBox::indicator:indeterminate:!enabled { image: url(skin:/icon/ic_library_checkmark_grey.svg); } - #LibraryContainer QMenu::right-arrow { + #LibraryContainer QMenu::right-arrow, + WTrackMenu::right-arrow, + WTrackMenu QMenu::right-arrow { width: 16px; height: 16px; image: url(skin:/icon/ic_chevron_right_48px.svg); @@ -2061,7 +2119,15 @@ WEffectSelector { #LibraryContainer QHeaderView QMenu::indicator:checked, #LibraryContainer QHeaderView QMenu::indicator:checked:hover, #LibraryContainer QHeaderView QMenu::indicator:!checked, - #LibraryContainer QHeaderView QMenu::indicator:!checked:hover { + #LibraryContainer QHeaderView QMenu::indicator:!checked:hover, + WTrackMenu::indicator:checked, + WTrackMenu::indicator:checked:hover, + WTrackMenu::indicator:!checked, + WTrackMenu::indicator:!checked:hover, + WTrackMenu QMenu::indicator:checked, + WTrackMenu QMenu::indicator:checked:hover, + WTrackMenu QMenu::indicator:!checked, + WTrackMenu QMenu::indicator:!checked:hover { width: 12px; height: 10px; margin-left: 2px; diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index f346e41d95..db26390830 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -21,6 +21,8 @@ QToolTip, WCueMenuPopup, WCueMenuPopup QMenu, WCoverArtMenu, +WTrackMenu, +WTrackMenu QMenu, WOverview /* Hotcue labels in the overview */ { font-family: "Open Sans"; text-transform: uppercase; @@ -34,6 +36,8 @@ QToolTip, WCueMenuPopup, WCueMenuPopup QMenu, WCoverArtMenu, +WTrackMenu, +WTrackMenu QMenu, WBeatSpinBox QMenu { font-weight: normal; } @@ -49,6 +53,10 @@ WCueMenuPopup, WCueMenuPopup QMenu, WCoverArtMenu, WBeatSpinBox QMenu, +WTrackMenu, +WTrackMenu QCheckBox, +WTrackMenu QMenu, +WTrackMenu QMenu QCheckBox, WLibrary QHeaderView { text-transform: none; } @@ -223,6 +231,10 @@ WCueMenuPopup QMenu, WCueMenuPopup QLabel, #CueLabelEdit, WCoverArtMenu, +WTrackMenu, +WTrackMenu QCheckBox, +WTrackMenu QMenu, +WTrackMenu QMenu QCheckBox, #LatencyLabel, WTime { color: #f0bb2b; } @@ -2453,6 +2465,8 @@ WBeatSpinBox QMenu, WCueMenuPopup, WCueMenuPopup QMenu, WCoverArtMenu, +WTrackMenu, +WTrackMenu QMenu, #SkinSettings { padding: 3px; border: 1px solid #888; @@ -2472,12 +2486,18 @@ WBeatSpinBox QMenu, #LibraryContainer QMenu, WCueMenuPopup QMenu, WCoverArtMenu, + WTrackMenu, + WTrackMenu QMenu, WBeatSpinBox QMenu::item, #LibraryContainer QMenu::item, WCueMenuPopup QMenu::item, WCueMenuPopup QLabel, WCoverArtMenu::item, + WTrackMenu::item, + WTrackMenu QMenu::item, #LibraryContainer QMenu QCheckBox, +WTrackMenu QCheckBox, +WTrackMenu QMenu QCheckBox, WBeatSpinBox, #spinBoxTransition, #SkinSettings, @@ -2502,9 +2522,17 @@ WEffectSelector, WEffectSelector QAbstractScrollArea, #LibraryContainer QMenu::item:selected, WCueMenuPopup QMenu::item:selected, WCoverArtMenu::item:selected, + WTrackMenu::item:selected, + WTrackMenu QMenu::item:selected, #LibraryContainer QMenu QCheckBox:selected, #LibraryContainer QMenu QCheckBox:focus, /* selected by keyboard */ #LibraryContainer QMenu QCheckBox:hover, /* mouse hover */ + WTrackMenu QCheckBox:selected, + WTrackMenu QCheckBox:focus, + WTrackMenu QCheckBox:hover, + WTrackMenu QMenu QCheckBox:selected, + WTrackMenu QMenu QCheckBox:focus, + WTrackMenu QMenu QCheckBox:hover, #SkinSettingsButton:hover, #SkinSettingsLabelButton:hover { background-color: #5E4507; @@ -2575,7 +2603,11 @@ WEffectSelector, #LibraryContainer QMenu::item, WCueMenuPopup QMenu::item, WCoverArtMenu::item, - #LibraryContainer QMenu QCheckBox { + WTrackMenu::item, + WTrackMenu QMenu::item, + #LibraryContainer QMenu QCheckBox, + WTrackMenu QCheckBox, + WTrackMenu QMenu QCheckBox { padding: 0px; margin: 0px; image: none; @@ -2585,13 +2617,17 @@ WEffectSelector, WBeatSpinBox QMenu::separator, #LibraryContainer QMenu::separator, WCueMenuPopup QMenu::separator, + WTrackMenu::separator, + WTrackMenu QMenu::separator, #SkinSettingsSeparator { border-top: 1px solid #000; border-bottom: 1px solid #222; } WBeatSpinBox QMenu::separator, #LibraryContainer QMenu::separator, - WCueMenuPopup QMenu::separator { + WCueMenuPopup QMenu::separator, + WTrackMenu::separator, + WTrackMenu QMenu::separator { height: 0px; margin: 4px; } @@ -2601,7 +2637,9 @@ WEffectSelector, WBeatSpinBox QMenu::item, #LibraryContainer QMenu::item, WCueMenuPopup QMenu::item, - WCoverArtMenu::item { + WCoverArtMenu::item, + WTrackMenu::item, + WTrackMenu QMenu::item { /* Right padding creates a margin to the menu expand arrow. Left padding should be bigger than menu icon width + menu icon left/right margin */ @@ -2612,18 +2650,28 @@ WEffectSelector, WBeatSpinBox QMenu::icon, #LibraryContainer QMenu::icon, WCueMenuPopup QMenu::icon, + WTrackMenu::icon, + WTrackMenu QMenu::icon, /* checkbox in Crate name context menu: "[ ] Auto DJ Track Source" */ - #LibraryContainer QMenu::indicator { + #LibraryContainer QMenu::indicator, + WTrackMenu::indicator, + WTrackMenu QMenu::indicator { margin: 0px 4px 0px 5px; } /* items in Crate sub menu */ - #LibraryContainer QMenu QCheckBox { + #LibraryContainer QMenu QCheckBox, + WTrackMenu QCheckBox, + WTrackMenu QMenu QCheckBox { padding: 3px 10px 3px 5px; } #LibraryContainer QMenu QCheckBox::indicator, #LibraryContainer QMenu::indicator, - WCueMenuPopup QMenu::indicator { + WCueMenuPopup QMenu::indicator, + WTrackMenu QCheckBox::indicator, + WTrackMenu::indicator, + WTrackMenu QMenu QCheckBox::indicator, + WTrackMenu QMenu::indicator { width: 13px; height: 13px; border: 1px solid #333; @@ -2634,39 +2682,61 @@ WEffectSelector, } #LibraryContainer QMenu QCheckBox::indicator:checked, #LibraryContainer QMenu::indicator:checked, + WTrackMenu QCheckBox::indicator:checked, + WTrackMenu::indicator:checked, + WTrackMenu QMenu QCheckBox::indicator:checked, + WTrackMenu QMenu::indicator:checked, WCueMenuPopup QMenu::indicator:checked { image: url(skin:/buttons_classic/btn__lib_checkmark_orange.svg); } /* disabled menu item and checkbox */ #LibraryContainer QMenu QCheckBox:!enabled, #LibraryContainer QMenu::item:!enabled, + WTrackMenu QCheckBox:!enabled, + WTrackMenu::item:!enabled, + WTrackMenu QMenu QCheckBox:!enabled, + WTrackMenu QMenu::item:!enabled, WCueMenuPopup QMenu::item:!enabled, WCoverArtMenu::item:!enabled, - #LibraryContainer QMenu QCheckBox::indicator:!enabled { + #LibraryContainer QMenu QCheckBox::indicator:!enabled, + WTrackMenu QCheckBox::indicator:!enabled, + WTrackMenu QMenu QCheckBox::indicator:!enabled { color: #494949; } #LibraryContainer QMenu QCheckBox::indicator:!enabled:!checked, #LibraryContainer QMenu::indicator:!enabled:!checked, + WTrackMenu QCheckBox::indicator:!enabled:!checked, + WTrackMenu::indicator:!enabled:!checked, + WTrackMenu QMenu QCheckBox::indicator:!enabled:!checked, + WTrackMenu QMenu::indicator:!enabled:!checked, WCueMenuPopup QMenu::indicator:!enabled:!checked { border: 1px solid #222; background-color: #222; } - #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked { + #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked, + WTrackMenu QCheckBox::indicator:!enabled:checked, + WTrackMenu QMenu QCheckBox::indicator:!enabled:checked { image: url(skin:/buttons_classic/btn__lib_checkmark_grey.svg); border: 1px solid #222; background-color: #222; } #LibraryContainer QMenu QCheckBox::indicator:indeterminate, - #LibraryContainer QCheckBox::indicator:indeterminate:!enabled { + #LibraryContainer QCheckBox::indicator:indeterminate:!enabled, + WTrackMenu QCheckBox::indicator:indeterminate, + WTrackMenu QMenu QCheckBox::indicator:indeterminate { image: url(skin:/buttons_classic/btn__lib_checkmark_grey.svg); } - #LibraryContainer QMenu::right-arrow { + #LibraryContainer QMenu::right-arrow, + WTrackMenu::right-arrow, + WTrackMenu QMenu::right-arrow { width: 10px; height: 10px; image: url(skin:/style_classic/menu_arrow_yellow.svg); } - #LibraryContainer QMenu::right-arrow:selected { + #LibraryContainer QMenu::right-arrow:selected, + WTrackMenu::right-arrow:selected, + WTrackMenu QMenu::right-arrow:selected { image: url(skin:/style_classic/menu_arrow_white.svg); } diff --git a/res/skins/LateNight/style_flip.qss b/res/skins/LateNight/style_flip.qss index 302d155d9b..c64ac9df9f 100644 --- a/res/skins/LateNight/style_flip.qss +++ b/res/skins/LateNight/style_flip.qss @@ -47,6 +47,10 @@ QToolTip, WBeatSpinBox QMenu, #LibraryContainer QMenu, #LibraryContainer QMenu QCheckBox, +WTrackMenu, +WTrackMenu QCheckBox, +WTrackMenu QMenu, +WTrackMenu QMenu QCheckBox, WCoverArtMenu, WCueMenuPopup, WCueMenuPopup QMenu, @@ -95,6 +99,14 @@ WSearchLineEdit, WBeatSpinBox QMenu::item:selected, #LibraryContainer QMenu::item:selected, WCoverArtMenu::item:selected, + WTrackMenu::item:selected, + WTrackMenu QMenu::item:selected, + WTrackMenu QCheckBox:selected, + WTrackMenu QCheckBox:focus, + WTrackMenu QCheckBox:hover, + WTrackMenu QMenu QCheckBox:selected, + WTrackMenu QMenu QCheckBox:focus, + WTrackMenu QMenu QCheckBox:hover, #LibraryContainer QMenu QCheckBox:selected, #LibraryContainer QMenu QCheckBox:focus, /* selected by keyboard */ #LibraryContainer QMenu QCheckBox:hover /* mouse hover */ { @@ -108,10 +120,14 @@ WSearchLineEdit, border: 1px solid #c88500; background-color: #050504; } - #LibraryContainer QMenu::right-arrow { + #LibraryContainer QMenu::right-arrow, + WTrackMenu::right-arrow, + WTrackMenu QMenu::right-arrow { image: url(skin:/style_classic/menu_arrow_gold.svg); } - #LibraryContainer QMenu::right-arrow:selected { + #LibraryContainer QMenu::right-arrow:selected, + WTrackMenu::right-arrow:selected, + WTrackMenu QMenu::right-arrow:selected { image: url(skin:/style_classic/menu_arrow_black.svg); } /* BPM lock icon */ diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss index dee3f8b43f..bcdab58c1a 100644 --- a/res/skins/Shade/style.qss +++ b/res/skins/Shade/style.qss @@ -85,6 +85,12 @@ WBeatSpinBox QMenu, #LibraryContainer QMenu, #LibraryContainer QMenu::item, #LibraryContainer QMenu QCheckBox, +WTrackMenu, +WTrackMenu QMenu, +WTrackMenu::item, +WTrackMenu QMenu::item, +WTrackMenu QCheckBox, +WTrackMenu QMenu QCheckBox, WCueMenuPopup, WCueMenuPopup QMenu, WCueMenuPopup QMenu::item, @@ -131,6 +137,8 @@ WEffectSelector::down-arrow, QToolTip, WBeatSpinBox QMenu, #LibraryContainer QMenu, +WTrackMenu, +WTrackMenu QMenu, WCueMenuPopup, WCueMenuPopup QMenu, WCoverArtMenu { @@ -174,9 +182,13 @@ WCoverArtMenu { WEffectSelector::indicator:!checked, WBeatSpinBox QMenu::item, #LibraryContainer QMenu::item, + WTrackMenu::item, + WTrackMenu QMenu::item, WCueMenuPopup QMenu::item, WCoverArtMenu::item, - #LibraryContainer QMenu QCheckBox { + #LibraryContainer QMenu QCheckBox, + WTrackMenu QCheckBox, + WTrackMenu QMenu QCheckBox { padding: 0px; margin: 0px; image: none; @@ -197,9 +209,17 @@ WCoverArtMenu { #LibraryContainer QMenu::item:selected, WCueMenuPopup QMenu::item:selected, WCoverArtMenu::item:selected, + WTrackMenu::item:selected, + WTrackMenu QMenu::item:selected, #LibraryContainer QMenu QCheckBox:selected, #LibraryContainer QMenu QCheckBox:focus, /* selected by keyboard */ - #LibraryContainer QMenu QCheckBox:hover /* mouse hover */ { + #LibraryContainer QMenu QCheckBox:hover, /* mouse hover */ + WTrackMenu QCheckBox:selected, + WTrackMenu QCheckBox:focus, + WTrackMenu QCheckBox:hover, + WTrackMenu QMenu QCheckBox:selected, + WTrackMenu QMenu QCheckBox:focus, + WTrackMenu QMenu QCheckBox:hover { background-color: lightgray; color: #000; /* remove OS focus indicator */ @@ -212,8 +232,12 @@ WCoverArtMenu { } /* checked checkbox */ #LibraryContainer QMenu QCheckBox::indicator:checked, + WTrackMenu QCheckBox::indicator:checked, + WTrackMenu QMenu QCheckBox::indicator:checked, /* checkbox in Crate name context menu: "[ ] Auto DJ Track Source" */ #LibraryContainer QMenu::indicator:checked, + WTrackMenu::indicator:checked, + WTrackMenu QMenu::indicator:checked, WEffectSelector::indicator:checked, #fadeModeCombobox::indicator:checked { border-color: #1a2025; @@ -221,12 +245,18 @@ WCoverArtMenu { } WEffectSelector::indicator:checked, #fadeModeCombobox::indicator:checked, - #LibraryContainer QMenu::indicator:checked { + #LibraryContainer QMenu::indicator:checked, + WTrackMenu::indicator:checked, + WTrackMenu QMenu::indicator:checked { background-color: #f90562; } /* unchecked menu checkbox */ #LibraryContainer QMenu QCheckBox::indicator:enabled:!checked, - #LibraryContainer QMenu::indicator:!checked { + #LibraryContainer QMenu::indicator:!checked, + WTrackMenu QCheckBox::indicator:enabled:!checked, + WTrackMenu::indicator:!checked, + WTrackMenu QMenu QCheckBox::indicator:enabled:!checked, + WTrackMenu QMenu::indicator:!checked { border-color: #1a2025;/* background-color: #7e868b; remove OS focus indicator */ @@ -235,22 +265,34 @@ WCoverArtMenu { /* disabled menu item & checkbox */ WBeatSpinBox QMenu::item:!enabled, #LibraryContainer QMenu::item:!enabled, + WTrackMenu::item:!enabled, + WTrackMenu QMenu::item:!enabled, WCueMenuPopup QMenu::item:!enabled, WCoverArtMenu::item:!enabled, - #LibraryContainer QMenu QCheckBox:!enabled { + #LibraryContainer QMenu QCheckBox:!enabled, + WTrackMenu QCheckBox:!enabled, + WTrackMenu QMenu QCheckBox:!enabled { color: #666; } - #LibraryContainer QMenu QCheckBox::indicator:!enabled { + #LibraryContainer QMenu QCheckBox::indicator:!enabled, + WTrackMenu QCheckBox::indicator:!enabled, + WTrackMenu QMenu QCheckBox::indicator:!enabled { border-color: #666; } - #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked { + #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked, + WTrackMenu QCheckBox::indicator:!enabled:checked, + WTrackMenu QMenu QCheckBox::indicator:!enabled:checked { image: url(skin:/btn/btn_lib_checkmark_grey.svg); } - #LibraryContainer QMenu QCheckBox::indicator:indeterminate { + #LibraryContainer QMenu QCheckBox::indicator:indeterminate, + WTrackMenu QCheckBox::indicator:indeterminate, + WTrackMenu QMenu QCheckBox::indicator:indeterminate { background-color: #cf0a57; } #LibraryContainer QMenu QCheckBox::indicator:indeterminate, - #LibraryContainer QCheckBox::indicator:indeterminate:!enabled { + #LibraryContainer QCheckBox::indicator:indeterminate:!enabled, + WTrackMenu QCheckBox::indicator:indeterminate, + WTrackMenu QMenu QCheckBox::indicator:indeterminate{ image: url(skin:/btn/btn_lib_checkmark_dark_grey.svg); } @@ -258,6 +300,8 @@ WCoverArtMenu { WBeatSpinBox QMenu::item, #LibraryContainer QMenu::item, +WTrackMenu::item, +WTrackMenu QMenu::item, WCueMenuPopup QMenu::item, WCoverArtMenu::item { /* right padding creates a margin to the menu expand arrow, @@ -268,13 +312,19 @@ WCoverArtMenu::item { /* icons in editline menu (searchbox, editable track properties) */ WBeatSpinBox QMenu::icon, #LibraryContainer QMenu::icon, + WTrackMenu::icon, + WTrackMenu QMenu::icon, WCueMenuPopup QMenu::icon, WCoverArtMenu::icon, - #LibraryContainer QMenu::indicator { + #LibraryContainer QMenu::indicator, + WTrackMenu::indicator, + WTrackMenu QMenu::indicator { margin: 0px 4px 0px 4px; } WBeatSpinBox QMenu::separator, #LibraryContainer QMenu::separator, + WTrackMenu::separator, + WTrackMenu QMenu::separator, WCueMenuPopup QMenu::separator, WCoverArtMenu::separator { height: 0px; @@ -282,17 +332,25 @@ WCoverArtMenu::item { margin: 4px 0px; } #LibraryContainer QMenu QCheckBox, + WTrackMenu QCheckBox, + WTrackMenu QMenu QCheckBox, WCoverArtMenu QCheckBox { padding: 2px 10px 2px 3px; } #LibraryContainer QMenu QCheckBox::indicator, - #LibraryContainer QMenu::indicator { + #LibraryContainer QMenu::indicator, + WTrackMenu QCheckBox::indicator, + WTrackMenu::indicator, + WTrackMenu QMenu QCheckBox::indicator, + WTrackMenu QMenu::indicator { width: 13px; height: 13px; border-width: 1px; border-style: solid; } - #LibraryContainer QMenu::right-arrow { + #LibraryContainer QMenu::right-arrow, + WTrackMenu::right-arrow, + WTrackMenu QMenu::right-arrow { width: 10px; height: 10px; image: url(skin:/style/menu_arrow.svg); diff --git a/res/skins/Shade/style_dark.qss b/res/skins/Shade/style_dark.qss index ee1030c412..5284cebc5e 100644 --- a/res/skins/Shade/style_dark.qss +++ b/res/skins/Shade/style_dark.qss @@ -12,6 +12,12 @@ WBeatSpinBox QMenu, #LibraryContainer QMenu, #LibraryContainer QMenu::item, #LibraryContainer QMenu QCheckBox, +WTrackMenu, +WTrackMenu::item, +WTrackMenu QCheckBox, +WTrackMenu QMenu, +WTrackMenu QMenu::item, +WTrackMenu QMenu QCheckBox, WCueMenuPopup, WCueMenuPopup QMenu, WCueMenuPopup QMenu::item, @@ -34,11 +40,19 @@ WCoverArtMenu::item { #fadeModeCombobox::indicator:selected, WBeatSpinBox QMenu::item:selected, #LibraryContainer QMenu::item:selected, + WTrackMenu::item:selected, + WTrackMenu QMenu::item:selected, WCueMenuPopup QMenu::item:selected, WCoverArtMenu::item:selected, #LibraryContainer QMenu QCheckBox:selected, #LibraryContainer QMenu QCheckBox:focus, /* selected by keyboard */ - #LibraryContainer QMenu QCheckBox:hover /* mouse hover */ { + #LibraryContainer QMenu QCheckBox:hover, /* mouse hover */ + WTrackMenu QCheckBox:selected, + WTrackMenu QCheckBox:focus, + WTrackMenu QCheckBox:hover, + WTrackMenu QMenu QCheckBox:selected, + WTrackMenu QMenu QCheckBox:focus, + WTrackMenu QMenu QCheckBox:hover { background-color: #999; } /* hover over checked effect */ @@ -49,30 +63,42 @@ WCoverArtMenu::item { WBeatSpinBox QMenu::separator, #LibraryContainer QMenu::separator, + WTrackMenu::separator, + WTrackMenu QMenu::separator, WCueMenuPopup QMenu::separator, WCoverArtMenu::separator { border-top: 1px solid #3F3041; } /* checked effect and menu checkbox */ #LibraryContainer QMenu QCheckBox::indicator:checked, + WTrackMenu QCheckBox::indicator:checked, + WTrackMenu QMenu QCheckBox::indicator:checked, /* checkbox in Crate name context menu: "[ ] Auto DJ Track Source" */ #LibraryContainer QMenu::indicator:checked, + WTrackMenu::indicator:checked, + WTrackMenu QMenu::indicator:checked, WEffectSelector::indicator:checked, #fadeModeCombobox::indicator:checked { border-color: #111; background-color: #897300; } /* unchecked menu checkbox */ - #LibraryContainer QMenu QCheckBox::indicator:!enabled { + #LibraryContainer QMenu QCheckBox::indicator:!enabled, + WTrackMenu QCheckBox::indicator:!enabled, + WTrackMenu QMenu QCheckBox::indicator:!enabled { border-color: #444; background-color: #666; } /* disabled menu item & checkbox */ WBeatSpinBox QMenu::item:!enabled, #LibraryContainer QMenu::item:!enabled, + WTrackMenu::item:!enabled, + WTrackMenu QMenu::item:!enabled, WCueMenuPopup QMenu::item:!enabled, WCoverArtMenu::item:!enabled, - #LibraryContainer QMenu QCheckBox:!enabled { + #LibraryContainer QMenu QCheckBox:!enabled, + WTrackMenu QCheckBox:!enabled, + WTrackMenu QMenu QCheckBox:!enabled { border-color: #444; color: #444; } diff --git a/res/skins/Shade/style_summer_sunset.qss b/res/skins/Shade/style_summer_sunset.qss index a4d870191c..2eb7b2e729 100644 --- a/res/skins/Shade/style_summer_sunset.qss +++ b/res/skins/Shade/style_summer_sunset.qss @@ -12,6 +12,12 @@ WBeatSpinBox QMenu, #LibraryContainer QMenu, #LibraryContainer QMenu::item, #LibraryContainer QMenu QCheckBox, +WTrackMenu, +WTrackMenu::item, +WTrackMenu QCheckBox, +WTrackMenu QMenu, +WTrackMenu QMenu::item, +WTrackMenu QMenu QCheckBox, WCueMenuPopup, WCueMenuPopup QMenu, WCueMenuPopup QMenu::item, @@ -29,6 +35,8 @@ WCoverArtMenu::item { } WBeatSpinBox QMenu::separator, #LibraryContainer QMenu::separator, + WTrackMenu::separator, + WTrackMenu QMenu::separator, WCueMenuPopup QMenu::separator, WCoverArtMenu::separator { border-top: 1px solid #222; @@ -40,11 +48,19 @@ WCoverArtMenu::item { #fadeModeCombobox::indicator:selected, WBeatSpinBox QMenu::item:selected, #LibraryContainer QMenu::item:selected, + WTrackMenu::item:selected, + WTrackMenu QMenu::item:selected, WCueMenuPopup QMenu::item:selected, WCoverArtMenu::item:selected, #LibraryContainer QMenu QCheckBox:selected, #LibraryContainer QMenu QCheckBox:focus, /* selected by keyboard */ - #LibraryContainer QMenu QCheckBox:hover /* mouse hover */ { + #LibraryContainer QMenu QCheckBox:hover, /* mouse hover */ + WTrackMenu QCheckBox:selected, + WTrackMenu QCheckBox:focus, + WTrackMenu QCheckBox:hover, + WTrackMenu QMenu QCheckBox:selected, + WTrackMenu QMenu QCheckBox:focus, + WTrackMenu QMenu QCheckBox:hover { background-color: #d9c663; } @@ -55,21 +71,31 @@ WCoverArtMenu::item { } /* unchecked menu checkbox */ #LibraryContainer QMenu QCheckBox::indicator:enabled:!checked, - #LibraryContainer QMenu::indicator:!checked { + #LibraryContainer QMenu::indicator:!checked, + WTrackMenu QCheckBox::indicator:enabled:!checked, + WTrackMenu::indicator:!checked, + WTrackMenu QMenu QCheckBox::indicator:enabled:!checked, + WTrackMenu QMenu::indicator:!checked { border-color: #222; } /* checked effect and menu checkbox */ #LibraryContainer QMenu QCheckBox::indicator:enabled:checked, + WTrackMenu QCheckBox::indicator:enabled:checked, + WTrackMenu QMenu QCheckBox::indicator:enabled:checked, /* checkbox in Crate name context menu: "[ ] Auto DJ Track Source" */ #LibraryContainer QMenu::indicator:checked, + WTrackMenu::indicator:checked, + WTrackMenu QMenu::indicator:checked, |