diff options
author | ronso0 <ronso0@mixxx.org> | 2021-03-25 04:00:41 +0100 |
---|---|---|
committer | ronso0 <ronso0@mixxx.org> | 2021-04-01 02:35:37 +0200 |
commit | 28e2e15f8b46dce34b96e79e28ef4738fbd58cc6 (patch) | |
tree | 5a71b3b56ad1371010ffa2adac33971f48adb95c | |
parent | f5a4e3278b471f29adeef56b82bf2b6aeece1069 (diff) |
LateNight: fix, clean up & consolidate QMenu styles
-rw-r--r-- | res/skins/LateNight/classic/buttons/btn__lib_checkmark_grey.svg | 7 | ||||
-rw-r--r-- | res/skins/LateNight/style.qss | 135 | ||||
-rw-r--r-- | res/skins/LateNight/style_classic.qss | 280 | ||||
-rw-r--r-- | res/skins/LateNight/style_palemoon.qss | 322 | ||||
-rw-r--r-- | res/skins/LateNight/style_windows.qss | 15 |
5 files changed, 328 insertions, 431 deletions
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_checkmark_grey.svg b/res/skins/LateNight/classic/buttons/btn__lib_checkmark_grey.svg new file mode 100644 index 0000000000..2aa0d5f5c3 --- /dev/null +++ b/res/skins/LateNight/classic/buttons/btn__lib_checkmark_grey.svg @@ -0,0 +1,7 @@ +<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg"> + <g transform="translate(0,-22)" stroke="#8c8c8c"> + <g transform="matrix(.4151 0 0 .4151 -1.6604 19.547)" stroke="#8c8c8c"> + <path d="m8.8184 20.364 4.8181 4.8181 9.6363-14.454" fill="none" stroke="#8c8c8c" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.8181"/> + </g> + </g> +</svg> diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index c99a26ee4b..dd2e50756a 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -103,6 +103,10 @@ QLabel#labelRecStatistics { font-weight: normal; } +#LibraryContainer QMenu::indicator { + margin-right: 10px; +} + /* WMainMenuBar #MainMenu is difficult to style, at least when it should look identical on Windows AND Linux. Paddings and margins affect the item labels and checkboxes entirely @@ -170,8 +174,130 @@ QLabel#labelRecStatistics { height: 0px; margin: 0.25em; } + #MainMenu QMenu::right-arrow { + width: 0.7em; + height: 0.7em; + } + + + + + + WEffectSelector QAbstractScrollArea { + /* This would set the maximum width only. The minimum seems to be + defined by the widget itself. */ + /* TODO(ronso0) + Unfortunately, text elide (center) is calculated from the widget's + width, not from the width set here... */ + min-width: 160px; + } + #fadeModeCombobox QAbstractScrollArea { + min-width: 185px; + } + WEffectSelector::indicator:checked, + #fadeModeCombobox::indicator:checked { + margin: 2px; + } + WEffectSelector::down-arrow, + #fadeModeCombobox::down-arrow { + border: 0; + padding: 0; + margin: 0; + } + + WEffectSelector::checked, /* selected item */ + WEffectSelector::indicator, /* checkbox, tick mark */ + WEffectSelector::drop-down, + WEffectSelector::indicator:unchecked, + #fadeModeCombobox::checked, /* selected mode */ + #fadeModeCombobox::indicator, /* checkbox, tick mark */ + #fadeModeCombobox::drop-down, + #fadeModeCombobox::indicator:unchecked, + /* Don't use #LibraryContainer QMenu::item, that would catch + ALL menus incl.WTrackMenu in the table, search menu, + sidebar menu, table header menu, cover art menu. + And for some reason the item properties set here can not be + overwritten with WSearchLineEdit QMenu::item below. */ + WLibrarySidebar QMenu::item, + WTrackMenu::item, + WTrackMenu QMenu::item, + WTrackMenu QMenu QCheckBox, + WBeatSpinBox QMenu::item, + WCueMenuPopup QMenu::item, + WCoverArtMenu::item { + padding: 0px; + margin: 0px; + image: none; + outline: none; + border: 0px solid transparent; + } + WLibrarySidebar QMenu::separator, + WTrackMenu::separator, + WTrackMenu QMenu::separator, + QLineEdit QMenu::separator, + QTextBrowser QMenu::separator { + height: 0px; + margin: 4px; + } + + WLibrarySidebar QMenu::item, + WLibrary QHeaderView QMenu::item, + WTrackMenu::item, + WTrackMenu QMenu::item { + /* padding-right reserves space for the submenu expand arrow + padding-left should be bigger than the menu icon width + + icon margin-left/-right */ + padding: 5px 12px 5px 26px; + } + /* This catches context menus of + - property cells in the tracks table + - WCueMenuPopup cue label editor + - WBeatSpinBox + - AutoDJ transition QSpinBox*/ + QLineEdit QMenu::item, + WCoverArtMenu::item, + /* for the sake of completeness: html root view of Crates, Rec etc. */ + QTextBrowser QMenu::item { + padding: 5px 12px 5px 12px; + } + /* Icons in those menus (copy, paste, cut, delete) */ + #LibraryContainer QMenu::icon, + QLineEdit QMenu::icon, + /* - checkbox in Crate name context menu + "[ ] Auto DJ Track Source" + - QHeaderView QMenu::indicator */ + #LibraryContainer QMenu::indicator { + /* Linux: margin-right pushes the entire icon to the right !?? */ + margin: 0px 4px 0px 5px; + } + /* items in Crate sub menu */ + #LibraryContainer QMenu QCheckBox, + WTrackMenu QMenu QCheckBox { + padding: 3px 10px 3px 5px; + } + #MainMenu QMenu::right-arrow, + #LibraryContainer QMenu::right-arrow, + WTrackMenu::right-arrow, + WTrackMenu QMenu::right-arrow, + #LibraryContainer QTableView::indicator { + width: 10px; + height: 10px; + } + #LibraryContainer QMenu QCheckBox::indicator, + #LibraryContainer QMenu::indicator, + WTrackMenu QMenu QCheckBox::indicator, + WTrackMenu QMenu::indicator, + WCueMenuPopup QMenu::indicator { + width: 13px; + height: 13px; + border: 1px solid #333; + border-radius: 1px; + background-color: #000; + /* remove OS focus indicator */ + outline: none; + } /************** font sizes / alignment ****************************************/ @@ -574,19 +700,14 @@ WEffectSelector { WEffectSelector QAbstractScrollArea, #fadeModeCombobox QAbstractScrollArea { - width: 142px; - /* padding-left: 6px; */ - /* On Linux, this is not applied but font color from - WEffectSelector is inherited. - On Windows, it must be defined here */ border: 1px solid #444; border-radius: 2px; padding: 0px; margin: 0px; } /* selected item */ - WEffectSelector::checked, - #fadeModeCombobox::checked { + WEffectSelector:checked, + #fadeModeCombobox:checked { /* not applied padding-left: 5px; */ padding: 0px; diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss index 2a7e867b55..9e8ef995ac 100644 --- a/res/skins/LateNight/style_classic.qss +++ b/res/skins/LateNight/style_classic.qss @@ -1049,7 +1049,6 @@ WCueMenuPopup QLabel, #CueLabelEdit, WCoverArtMenu, WTrackMenu, -WTrackMenu QCheckBox, WTrackMenu QMenu, WTrackMenu QMenu QCheckBox, #LatencyLabel, WTime { @@ -1098,8 +1097,12 @@ WTrackMenu QMenu QCheckBox, #DurationText, #RateText, #KeyText, #KeyTextSmall, #PreviewLabel, -WEffectSelector, WEffectSelector QAbstractScrollArea, -#fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea, +WEffectSelector:!editable, +WEffectSelector:!editable:on, +WEffectSelector QAbstractScrollArea, +#fadeModeCombobox:!editable, +#fadeModeCombobox:!editable:on, +#fadeModeCombobox QAbstractScrollArea, WBeatSpinBox, #spinBoxTransition, #LibraryFeatureControls QLabel, #LibraryFeatureControls QRadioButton { @@ -2031,28 +2034,6 @@ WTrackTableView { outline: none; } -/* This is the only way to select the 'Played' checkbox. - Note that this also selects the BPM lock. */ -#LibraryContainer QTableView::indicator { -/* This results in 10x10px + 1px border = 12x12px - Omitting this definitions makes the checkbox grow to - 12x12px + 1px border = 14x14px */ - width: 10px; - height: 10px; - /* border is added to size defined above */ - border: 1px solid transparent; - margin: 0px; - padding: 0px; - } - #LibraryContainer QTableView::indicator:checked { - image: url(skin:/classic/buttons/btn__lib_checkmark_orange.svg); - border: 1px solid #ff6600; - } - #LibraryContainer QTableView::indicator:unchecked { - image: none; - border: 1px solid rgba(151,151,151,128); - } - /* Table cell in edit mode */ WLibrary QLineEdit, #LibraryBPMSpinBox { @@ -2303,7 +2284,7 @@ WLibrary QRadioButton::indicator:unchecked { #LibraryContainer QTreeView::branch:closed:has-children:has-siblings:!selected { /* Suppresses that selected sidebar items branch indicator shows wrong color when out of focus ; lp:880588 */ border-image: none; - image: url(skin:/classic/style/library_branch_closed_grey.png); + image: url(skin:/classic/style/library_branch_closed_grey.png); } /* closed, selected */ #LibraryContainer QTreeView::branch:closed:has-children:!has-siblings:selected, @@ -2339,16 +2320,16 @@ WLibrary QRadioButton::indicator:unchecked { /************** common styles for WEffectSelector ****************************** *************** QSpinBox, QMenu, QToolTip *************************************/ +QToolTip, +#LibraryContainer QMenu, +WTrackMenu, +WTrackMenu QMenu, WEffectSelector QAbstractScrollArea, #fadeModeCombobox QAbstractScrollArea, -QToolTip, WBeatSpinBox QMenu, -#LibraryContainer QMenu, WCueMenuPopup, WCueMenuPopup QMenu, -WCoverArtMenu, -WTrackMenu, -WTrackMenu QMenu { +WCoverArtMenu { padding: 3px; border: 1px solid #888; border-radius: 2px; @@ -2366,24 +2347,23 @@ WTrackMenu QMenu { #CrossfaderButtonContainer_Aux, WPushButton#CrossfaderButton[value="0"], QToolTip, +WBeatSpinBox, WBeatSpinBox QMenu, - WCueMenuPopup, - #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, +#LibraryContainer QMenu::item, #LibraryContainer QMenu QCheckBox, -WTrackMenu QCheckBox, +WTrackMenu, +WTrackMenu::item, +WTrackMenu QMenu, +WTrackMenu QMenu::item, WTrackMenu QMenu QCheckBox, -WBeatSpinBox, +WCueMenuPopup, +WCueMenuPopup QMenu, +WCueMenuPopup QMenu::item, +WCueMenuPopup QLabel, +WCoverArtMenu, +WCoverArtMenu::item, #spinBoxTransition, #SkinSettings, WSearchLineEdit, @@ -2402,24 +2382,22 @@ WEffectSelector, #fadeModeCombobox { #MainMenu QMenu::item:focus, #MainMenu QMenu::item:hover, #MainMenu QMenu::indicator:checked:selected, + /* ::indicator:unchecked won't work. use 'unchecked' */ #MainMenu QMenu::indicator:unchecked:selected, - WEffectSelector::item:selected, - #fadeModeCombobox::item:selected, - WBeatSpinBox QMenu::item:selected, #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::item:selected, + WTrackMenu QMenu::item:selected, WTrackMenu QMenu QCheckBox:selected, WTrackMenu QMenu QCheckBox:focus, WTrackMenu QMenu QCheckBox:hover, + WEffectSelector::item:selected, + #fadeModeCombobox::item:selected, + WBeatSpinBox QMenu::item:selected, + WCueMenuPopup QMenu::item:selected, + WCoverArtMenu::item:selected, #SkinSettingsButton[hover="true"], #SkinSettingsNumToggle[hover="true"], #SkinSettingsNumToggleHeader[hover="true"], @@ -2443,13 +2421,15 @@ WEffectSelector, /* The 3D frame on the combo box becomes flat when you give it a border border-radius: 3px; */ } - WEffectSelector { + WEffectSelector:!editable, + WEffectSelector:!editable:on { /* If you use margin top/bottom 0, the combo box shrinks in width (go figure) and names start getting cut off. Adding explicit padding improves this. */ padding: 0px 0px 2px 5px; margin: 0px; } - #fadeModeCombobox { + #fadeModeCombobox:!editable, + #fadeModeCombobox:!editable:on { height: 19px; padding: 0px 0px 1px 5px; margin: 0px 1px 2px 1px; @@ -2457,124 +2437,31 @@ WEffectSelector, WEffectSelector::down-arrow, #fadeModeCombobox::down-arrow { image: url(skin:/classic/buttons/btn__fx_selector_down.svg); - border: 0; - padding: 0; - margin: 0; } WEffectSelector::down-arrow:hover, #fadeModeCombobox::down-arrow:hover { image: url(skin:/classic/buttons/btn__fx_selector_down_pressed.svg); } - WEffectSelector QAbstractScrollArea { - min-width: 160px; - } - #fadeModeCombobox QAbstractScrollArea { - min-width: 185px; - } - WEffectSelector::indicator:checked, - #fadeModeCombobox::indicator:checked { - /* checkbox container is 28 x 22px; - use margin + border to create a square checkbox sized like kill buttons */ - margin: 2px; - image: url(skin:/classic/buttons/btn__lib_checkmark_orange.svg); - } - WEffectSelector::checked, /* selected item */ - WEffectSelector::indicator, /* checkbox, tick mark */ - WEffectSelector::drop-down, - WEffectSelector::indicator:!checked, - #fadeModeCombobox::checked, /* selected mode */ - #fadeModeCombobox::indicator, /* checkbox, tick mark */ - #fadeModeCombobox::drop-down, - #fadeModeCombobox::indicator:!checked, - WBeatSpinBox QMenu::item, - #LibraryContainer QMenu::item, - WCueMenuPopup QMenu::item, - WCoverArtMenu::item, - WTrackMenu::item, - WTrackMenu QMenu::item, - #LibraryContainer QMenu QCheckBox, - WTrackMenu QCheckBox, - WTrackMenu QMenu QCheckBox { - padding: 0px; - margin: 0px; - image: none; - outline: none; - border: 0px solid transparent; - } - #MainMenu QMenu:separator, - 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, - WTrackMenu::separator, - WTrackMenu QMenu::separator { - height: 0px; - margin: 4px; - } - WBeatSpinBox QMenu::item, - #LibraryContainer QMenu::item, - WCueMenuPopup QMenu::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 */ - padding: 5px 12px 5px 26px; - } - /* Icons in QLineEdit menus: - beatsize spinbox, searchbox, editable track properties */ - 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, - WTrackMenu::indicator, - WTrackMenu QMenu::indicator { - margin: 0px 4px 0px 5px; - } - /* items in Crate sub menu */ - #LibraryContainer QMenu QCheckBox, - WTrackMenu QCheckBox, - WTrackMenu QMenu QCheckBox { - padding: 3px 10px 3px 5px; - } - #LibraryContainer QMenu QCheckBox::indicator, - #LibraryContainer 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; - border-radius: 1px; - background-color: #000; - /* remove OS focus indicator */ - outline: none; - } #LibraryContainer QMenu QCheckBox::indicator:checked, #LibraryContainer QMenu::indicator:checked, - WTrackMenu QCheckBox::indicator:checked, - WTrackMenu::indicator:checked, + #LibraryContainer QMenu::indicator:checked:selected, + #LibraryContainer QHeaderView QMenu::indicator:checked, + #LibraryContainer QTableView::indicator:checked, WTrackMenu QMenu QCheckBox::indicator:checked, WTrackMenu QMenu::indicator:checked, - WCueMenuPopup QMenu::indicator:checked { + WCueMenuPopup QMenu::indicator:checked, + WEffectSelector::indicator:checked, + #fadeModeCombobox::indicator:checked { image: url(skin:/classic/buttons/btn__lib_checkmark_orange.svg); } + #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked, + #LibraryContainer QMenu QCheckBox::indicator:indeterminate, + WTrackMenu QMenu QCheckBox::indicator:!enabled:checked, + WTrackMenu QMenu QCheckBox::indicator:indeterminate { + image: url(skin:/classic/buttons/btn__lib_checkmark_grey.svg); + } + #MainMenu QMenu::indicator:checked, #MainMenu QMenu::indicator:checked:selected { image: url(skin:/classic/buttons/btn__menu_checkbox_checked.svg); @@ -2583,52 +2470,51 @@ WEffectSelector, #MainMenu QMenu::indicator:unchecked:selected { image: url(skin:/classic/buttons/btn__menu_checkbox.svg); } + /* explicitly remove icon from unchecked items */ + #LibraryContainer QMenu::indicator:unchecked, + #LibraryContainer QMenu::indicator:unchecked:selected, + #LibraryContainer QTableView::indicator:unchecked, + #LibraryContainer QTableView::indicator:unchecked:selected, + WEffectSelector::indicator:unchecked, + WEffectSelector::indicator:unchecked:selected, + #fadeModeCombobox::indicator:unchecked, + #fadeModeCombobox::indicator:unchecked:selected { + image: none; + } + /* disabled menu item and checkbox */ #MainMenu::item:!enabled, #MainMenu QMenu::item:!enabled, - #LibraryContainer QMenu QCheckBox:!enabled, #LibraryContainer QMenu::item:!enabled, - WTrackMenu QCheckBox:!enabled, + #LibraryContainer QMenu QCheckBox:!enabled, + #LibraryContainer QMenu QCheckBox::indicator:!enabled, WTrackMenu::item:!enabled, WTrackMenu QMenu QCheckBox:!enabled, WTrackMenu QMenu::item:!enabled, + WTrackMenu QMenu QCheckBox::indicator:!enabled, + WBeatSpinBox QMenu::item:!enabled, WCueMenuPopup QMenu::item:!enabled, - WCoverArtMenu::item:!enabled, - #LibraryContainer QMenu QCheckBox::indicator:!enabled, - WTrackMenu QCheckBox::indicator:!enabled, - WTrackMenu QMenu QCheckBox::indicator:!enabled { + WCoverArtMenu::item:!enabled { color: #494949; } #LibraryContainer QMenu QCheckBox::indicator:!enabled:!checked, - #LibraryContainer QMenu::indicator:!enabled:!checked, - WTrackMenu QCheckBox::indicator:!enabled:!checked, - WTrackMenu::indicator:!enabled:!checked, + #LibraryContainer QMenu QCheckBox::indicator:indeterminate, WTrackMenu QMenu QCheckBox::indicator:!enabled:!checked, WTrackMenu QMenu::indicator:!enabled:!checked, - WCueMenuPopup QMenu::indicator:!enabled:!checked { + WCueMenuPopup QMenu::indicator:!enabled:!checked, + WTrackMenu QMenu QCheckBox::indicator:!enabled:checked, + WTrackMenu QMenu QCheckBox::indicator:indeterminate { border: 1px solid #222; background-color: #222; } - #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked, - WTrackMenu QCheckBox::indicator:!enabled:checked, - WTrackMenu QMenu QCheckBox::indicator:!enabled:checked { - image: url(skin:/classic/buttons/btn__lib_checkmark_grey.svg); - border: 1px solid #222; - background-color: #222; + #LibraryContainer QHeaderView QMenu::indicator { + margin-left: 4px; } - #LibraryContainer QMenu QCheckBox::indicator:indeterminate, - #LibraryContainer QCheckBox::indicator:indeterminate:!enabled, - WTrackMenu QCheckBox::indicator:indeterminate, - WTrackMenu QMenu QCheckBox::indicator:indeterminate { - image: url(skin:/classic/buttons/btn__lib_checkmark_grey.svg); - } #MainMenu QMenu::right-arrow, #LibraryContainer QMenu::right-arrow, WTrackMenu::right-arrow, WTrackMenu QMenu::right-arrow { - width: 10px; - height: 10px; image: url(skin:/classic/style/menu_arrow_yellow.svg); } #LibraryContainer QMenu::right-arrow:selected, @@ -2637,15 +2523,19 @@ WEffectSelector, image: url(skin:/classic/style/menu_arrow_white.svg); } - #LibraryContainer QHeaderView QMenu::indicator { - width: 10px; - height: 10px; - margin-left: 2px; - border: none; - background: none; +/* This is the only way to select the 'Played' checkbox. + Note that this also selects the BPM lock. */ +#LibraryContainer QTableView::indicator { + /* border is added to size defined in style.qss */ + border: 1px solid transparent; + margin: 0px; + padding: 0px; + } + #LibraryContainer QTableView::indicator:checked { + border: 1px solid #ff6600; } - #LibraryContainer QHeaderView QMenu::indicator:checked { - image: url(skin:/classic/buttons/btn__lib_checkmark_orange.svg); + #LibraryContainer QTableView::indicator:unchecked { + border: 1px solid rgba(151,151,151,128); } /************** common styles for WEffectSelector ****************************** *************** QSpinBox, QMenu, QToolTip *************************************/ diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss index dc30fb57bc..64e470b895 100644 --- a/res/skins/LateNight/style_palemoon.qss +++ b/res/skins/LateNight/style_palemoon.qss @@ -879,7 +879,8 @@ WBeatSpinBox::down-button, margin: 2px 0px 1px 1px; } -WEffectSelector { +WEffectSelector:!editable, +WEffectSelector:!editable:on { /* Fixes the white bars on the top/bottom of the popup on Mac OS X */ min-height: 13px; margin: 1px 0px 0px 0px; @@ -889,7 +890,8 @@ WEffectSelector { /* The 3D frame on the combo box becomes flat when you give it a border border-radius: 3px; */ } -#fadeModeCombobox { +#fadeModeCombobox:!editable, +#fadeModeCombobox:!editable:on { height: 18px; margin: 0px 0px 3px 1px; padding: 1px 0px 1px 4px; @@ -897,11 +899,6 @@ WEffectSelector { WEffectSelector QAbstractScrollArea, #fadeModeCombobox QAbstractScrollArea { - width: 142px; - /* padding-left: 6px; */ - /* On Linux, this is not applied but font color from WEffectSelector - is inherited. - On Windows, it must be defined here */ border: 1px solid #444; border-radius: 2px; padding: 0px; @@ -927,15 +924,6 @@ WEffectSelector { text sits at left border now border: 0; */ } - WEffectSelector::indicator, - #fadeModeCombobox::indicator { - /* This is sufficient to completely hide the tick mark, but - this alone would show an empty, shadowed box instead of tick mark - background-color: transparent;*/ - /* This should decrease the tick mark's left & right margin but is not respected */ - margin: 0px; - padding: 0px; - } WPushButton#FxSuperLinkButton, WPushButton#FxSuperLinkInvertButton { @@ -1216,7 +1204,6 @@ WCueMenuPopup QLabel, #CueLabelEdit, WCoverArtMenu, WTrackMenu, -WTrackMenu QCheckBox, WTrackMenu QMenu, WTrackMenu QMenu QCheckBox { color: #c2b3a5; @@ -1235,8 +1222,10 @@ WTrackMenu QMenu QCheckBox { #SkinSettingsNumToggleHeader[displayValue="0"] { color: #756e6c; } -WEffectSelector, -#fadeModeCombobox { +WEffectSelector:!editable, +WEffectSelector:!editable:on, +#fadeModeCombobox:!editable, +#fadeModeCombobox:!editable:on { color: #918273; font-size: 14px; } @@ -1442,9 +1431,9 @@ WOverview #PassthroughLabel { #KeyMatchReset[displayValue="0"], WPushButton#VinylButton[displayValue="0"], WPushButton#FxAssignButton1[displayValue="0"], -WEffectSelector, +WEffectSelector:!editable, +#fadeModeCombobox:!editable, #LibraryFeatureControls QPushButton:enabled, -#fadeModeCombobox, #CueDeleteButton { outline: none; border-width: 2px; @@ -1468,8 +1457,8 @@ WEffectSelector, QPushButton#pushButtonRepeatPlaylist:checked, QPushButton#pushButtonAnalyze:checked, QPushButton#pushButtonRecording:checked, - #fadeModeCombobox:on, - WEffectSelector:on, + WEffectSelector:!editable:on, + #fadeModeCombobox:!editable:on, #CueDeleteButton[pressed="true"] { border-width: 2px; border-image: url(skin:/palemoon/buttons/btn_embedded_library_active.svg) 2 2 2 2; @@ -1499,10 +1488,10 @@ WEffectSelector, } WEffectSelector, - WEffectSelector:on { + WEffectSelector::on { margin-top: 1px; } - WEffectSelector:on { + WEffectSelector::on { padding-left: 10px; } @@ -2502,21 +2491,12 @@ WTrackTableView { /* This is the only way to select the 'Played' checkbox. Note that this also selects the BPM lock. */ #LibraryContainer QTableView::indicator { -/* This results in 10x10px + 1px border = 12x12px - Omitting this definitions makes the checkbox grow to - 12x12px + 1px border = 14x14px */ - width: 10px; - height: 10px; - /* border is added to size defined above */ + /* border is added to configured size */ border: 1px solid transparent; margin: 0px; padding: 0px; } - #LibraryContainer QTableView::indicator:checked { - image: url(skin:/palemoon/buttons/btn__lib_checkmark_blue.svg); - } #LibraryContainer QTableView::indicator:unchecked { - image: none; border: 1px solid rgba(151,151,151,128); } @@ -2588,6 +2568,7 @@ WLibrary QLineEdit, + /*********** scrollbars *********************************/ #LibraryContainer QScrollBar, WEffectSelector QAbstractScrollArea QScrollBar { @@ -2768,7 +2749,7 @@ WLibrary QRadioButton::indicator:unchecked { /* Suppresses that selected sidebar items branch indicator shows wrong color when out of focus ; lp:880588 */ border-image: none; - image: url(skin:/palemoon/style/library_branch_closed_grey.png); + image: url(skin:/palemoon/style/library_branch_closed_grey.png); } /* closed, selected */ #LibraryContainer QTreeView::branch:closed:has-children:!has-siblings:selected, @@ -2804,16 +2785,16 @@ WLibrary QRadioButton::indicator:unchecked { /************** common styles for WEffectSelector ****************************** *************** QSpinBox, QMenu, QToolTip *************************************/ +QToolTip, +#LibraryContainer QMenu, +WTrackMenu, +WTrackMenu QMenu, WEffectSelector QAbstractScrollArea, #fadeModeCombobox QAbstractScrollArea, -QToolTip, WBeatSpinBox QMenu, -#LibraryContainer QMenu, WCueMenuPopup, WCueMenuPopup QMenu, -WCoverArtMenu, -WTrackMenu, -WTrackMenu QMenu { +WCoverArtMenu { padding: 3px; border: 1px solid #333; border-radius: 1px; @@ -2841,27 +2822,26 @@ WSearchLineEdit, #MainMenu QMenu, #MainMenu QMenu::item, #MainMenu QMenu QCheckBox, +#LibraryContainer QMenu, +#LibraryContainer QMenu::item, +#LibraryContainer QMenu QCheckBox, +WTrackMenu, +WTrackMenu QMenu, +WTrackMenu::item, +WTrackMenu QMenu::item, +WTrackMenu QMenu QCheckBox, QToolTip, WBeatSpinBox QMenu, - WCueMenuPopup, - #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, +WCueMenuPopup, +WCueMenuPopup QMenu, +WCueMenuPopup QMenu::item, +WCueMenuPopup QLabel, +WCoverArtMenu, +WCoverArtMenu::item, WEffectSelector QAbstractScrollArea, -#fadeModeCombobox QAbstractScrollArea, WEffectSelector::item, +#fadeModeCombobox QAbstractScrollArea, #fadeModeCombobox::item { background-color: #151517; } @@ -2872,23 +2852,20 @@ WEffectSelector::item, #MainMenu QMenu::item:hover, #MainMenu QMenu::indicator:checked:selected, #MainMenu QMenu::indicator:unchecked:selected, - WEffectSelector::item:selected, - #fadeModeCombobox::item:selected, - WBeatSpinBox QMenu::item:selected, #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::item:selected, + WTrackMenu QMenu::item:selected, WTrackMenu QMenu QCheckBox:selected, WTrackMenu QMenu QCheckBox:focus, WTrackMenu QMenu QCheckBox:hover, + #fadeModeCombobox::item:selected, + WEffectSelector::item:selected, + WBeatSpinBox QMenu::item:selected, + WCueMenuPopup QMenu::item:selected, + WCoverArtMenu::item:selected, #SkinSettingsButton[hover="true"], #SkinSettingsNumToggle[hover="true"], #SkinSettingsNumToggleHeader[hover="true"], @@ -2916,17 +2893,16 @@ WEffectSelector::item, /* disabled items */ #MainMenu QMenu::item:disabled, #MainMenu QMenu QCheckBox:disabled, + #LibraryContainer QMenu::item:disabled, + #LibraryContainer QMenu QCheckBox:disabled, + WTrackMenu::item:disabled, + WTrackMenu QMenu::item:disabled, + WTrackMenu QMenu QCheckBox:disabled, WEffectSelector::item:disabled, #fadeModeCombobox::item:disabled, WBeatSpinBox QMenu::item:disabled, - #LibraryContainer QMenu::item:disabled, WCueMenuPopup QMenu::item:disabled, - WCoverArtMenu::item:disabled, - WTrackMenu::item:disabled, - WTrackMenu QMenu::item:disabled, - #LibraryContainer QMenu QCheckBox:disabled, - WTrackMenu QCheckBox:disabled, - WTrackMenu QMenu QCheckBox:disabled { + WCoverArtMenu::item:disabled { color: #555; } @@ -2935,13 +2911,15 @@ WEffectSelector, /* The 3D frame on the combo box becomes flat when you give it a border border-radius: 3px; */ } - WEffectSelector { + WEffectSelector:!editable, + WEffectSelector:!editable:on { /* If you use margin top/bottom 0, the combo box shrinks in width (go figure) and names start getting cut off. Adding explicit padding improves this. */ padding: 3px 0px 1px 5px; margin: 0px; } - #fadeModeCombobox { + #fadeModeCombobox:!editable, + #fadeModeCombobox:!editable:on { min-height: 17px; max-height: 17px; padding: 1px 0px 1px 5px; @@ -2950,50 +2928,10 @@ WEffectSelector, WEffectSelector::down-arrow, #fadeModeCombobox::down-arrow { image: url(skin:/palemoon/buttons/btn__fx_selector_down.svg); - border: 0; - padding: 0; - margin: 0; } - WEffectSelector QAbstractScrollArea { - min-width: 160px; - } - #fadeModeCombobox QAbstractScrollArea { - min-width: 185px; - } - WEffectSelector::indicator:checked, - #fadeModeCombobox::indicator:checked { - /* checkbox container is 28 x 22px - use margin + border to create a square checkbox sized like kill buttons */ - margin: 2px; - image: url(skin:/palemoon/buttons/btn__lib_checkmark_ivory.svg); - } - WEffectSelector::checked, /* selected item */ - WEffectSelector::indicator, /* checkbox, tick mark */ - WEffectSelector::drop-down, - WEffectSelector::indicator:!checked, - #fadeModeCombobox::checked, /* selected mode */ - #fadeModeCombobox::indicator, /* checkbox, tick mark */ - #fadeModeCombobox::drop-down, - #fadeModeCombobox::indicator:!checked, - WBeatSpinBox QMenu::item, - #LibraryContainer QMenu::item, - WCueMenuPopup QMenu::item, - WCoverArtMenu::item, - WTrackMenu::item, - WTrackMenu QMenu::item, - #LibraryContainer QMenu QCheckBox, - WTrackMenu QCheckBox, - WTrackMenu QMenu QCheckBox { - padding: 0px; - margin: 0px; - image: none; - outline: none; - border: 0px solid transparent; - } #MainMenu QMenu:separator, #LibraryContainer QMenu::separator, - WCueMenuPopup QMenu::separator, WTrackMenu::separator, WTrackMenu QMenu::separator, WCueMenuPopup QMenu::separator, @@ -3002,49 +2940,6 @@ WEffectSelector, border-top: 1px solid #000; border-bottom: 1px solid #222; } - WBeatSpinBox QMenu::separator, - #LibraryContainer QMenu::separator, - WCueMenuPopup QMenu::separator, - WTrackMenu::separator, - WTrackMenu QMenu::separator { - height: 0px; - margin: 4px; - } - #MainMenu QMenu::separator { - height: 0px; - margin: 0.25em; - } - WBeatSpinBox QMenu::item, - #LibraryContainer QMenu::item, - WCueMenuPopup QMenu::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 */ - padding: 5px 12px 5px 26px; - } - /* Icons in QLineEdit menus: - beatsize spinbox, searchbox, editable track properties */ - 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, - WTrackMenu::indicator, - WTrackMenu QMenu::indicator { - margin: 0px 4px 0px 5px; - } - /* items in Crate sub menu */ - #LibraryContainer QMenu QCheckBox, - WTrackMenu QCheckBox, - WTrackMenu QMenu QCheckBox { - padding: 3px 10px 3px 5px; - } #MainMenu QMenu::indicator:checked, #MainMenu QMenu::indicator:checked:selected { @@ -3054,86 +2949,66 @@ WEffectSelector, #MainMenu QMenu::indicator:unchecked:selected { image: url(skin:/palemoon/buttons/btn__menu_checkbox.svg); } - - #LibraryContainer QMenu QCheckBox::indicator, - #LibraryContainer 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; - border-radius: 1px; - background-color: #000; - /* remove OS focus indicator */ - outline: none; - } #LibraryContainer QMenu QCheckBox::indicator:checked, #LibraryContainer QMenu::indicator:checked, - WTrackMenu QCheckBox::indicator:checked, - WTrackMenu::indicator:checked, + #LibraryContainer QTableView::indicator:checked, WTrackMenu QMenu QCheckBox::indicator:checked, WTrackMenu QMenu::indicator:checked, WCueMenuPopup QMenu: |