Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Allow skin styles for sidebar context menu #2297

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ae1915e
parent right-lick menu to WSidebar in History & Computer feature
ronso0 Sep 23, 2019
ab68f46
add skin styles for right-click menus (Tracks, sidebar, hotcues, cove…
ronso0 Sep 23, 2019
e664f73
allow to override OS style of Crates submenu in Tracks table
ronso0 Sep 23, 2019
d662aad
remove duplicate include QMenu
ronso0 Sep 23, 2019
5a58e9d
LateNight: add custom submenu arrow
ronso0 Sep 24, 2019
c8ab2cc
use nullptr, add/move m_pMenu->clear()
ronso0 Sep 24, 2019
ad518b1
creat QMenu only once when the sidebarwidget is bound to library
ronso0 Oct 4, 2019
2dc6126
add AutoDJ, Playlists and Crates feature
ronso0 Oct 4, 2019
18c17a3
move feature includes to library.h
ronso0 Oct 5, 2019
be96d29
fix AutoDJ main context menu, test if Crates sub menu is also stylabl…
ronso0 Oct 5, 2019
6d9cb58
default m_pMenu to nullptr
ronso0 Oct 5, 2019
63b37c9
test: add stylable menu to iTunes feature
ronso0 Oct 5, 2019
acdb70c
reorder QMenu iniatilation according to compiler warnings
ronso0 Oct 5, 2019
5455772
fix AutoDJ menu test
ronso0 Oct 5, 2019
5d3b9f6
Merge branch 'master' of https://github.com/mixxxdj/mixxx into sideba…
ronso0 Oct 6, 2019
f07ab40
increase menu padding a bit to separate icons and text
ronso0 Oct 7, 2019
fa2a88f
fix AutoDJ 'm_pCrateMenu' and 'm_pBrowseFeature'
ronso0 Oct 7, 2019
439744a
Merge branch 'master' of https://github.com/mixxxdj/mixxx into sideba…
ronso0 Oct 19, 2019
cf68108
use nullptr instead of NULL in setlogfeature
ronso0 Oct 23, 2019
9cf9275
style Shade menu & tooltip, adapt WEffecetSeletor & library button style
ronso0 Oct 26, 2019
0b390c6
refine LateNight qmenu & effect selector style
ronso0 Oct 26, 2019
99972ff
add Deere qmenu, tooltip & effect selector style
ronso0 Oct 26, 2019
2191c8d
refine Shade qmenu & effect selector style
ronso0 Oct 26, 2019
e3d2b69
Merge branch 'master' of https://github.com/mixxxdj/mixxx into sideba…
ronso0 Oct 26, 2019
95de89e
Shade: fix some scaling and color scheme issues
ronso0 Oct 26, 2019
bbe3511
Shade: use pixel font for Broadcast button
ronso0 Oct 26, 2019
913a227
tweak LateNight menu checkbox
ronso0 Oct 26, 2019
9821062
fix scaling issues, tweak menus
ronso0 Oct 27, 2019
25d6303
test: parent qmenu to QApplication::focusWidget()
ronso0 Oct 27, 2019
76d6e44
style Tango skin settings menu like context menus
ronso0 Oct 28, 2019
e403dca
Test: just bind sidebar widget, parent menu on right-click
ronso0 Oct 28, 2019
9ee5595
style LateNight skin settings like context menus
ronso0 Oct 28, 2019
85366f5
all lib features: bind sidebar widget, use as parent for right-click …
ronso0 Oct 28, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions res/skins/Deere/icon/ic_library_checkmark_blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
239 changes: 169 additions & 70 deletions res/skins/Deere/style.qss
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,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;
}

Expand Down Expand Up @@ -323,9 +323,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 {
Expand All @@ -335,10 +335,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)
}
Expand All @@ -354,6 +359,7 @@ WSearchLineEdit {
border: 1px solid #4B4B4B;
background-color: #1e1e1e;
color: #d2d2d2;
font-size: 13px;
}

