From b22cfc4d5b55ee80b1e1b580d0b3a592282beeec Mon Sep 17 00:00:00 2001 From: ronso0 Date: Sat, 16 Nov 2019 23:12:01 +0100 Subject: [PATCH 01/41] Revert "Revert "Skins :: adjust styles of skin context menus, tooltip, ..."" This reverts commit 6e1abd2a20dfbacb28c882fd5b65f0be142d2d4e. --- .../Deere/icon/ic_library_checkmark_blue.svg | 1 + .../Deere/icon/ic_library_checkmark_grey.svg | 7 + res/skins/Deere/style-mac.qss | 8 +- res/skins/Deere/style.qss | 319 ++-- res/skins/LateNight/buttons/btn_kill.png | Bin 0 -> 349 bytes .../buttons/btn_lib_checkmark_grey.svg | 7 + .../LateNight/buttons/btn_menu_arrow.png | Bin 0 -> 775 bytes res/skins/LateNight/skin_settings.xml | 121 +- .../LateNight/skin_settings_button_2state.xml | 6 +- .../skin_settings_labelbutton_2state.xml | 8 +- res/skins/LateNight/style-mac.qss | 8 +- res/skins/LateNight/style.qss | 544 ++++--- res/skins/LateNight/style/menu_arrow.svg | 1 + .../LateNight/style/menu_arrow_selected.svg | 1 + res/skins/LateNight/toolbar.xml | 18 +- .../Shade/btn/btn_kill_overdown_dark.png | Bin 0 -> 1001 bytes .../Shade/btn/btn_kill_overdown_darnk.png | Bin 0 -> 1001 bytes .../Shade/btn/btn_kill_overdown_summer.png | Bin 0 -> 1001 bytes .../Shade/btn/btn_lib_checkmark_black.svg | 1 + .../Shade/btn/btn_lib_checkmark_dark_grey.svg | 7 + .../Shade/btn/btn_lib_checkmark_grey.svg | 7 + ....svg => btn_lib_radio_button_on_green.svg} | 0 .../Shade/btn/btn_lib_sort_down_black.png | Bin 0 -> 1071 bytes .../Shade/btn/btn_lib_sort_down_green.png | Bin 0 -> 846 bytes .../Shade/btn/btn_lib_sort_down_light.png | Bin 0 -> 759 bytes ..._down.png => btn_lib_sort_down_orange.png} | Bin .../Shade/btn/btn_lib_sort_down_pink.png | Bin 0 -> 811 bytes res/skins/Shade/btn/btn_lib_sort_up_black.png | Bin 0 -> 1184 bytes res/skins/Shade/btn/btn_lib_sort_up_green.png | Bin 0 -> 740 bytes res/skins/Shade/btn/btn_lib_sort_up_pink.png | Bin 0 -> 63616 bytes res/skins/Shade/btn/btn_menu_arrow.png | Bin 0 -> 775 bytes res/skins/Shade/btn/btn_next_white.png | Bin 0 -> 1001 bytes res/skins/Shade/deck.xml | 2 +- res/skins/Shade/deck_small.xml | 10 +- res/skins/Shade/preview_deck.xml | 2 +- res/skins/Shade/style.qss | 456 ++++-- res/skins/Shade/style/menu_arrow.svg | 1 + .../style/style_branch_closed_selected.png | Bin 240 -> 244 bytes .../style/style_branch_open_selected.png | Bin 236 -> 238 bytes res/skins/Shade/style_dark.qss | 137 +- res/skins/Shade/style_summer_sunset.qss | 97 +- .../Tango (64 Samplers)/skin_settings.xml | 1292 ++++++++-------- .../buttons/btn_lib_checkmark_dark_grey.svg | 7 + .../Tango/buttons/btn_lib_checkmark_grey.svg | 7 + .../Tango/buttons/btn_lib_checkmark_white.svg | 1 + res/skins/Tango/skin_settings.xml | 1293 ++++++++--------- .../Tango/skin_settings_button_multi.xml | 2 +- .../skin_settings_category_button_2state.xml | 30 + res/skins/Tango/style.qss | 387 +++-- 49 files changed, 2718 insertions(+), 2070 deletions(-) create mode 100644 res/skins/Deere/icon/ic_library_checkmark_blue.svg create mode 100644 res/skins/Deere/icon/ic_library_checkmark_grey.svg create mode 100644 res/skins/LateNight/buttons/btn_kill.png create mode 100644 res/skins/LateNight/buttons/btn_lib_checkmark_grey.svg create mode 100644 res/skins/LateNight/buttons/btn_menu_arrow.png create mode 100644 res/skins/LateNight/style/menu_arrow.svg create mode 100644 res/skins/LateNight/style/menu_arrow_selected.svg create mode 100644 res/skins/Shade/btn/btn_kill_overdown_dark.png create mode 100644 res/skins/Shade/btn/btn_kill_overdown_darnk.png create mode 100644 res/skins/Shade/btn/btn_kill_overdown_summer.png create mode 100644 res/skins/Shade/btn/btn_lib_checkmark_black.svg create mode 100644 res/skins/Shade/btn/btn_lib_checkmark_dark_grey.svg create mode 100644 res/skins/Shade/btn/btn_lib_checkmark_grey.svg rename res/skins/Shade/btn/{btn_lib_radio_button_on_dark.svg => btn_lib_radio_button_on_green.svg} (100%) create mode 100644 res/skins/Shade/btn/btn_lib_sort_down_black.png create mode 100644 res/skins/Shade/btn/btn_lib_sort_down_green.png create mode 100644 res/skins/Shade/btn/btn_lib_sort_down_light.png rename res/skins/Shade/btn/{btn_lib_sort_down.png => btn_lib_sort_down_orange.png} (100%) create mode 100644 res/skins/Shade/btn/btn_lib_sort_down_pink.png create mode 100644 res/skins/Shade/btn/btn_lib_sort_up_black.png create mode 100644 res/skins/Shade/btn/btn_lib_sort_up_green.png create mode 100644 res/skins/Shade/btn/btn_lib_sort_up_pink.png create mode 100644 res/skins/Shade/btn/btn_menu_arrow.png create mode 100644 res/skins/Shade/btn/btn_next_white.png create mode 100644 res/skins/Shade/style/menu_arrow.svg create mode 100644 res/skins/Tango/buttons/btn_lib_checkmark_dark_grey.svg create mode 100644 res/skins/Tango/buttons/btn_lib_checkmark_grey.svg create mode 100644 res/skins/Tango/buttons/btn_lib_checkmark_white.svg create mode 100644 res/skins/Tango/skin_settings_category_button_2state.xml diff --git a/res/skins/Deere/icon/ic_library_checkmark_blue.svg b/res/skins/Deere/icon/ic_library_checkmark_blue.svg new file mode 100644 index 00000000000..68cc3f7de8f --- /dev/null +++ b/res/skins/Deere/icon/ic_library_checkmark_blue.svg @@ -0,0 +1 @@ + diff --git a/res/skins/Deere/icon/ic_library_checkmark_grey.svg b/res/skins/Deere/icon/ic_library_checkmark_grey.svg new file mode 100644 index 00000000000..40c8b874838 --- /dev/null +++ b/res/skins/Deere/icon/ic_library_checkmark_grey.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/res/skins/Deere/style-mac.qss b/res/skins/Deere/style-mac.qss index 01a98f55872..8d835c21736 100644 --- a/res/skins/Deere/style-mac.qss +++ b/res/skins/Deere/style-mac.qss @@ -9,13 +9,13 @@ /* hack to hide the checkmark, otherwise text gets cut off on the right on Retina screens. This can only be done for macOS -because it cuts off text on the left on KDE */ +because it cuts off text on the left on KDE WEffectSelector QAbstractItemView { margin: 0 0 0 -24px; -} +} */ /* hide the checkmark just in case the above shows a -partial checkmark on some untested screen */ +partial checkmark on some untested screen WEffectSelector::indicator { border: 0; -} +} */ diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss index c89a5eca6b4..3961d4bdd48 100644 --- a/res/skins/Deere/style.qss +++ b/res/skins/Deere/style.qss @@ -235,6 +235,19 @@ QTreeView::branch:selected, background-color: #006596; } +/* Table cell in edit mode */ +WLibrary QLineEdit, +#LibraryBPMSpinBox { + color: #ddd; + background-color: #0f0f0f; + selection-color: #000; + selection-background-color: #ccc; +} +WLibrary QLineEdit { + border: 1px solid #006596; +} + + /* checkbox in library "Played" column */ QTableView::indicator { width: 10px; @@ -246,7 +259,7 @@ QTableView::indicator { QTableView::indicator:checked, QTableView::indicator:checked:selected { - background: url(skin:/icon/ic_library_checkmark.svg); + image: url(skin:/icon/ic_library_checkmark.svg); border: 1px solid #ff6600; } @@ -255,7 +268,11 @@ QTableView::indicator:unchecked { border: 1px solid rgba(151,151,151,128); } -/* BPM lock icon in the library "BPM" column. */ +/* focused BPM cell in the library "BPM" column */ +#LibraryBPMButton:focus { + outline: none; +} +/* BPM lock icon */ #LibraryBPMButton::indicator:checked { image: url(skin:/icon/ic_library_bpm_locked.svg); } @@ -265,10 +282,6 @@ QTableView::indicator:unchecked { } #LibraryBPMSpinBox { - color: #fff; - selection-color: #0f0f0f; - background-color: #0f0f0f; - selection-background-color: #888; /* This combination of negative top/bottom padding & margin creates a 1px border around the spinbox' text area. Increased left/right padding/margin removes the overlap of @@ -323,9 +336,9 @@ QHeaderView::section { padding: 2px; background: #1A1A1A; border-top: none; + border-left: none; border-bottom: 1px solid #141414; - border-left: 1px solid #141414; - border-right: none; + border-right: 1px solid #141414; } QHeaderView::section:selected { @@ -335,10 +348,15 @@ QHeaderView::section:selected { background: #1A1A1A; border-top: none; border-bottom: 1px solid #141414; - border-left: 1px solid #141414; border-right: none; } +QHeaderView::up-arrow, +QHeaderView::down-arrow { + background-color: rgba(26,26,26,220); + margin: 0px -1px 0px 0xp; + padding: 0px; +} QHeaderView::up-arrow { image: url(skin:/image/style_sort_up.svg) } @@ -354,6 +372,7 @@ WSearchLineEdit { border: 1px solid #4B4B4B; background-color: #1e1e1e; color: #d2d2d2; + font-size: 13px; } WSearchLineEdit:focus { @@ -522,11 +541,11 @@ WLibrary QRadioButton::indicator { } WLibrary QRadioButton::indicator:checked { - background: url(skin:/icon/ic_radio_button_on_18px.svg); + image: url(skin:/icon/ic_radio_button_on_18px.svg); } WLibrary QRadioButton::indicator:unchecked { - background: url(skin:/icon/ic_radio_button_off_18px.svg); + image: url(skin:/icon/ic_radio_button_off_18px.svg); } /* buttons in library (in hierarchical order of appearance) Style them just as the other regular buttons */ @@ -789,7 +808,9 @@ QAbstractScrollArea::corner { background-color: #222; } -WWidget, QLabel { +WWidget, +QLabel, +QPushButton { font-family: "Open Sans"; font-size: 12px; text-transform: uppercase; @@ -876,7 +897,9 @@ WBeatSpinBox, margin: 3px 0px 0px 2px; } WBeatSpinBox:hover, - #DlgAutoDJ QSpinBox:hover { + #DlgAutoDJ QSpinBox:hover, + WBeatSpinBox:focus, + #DlgAutoDJ QSpinBox:focus { border: 1px ridge #015d8d; } WBeatSpinBox::down-button, @@ -1176,69 +1199,6 @@ WBeatSpinBox, image: url(skin:/icon/ic_power_48px.svg) no-repeat center center; } -WEffectSelector, -#fadeModeCombobox { - color: #c1cabe; - background-color: #444342; - /* TODO: use a linear gradient for the background color */ - /* Fixes the white bars on the top/bottom of the popup on Mac OS X */ - margin-top: 0px; - margin-bottom: 0px; - /* 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 6px; - /* The 3D frame on the combo box becomes flat when you give it a border */ - border: 1px solid #444342; - border-radius: 3px; - font: 15px; -} -#fadeModeCombobox { - /* 1px is added in each dimension. 20+1+1 = 22 = button height */ - height: 20px; - margin: 9px 3px 6px 3px; -} - - WEffectSelector:hover, - #fadeModeCombobox:hover { - border: 1px ridge #015d8d; - } - - WEffectSelector::drop-down, - #fadeModeCombobox::drop-down { - /* This causes the Qt theme's widget style to magically not apply. Go figure. */ - border: 0; - } - - WEffectSelector::down-arrow, - #fadeModeCombobox::down-arrow { - width: 20px; - height: 20px; - image: url(skin:/icon/ic_chevron_down_48px.svg); - } - - WEffectSelector QAbstractItemView, - #fadeModeCombobox QAbstractItemView { - color: #c1cabe; - background-color: #201f1f; - } - - WEffectSelector::item:!selected, - #fadeModeCombobox::item:!selected { - background-color: #201f1f; - } - - WEffectSelector::item:selected, - #fadeModeCombobox::item:selected { - background-color: #080808; - } - - /* currently loaded effect */ - WEffectSelector::checked, - #fadeModeCombobox::checked { - color: #4495F4; - font-weight: bold; - } - #EffectKnob { } @@ -1422,7 +1382,7 @@ WStarRating { margin : 5px 5px 0px 0px; border : 0px solid #ffffff; padding : 2px; - color : #888888; + color : #d2d2d2; background-color : none; } @@ -1891,7 +1851,6 @@ do not highlight either state. */ stop: 0.66 #5F5F5F, stop: 0.67 #5F5F5F, stop: 1 #5F5F5F); - border: 0px solid #0080BE; } @@ -1904,7 +1863,6 @@ do not highlight either state. */ stop: 0.66 #4B4B4B, stop: 0.67 #006596, stop: 1 #006596); - border: 0px solid #006596; } @@ -1918,7 +1876,6 @@ do not highlight either state. */ stop: 0.66 #5F5F5F, stop: 0.67 #0080BE, stop: 1 #0080BE); - border: 0px solid #0080BE; } @@ -1931,7 +1888,6 @@ do not highlight either state. */ stop: 0.660000 #4B4B4B, stop: 0.670000 #006596, stop: 1 #006596); - border: 0px solid #006596; } @@ -1945,7 +1901,6 @@ do not highlight either state. */ stop: 0.660000 #5F5F5F, stop: 0.670000 #0080BE, stop: 1 #0080BE); - border: 0px solid #0080BE; } @@ -1995,11 +1950,203 @@ do not highlight either state. */ ** End Buttons *************************************************************** *******************************************************************************/ -QToolTip { - background-color: #222222; - color: #CCCCCC; - border: 1px solid #CCCCCC; + +WEffectSelector QAbstractItemView, +#fadeModeCombobox QAbstractScrollArea, +QToolTip, +QMenu, +QMenu QCheckBox { + padding: 2px; + font: 13px; +} +WEffectSelector QAbstractItemView, +#fadeModeCombobox QAbstractScrollArea { + min-width: 180px; +} +/* common colors for WEffectSelector, QMenu, QToolTip */ +WEffectSelector QAbstractItemView, +WEffectSelector::indicator:!checked, +#fadeModeCombobox QAbstractScrollArea, +#fadeModeCombobox::indicator:!checked, +QToolTip, +QMenu, +QMenu::item, +QMenu QCheckBox { + color: #c1cabe; + background-color: #201f1f; + } +WEffectSelector QAbstractItemView, +#fadeModeCombobox QAbstractScrollArea, +QToolTip, +QMenu { + border-width: 1px; + border-style: solid; + border-color: #aaa; + border-radius: 1px; + } + /* hovered items */ + WEffectSelector::item:selected, + #fadeModeCombobox::item:selected, + QMenu::item:selected, + QMenu QCheckBox:selected, + QMenu QCheckBox:focus, /* selected by keyboard */ + QMenu QCheckBox:hover /* mouse hover */ { + background-color: #565353; + color: #fff; + /* remove OS focus indicator */ + outline: none; + } + + + +WEffectSelector, +#fadeModeCombobox { + color: #c1cabe; + /* TODO: use a linear gradient for the background color */ + /* Fixes the white bars on the top/bottom of the popup on Mac OS X */ + margin-top: 0px; + margin-bottom: 0px; + /* 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 6px; + /* The 3D frame on the combo box becomes flat when you give it a border */ + border: 1px solid #444342; + border-radius: 3px; + font: 15px; +} +#fadeModeCombobox { + /* 1px is added in each dimension. 20+1+1 = 22 = button height */ + height: 20px; + margin: 9px 3px 6px 3px; } + + WEffectSelector:hover, + #fadeModeCombobox:hover { + border: 1px ridge #015d8d; + } + WEffectSelector::drop-down, + #fadeModeCombobox::drop-down { + /* This causes the Qt theme's widget style to magically not apply. Go figure. */ + border: 0; + } + WEffectSelector::down-arrow, + #fadeModeCombobox::down-arrow { + width: 20px; + height: 20px; + image: url(skin:/icon/ic_chevron_down_48px.svg); + } + WEffectSelector::item:!selected, + #fadeModeCombobox::item:!selected { + background-color: #201f1f; + } + /* currently loaded effect */ + WEffectSelector::checked, + #fadeModeCombobox::checked { + color: #4495F4; + font-weight: bold; + } + 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:/icon/ic_library_checkmark_blue.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, + QMenu::item, + QMenu QCheckBox { + padding: 0px; + margin: 0px; + image: none; + outline: none; + border: 0px solid transparent; + } + QMenu::separator { + height: 0px; + border-top: 1px solid #0a0a0a; + margin: 4px; + } + QMenu::item { + /* right padding creates a margin to the menu expand arrow, + left padding should be bigger than menu icon width + menu icon + margin */ + padding: 5px 13px 5px 26px; + } + /* icons in editline menu (searchbox, editable track properties) + and color squares in cue color menu */ + QMenu::icon, + QMenu::indicator { + margin: 0px 4px 0px 2px; + padding: 1px; + } + QMenu QCheckBox { + padding: 2px 10px 2px 3px; + } + QMenu QCheckBox::indicator, + QMenu::indicator { + width: 13px; + height: 13px; + border: 1px solid #555; + border-radius: 1px; + background-color: #0f0f0f; + /* remove OS focus indicator */ + outline: none; + } + QMenu QCheckBox::indicator:selected { + border: 1px solid #999; + } + QMenu QCheckBox::indicator:checked, + QMenu::indicator:checked { + image: url(skin:/icon/ic_library_checkmark.svg); + } + /* disabled menu item and checkbox */ + QMenu QCheckBox:!enabled, + QMenu::item:!enabled, + QMenu QCheckBox::indicator:!enabled { + color: #555; + } + QMenu QCheckBox::indicator:!enabled { + border: 1px solid #333; + background-color: #222; + } + QMenu QCheckBox::indicator:!enabled:checked { + image: url(skin:/icon/ic_library_checkmark_grey.svg); + } + QCheckBox::indicator:indeterminate { + image: url(skin:/icon/ic_library_checkmark_grey.svg); + } + + QMenu::right-arrow { + width: 16px; + height: 16px; + image: url(skin:/icon/ic_chevron_right_48px.svg); + } + QMenu::right-arrow:selected { + } + + QHeaderView QMenu::indicator { + width: 12px; + height: 10px; + margin-left: 2px; + border: none; + background: none; + } + QHeaderView QMenu::indicator:checked { + image: url(skin:/icon/ic_library_checkmark_blue.svg); + } + + + + + /* #Deck1 { diff --git a/res/skins/LateNight/buttons/btn_kill.png b/res/skins/LateNight/buttons/btn_kill.png new file mode 100644 index 0000000000000000000000000000000000000000..8d87cb2002718c9fee684b0f514ac71e68cd0f07 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^{24nJ za0`JjT_|iUd^#qc?i_Y N;OXk;vd$@?2>@b&a9RKW literal 0 HcmV?d00001 diff --git a/res/skins/LateNight/buttons/btn_lib_checkmark_grey.svg b/res/skins/LateNight/buttons/btn_lib_checkmark_grey.svg new file mode 100644 index 00000000000..40c8b874838 --- /dev/null +++ b/res/skins/LateNight/buttons/btn_lib_checkmark_grey.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/res/skins/LateNight/buttons/btn_menu_arrow.png b/res/skins/LateNight/buttons/btn_menu_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..89a805fbfc72b7916324211e4b3e0df897733ba2 GIT binary patch literal 775 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2@KN#5=*4F5rJ!QSPQ85o%Mc)B=- zXoxayWb*q9R4}AKRYUv#z>wJgBs<#J)c(JJP&DZpb#%>fYGlIY3|#{~h7(7RGn7;| s5O1Tlju}pyuv$d2pU4h9tkw^R;4C|t#oPBcO$Ax*>FVdQ&MBb@03CBQX#fBK literal 0 HcmV?d00001 diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml index e2b48824b6b..03ea1d421b3 100644 --- a/res/skins/LateNight/skin_settings.xml +++ b/res/skins/LateNight/skin_settings.xml @@ -30,7 +30,7 @@ Description: @@ -83,14 +83,14 @@ Description: stacked - 190f,17f + 180min,17f 0f,0f SubmenuCover stacked - 190f,17f + 180min,17f [Skin],show_rate_controls @@ -135,6 +135,11 @@ Description: + + SkinSettingsSeparator + 1min,6f + +