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.

Sign up for GitHub

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

Jump to bottom

WCueMenuPopup: add checkmark icon to selected color, unstyle popup la… #1

Closed
wants to merge 1 commit into from
Closed

WCueMenuPopup: add checkmark icon to selected color, unstyle popup la… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions res/skins/Deere/icon/ic_colorpicker_checkmark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ QAbstractScrollArea::corner {
background-color: #222;
}

WWidget, QLabel {
WWidget, WLibrary QLabel {
font-family: "Open Sans";
font-size: 12px;
text-transform: uppercase;
Expand Down Expand Up @@ -1745,6 +1745,10 @@ WPushButton[value="2"]:hover {
WCueMenuPopup #CueRemoveButton {
qproperty-icon: url(:/images/library/ic_library_cross.svg);
}
/* selected color */
WColorPicker QPushButton:pressed {
background-image: url(skin:/icon/ic_colorpicker_checkmark.svg) no-repeat center center;
}

WRecordingDuration {
font-weight: bold;
Expand Down
7 changes: 7 additions & 0 deletions res/skins/LateNight/buttons/btn_colorpicker_checkmark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 13 additions & 11 deletions res/skins/LateNight/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
}

#Mixxx, WWidget,
WLabel, QLabel,
WPushButton, QPushButton,
WLabel, WLibrary QLabel,
WPushButton, WLibrary QPushButton,
WEffect, WEffectSelector,
WBeatSpinBox,
QSpinBox {
Expand All @@ -26,16 +26,11 @@ WBeatSpinBox,
QSpinBox,
/* Hotcue labels in the overview */
WOverview,
/* Edit label and pushbuttons in the hotcue label edit dialog */
WOverview QLabel,
WOverview QPushButton {
/* 'Edit' label in the hotcue label edit dialog */
WOverview QLabel {
font-family: "Open Sans";
text-transform: none;
}
WOverview QLabel,
WOverview QPushButton {
font-weight: normal;
}

QToolTip {
font-family: Ubuntu;
Expand All @@ -47,7 +42,7 @@ QToolTip {
border-radius: 2px;
}

WPushButton, QPushButton {
WPushButton, WLibary QPushButton {
font-size: 11px/12px;
}

Expand Down Expand Up @@ -477,7 +472,7 @@ WOverview {
color: #0bd9d1;
}

QLabel, QRadioButton,
WLibary QLabel, WLibary QRadioButton,
WSearchLineEdit,
#LibraryBPMSpinBox,
#LibraryBPMButton::item,
Expand Down Expand Up @@ -580,6 +575,13 @@ WTime {
WCueMenuPopup #CueRemoveButton {
qproperty-icon: url(:/images/library/ic_library_cross.svg);
}
/* selected color */
WColorPicker QPushButton:pressed {
/* when setting a background-image the button suddenly gets a '3D' border.
'no-repeat' is not applied, so in order to show the icon only once it needs to be
approximately the size of the pushbutton [42 x 24 - 2 x 2px border width]. */
background-image: url(skin:/buttons/btn_colorpicker_checkmark.svg) no-repeat center center;
}


/********************** Decks **********************/
Expand Down
7 changes: 7 additions & 0 deletions res/skins/Shade/btn/btn_colorpicker_checkmark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions res/skins/Shade/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,10 @@ QSplitter::handle:pressed { image: url(skin:/style/style_handle_checked.png); ba
QSplitter::handle:horizontal { width: 6px; }
QSplitter::handle:vertical { height: 6px;}

QPushButton { font-size: 10pt;
WLibrary QPushButton { font-size: 10pt;
font-family: "Open Sans";}
/* Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome */
QLabel, QRadioButton {
WLibrary QLabel, WLibrary QRadioButton {
font-size: 10pt;
background: transparent;
color: #C1C1C1;}
Expand Down Expand Up @@ -601,3 +601,7 @@ QPushButton#pushButtonRepeatPlaylist {
WCueMenuPopup #CueRemoveButton {
qproperty-icon: url(:/images/library/ic_library_cross.svg);
}
/* selected color */
WColorPicker QPushButton:pressed {
background-image: url(skin:/btn/btn_colorpicker_checkmark.svg) no-repeat center center;
}
7 changes: 7 additions & 0 deletions res/skins/Tango/buttons/btn_colorpicker_checkmark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions res/skins/Tango/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ WWidgetGroup {
WCueMenuPopup #CueRemoveButton {
qproperty-icon: url(:/images/library/ic_library_cross.svg);
}
/* selected color */
WColorPicker QPushButton:pressed {
background-image: url(skin:/buttons/btn_colorpicker_checkmark.svg) no-repeat center center;
}

/* ################################################################
####### Colors ##################################################
Expand Down