WSearchLineEdit:focus {
Expand Down Expand Up @@ -522,11 +528,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 */
Expand Down Expand Up @@ -748,7 +754,9 @@ QAbstractScrollArea::corner {
background-color: #222;
}

WWidget, QLabel {
WWidget,
QLabel,
QPushButton {
font-family: "Open Sans";
font-size: 12px;
text-transform: uppercase;
Expand Down Expand Up @@ -1135,60 +1143,6 @@ WBeatSpinBox,
image: url(skin:/icon/ic_power_48px.svg) no-repeat center center;
}

WEffectSelector {
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;
}

WEffectSelector:hover {
border: 1px ridge #015d8d;
}

WEffectSelector::drop-down {
/* This causes the Qt theme's widget style to magically not apply. Go figure. */
border: 0;
}

WEffectSelector::down-arrow {
width: 20px;
height: 20px;
image: url(skin:/icon/ic_chevron_down_48px.svg);
}

WEffectSelector QAbstractItemView {
color: #c1cabe;
background-color: #201f1f;
}

WEffectSelector::item:!selected {
background-color: #201f1f;
}

WEffectSelector::item:selected {
background-color: #080808;
}

/* currently loaded effect */
WEffectSelector::checked {
color: #4495F4;
font-weight: bold;
}

#EffectKnob {
}

Expand Down Expand Up @@ -1838,7 +1792,6 @@ do not highlight either state. */
stop: 0.66 #5F5F5F,
stop: 0.67 #5F5F5F,
stop: 1 #5F5F5F);

border: 0px solid #0080BE;
}

Expand All @@ -1851,7 +1804,6 @@ do not highlight either state. */
stop: 0.66 #4B4B4B,
stop: 0.67 #006596,
stop: 1 #006596);

border: 0px solid #006596;
}

Expand All @@ -1865,7 +1817,6 @@ do not highlight either state. */
stop: 0.66 #5F5F5F,
stop: 0.67 #0080BE,
stop: 1 #0080BE);

border: 0px solid #0080BE;
}

Expand All @@ -1878,7 +1829,6 @@ do not highlight either state. */
stop: 0.660000 #4B4B4B,
stop: 0.670000 #006596,
stop: 1 #006596);

border: 0px solid #006596;
}

Expand All @@ -1892,7 +1842,6 @@ do not highlight either state. */
stop: 0.660000 #5F5F5F,
stop: 0.670000 #0080BE,
stop: 1 #0080BE);

border: 0px solid #0080BE;
}

Expand Down Expand Up @@ -1946,11 +1895,161 @@ do not highlight either state. */
** End Buttons ***************************************************************
*******************************************************************************/

QToolTip {
background-color: #222222;
color: #CCCCCC;
border: 1px solid #CCCCCC;

WEffectSelector QAbstractItemView,
QToolTip,
QMenu,
QMenu QCheckBox {
padding: 2px;
font: 13px;
}
WEffectSelector QAbstractItemView {
min-width: 140px;
}
/* common colors for WEffectSelector, QMenu, QToolTip */
WEffectSelector QAbstractItemView,
WEffectSelector::indicator:!checked,
QToolTip,
QMenu,
QMenu::item,
QMenu QCheckBox {
color: #c1cabe;
background-color: #201f1f;
}
WEffectSelector QAbstractItemView,
QToolTip,
QMenu {
border-width: 1px;
border-style: solid;
border-color: #aaa;
border-radius: 1px;
}
/* hovered items */
WEffectSelector::item:selected,
QMenu::item:selected,
QMenu QCheckBox:selected,
QMenu QCheckBox:focus, /* selected by keyboard */
QMenu QCheckBox:hover /* mouse hover */ {
background-color: #565353;
color: #000;
/* remove OS focus indicator */
outline: none;
}



WEffectSelector {
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;
}

WEffectSelector:hover {
border: 1px ridge #015d8d;
}
WEffectSelector::drop-down {
/* This causes the Qt theme's widget style to magically not apply. Go figure. */
border: 0;
}
WEffectSelector::down-arrow {
width: 20px;
height: 20px;
image: url(skin:/icon/ic_chevron_down_48px.svg);
}
WEffectSelector::item:!selected {
background-color: #201f1f;
}
/* currently loaded effect */
WEffectSelector::checked {
color: #4495F4;
font-weight: bold;
}
WEffectSelector::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,
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 {
padding: 5px 13px 5px 20px;
}
QMenu::item:!enabled {
color: #555;
}
QMenu QCheckBox {
padding: 2px 10px 2px 3px;
}
QMenu QCheckBox::indicator {
width: 13px;
height: 13px;
border-radius: 1px;
/* remove OS focus indicator */
outline: none;
}
QMenu QCheckBox::indicator:checked {
image: url(skin:/icon/ic_library_checkmark.svg);
border: 1px solid #0f0f0f;
}
QMenu QCheckBox::indicator:!checked {
image: none;
border: 1px solid #666;
background-color: #222;
}
QMenu QCheckBox::indicator:!enabled {
color: #555;
border: 1px solid #333;
}
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 {
Expand Down
Binary file added res/skins/LateNight/buttons/btn_kill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/LateNight/buttons/btn_menu_arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading