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

Tweak remove/hide track confirm message to match confirm exit message #4577

Merged
merged 3 commits into from
Dec 29, 2021
Merged

Tweak remove/hide track confirm message to match confirm exit message #4577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8b1325
Tweak remove/hide track confirm message to match confirm exit message
ninomp Dec 21, 2021
49d10e5
Track Hide/Remove dialog: don't inherit style from WLibrary
ronso0 Dec 26, 2021
8ddc9b5
Merge remote-tracking branch 'ronso0/qdialog-dont-inherit-style-from-…
ninomp Dec 28, 2021
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
20 changes: 10 additions & 10 deletions res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,24 +493,24 @@ WLibrarySidebar::branch:open:!has-children:has-siblings:selected {
}

/* Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome */
WLibrary QLabel, WLibrary QRadioButton {
#LibraryFeatureControls QLabel, #LibraryFeatureControls QRadioButton {
/* same as QTreeview */
color: #d2d2d2;
margin: 9px 5px 6px 0px;
font-size: 12px;
}

WLibrary QRadioButton::indicator {
#LibraryFeatureControls QRadioButton::indicator {
margin: 0px 0px 0px 2px;
width: 18px;
height: 18px;
}

WLibrary QRadioButton::indicator:checked {
#LibraryFeatureControls QRadioButton::indicator:checked {
image: url(skin:/../Deere/icon/ic_radio_button_on_18px.svg);
}

WLibrary QRadioButton::indicator:unchecked {
#LibraryFeatureControls QRadioButton::indicator:unchecked {
image: url(skin:/../Deere/icon/ic_radio_button_off_18px.svg);
}
/* buttons in library (in hierarchical order of appearance)
Expand Down Expand Up @@ -802,7 +802,7 @@ WSearchLineEdit QAbstractScrollArea::corner,

#Mixxx, WWidget,
QToolTip,
WLabel, QLabel,
WLabel, #LibraryFeatureControls QLabel,
WNumber, WNumberPos,
WPushButton,
WKey,
Expand Down Expand Up @@ -838,16 +838,16 @@ WSearchLineEdit,
WSearchLineEdit QAbstractScrollArea,
#fadeModeCombobox,
#fadeModeCombobox QAbstractScrollArea,
WLibrary QPushButton,
WLibrary QLabel,
WLibrary QRadioButton {
#LibraryFeatureControls QPushButton,
#LibraryFeatureControls QLabel,
#LibraryFeatureControls QRadioButton {
font-family: "Open Sans";
font-style: normal;
font-weight: normal;
}

WLabel, WLibrary QLabel,
WPushButton, WLibrary QPushButton {
WLabel, #LibraryFeatureControls QLabel,
WPushButton, #LibraryFeatureControls QPushButton {
font-size: 12px;
font-weight: bold;
text-transform: uppercase;
Expand Down
8 changes: 4 additions & 4 deletions res/skins/LateNight/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#Mixxx,
WWidget,
WLabel, QLabel,
WLabel,
WNumber, WNumberPos,
WPushButton,
WKey,
Expand All @@ -26,9 +26,9 @@ WEffectChainPresetSelector,
WEffectChainPresetSelector QAbstractScrollArea,
#fadeModeCombobox,
#fadeModeCombobox QAbstractScrollArea,
WLibrary QPushButton,
WLibrary QLabel,
WLibrary QRadioButton,
#LibraryFeatureControls QPushButton,
#LibraryFeatureControls QLabel,
#LibraryFeatureControls QRadioButton,
WTrackTableViewHeader,
WTrackTableViewHeader::section {
/* On Linux all weight variants of Open Sans are identified
Expand Down
7 changes: 4 additions & 3 deletions res/skins/LateNight/style_palemoon.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2789,15 +2789,16 @@ WSearchLineEdit {

/* Extra declaration for QRadioButton otherwise it shows up with wrong colors in
Linux with Gnome */
WLibrary QLabel, WLibrary QRadioButton {
#LibraryFeatureControls QLabel,
#LibraryFeatureControls QRadioButton {
background: transparent;
}

WLibrary QRadioButton::indicator:checked {
#LibraryFeatureControls QRadioButton::indicator:checked {
image: url(skin:/palemoon/buttons/btn__lib_radio_button_on_blue.svg) center center;
}

WLibrary QRadioButton::indicator:unchecked {
#LibraryFeatureControls QRadioButton::indicator:unchecked {
image: url(skin:/palemoon/buttons/btn__lib_radio_button_off.svg) center center;
}

Expand Down
35 changes: 18 additions & 17 deletions res/skins/Shade/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
#Mixxx, WWidget,
WEffectName,
WKey,
WLabel, QLabel,
WLabel,
WNumber, WNumberPos,
WPushButton, WLibrary QPushButton, WLibrary QRadioButton,
WPushButton,
#LibraryFeatureControls QLabel,
#LibraryFeatureControls QPushButton,
#LibraryFeatureControls QRadioButton,
WRecordingDuration,
WTime,
WTrackText,
Expand All @@ -36,6 +39,8 @@ WLibraryTextBrowser QMenu,
QLineEdit QMenu,
WCueMenuPopup,
WCueMenuPopup QMenu,
WCueMenuPopup QLabel,
WCueMenuPopup QLineEdit,
WCoverArtMenu,
WTrackMenu,
WTrackMenu QMenu,
Expand Down Expand Up @@ -79,9 +84,6 @@ that's why we do it in another way here */
border: 0px; */
margin: 0px 0px 2px 1px;
}
WLibrary QPushButton {
border: 1px solid #99A0A4;
}

WBeatSpinBox::up-button,
#spinBoxTransition::up-button {
Expand Down Expand Up @@ -233,7 +235,7 @@ WEffectSelector,
WEffectSelector QAbstractScrollArea,
#fadeModeCombobox,
#fadeModeCombobox QAbstractScrollArea,
WLibrary QPushButton:enabled,
#LibraryFeatureControls QPushButton:enabled,
WBeatSpinBox,
#spinBoxTransition {
font-size: 13px;
Expand Down Expand Up @@ -522,7 +524,7 @@ WTrackTableView {
#LibraryBPMButton::item {
color: #cfcfcf;
}
WLibrary QCheckBox {
WLibrary > QCheckBox {
text-align: right;
alignment: right;
}
Expand Down Expand Up @@ -829,12 +831,9 @@ QSplitter::handle:vertical {
height: 6px;
}

WLibrary QPushButton {
font-size: 10px;
font-family: "Open Sans";
}
/* Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome */
WLibrary QLabel, WLibrary QRadioButton {
#LibraryFeatureControls QLabel,
#LibraryFeatureControls QRadioButton {
font-size: 13px;
background: transparent;
color: #C1C1C1;
Expand All @@ -843,23 +842,24 @@ WLibrary QLabel, WLibrary QRadioButton {

WLibrary { margin: 2px 3px 0px 0px; }

WLibrary QRadioButton {
#LibraryFeatureControls QRadioButton {
margin: 0px 3px 3px 3px;
}
/* Center QLabels */
WLibrary QLabel { margin: 0px 3px 3px 0px; }
#LibraryFeatureControls QLabel {
margin: 0px 3px 3px 0px;
}

WLibrary QRadioButton::indicator:checked {
#LibraryFeatureControls QRadioButton::indicator:checked {
image: url(skin:/btn/btn_lib_radio_button_on_pink.svg) center center;
}

WLibrary QRadioButton::indicator:unchecked {
#LibraryFeatureControls QRadioButton::indicator:unchecked {
image: url(skin:/btn/btn_lib_radio_button_off.svg) center center;
}

#LibraryFeatureControls QPushButton {
text-align: center;
font-size: 9pt;
font-weight: normal;
/* Note(ronso0)
Interferes with skin scaling, system font size respectively
Expand All @@ -874,6 +874,7 @@ WLibrary QRadioButton::indicator:unchecked {
color: #060613;
background-color: #99a0a4;
border: 1px solid #99a0a4;
font-size: 10px;
}
#DlgAutoDJ > #LibraryFeatureControls QPushButton {
padding: 0px;
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Shade/style_dark.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ WTrackTableViewHeader::down-arrow {
border: 1px solid #B79E00;
}

WLibrary QRadioButton::indicator:checked {
image: url(skin:/btn/btn_lib_radio_button_on_mustard.svg) center center;
#LibraryFeatureControls QRadioButton::indicator:checked {
image: url(skin:/btn/btn_lib_radio_button_on_mustard.svg) center center;
}

WRateRange {
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Shade/style_summer_sunset.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ WSearchLineEdit:focus {
border: 1px solid #52F904;
}

WLibrary QRadioButton::indicator:checked {
#LibraryFeatureControls QRadioButton::indicator:checked {
image: url(skin:/btn/btn_lib_radio_button_on_neongreen.svg) center center;
}

Expand Down
27 changes: 14 additions & 13 deletions res/skins/Tango/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
background-color: #1e1e1e;
}

WLabel, QLabel,
WLabel,
WNumber, WNumberPos,
WPushButton,
WKey,
Expand All @@ -26,12 +26,11 @@ WRecordingDuration,
QSpinBox,
WBeatSpinBox,
WOverview #PassthroughLabel,
WCueMenuPopup,
WEffectName,
WLibraryTextBrowser,
WLibrary QPushButton,
WLibrary QLabel,
WLibrary QRadioButton {
#LibraryFeatureControls QPushButton,
#LibraryFeatureControls QLabel,
#LibraryFeatureControls QRadioButton {
font-family: Ubuntu;
font-weight: normal;
font-style: normal;
Expand All @@ -43,7 +42,9 @@ WLibrary QRadioButton {
#MainMenu,
#MainMenu QMenu,
QToolTip,
WCueMenuPopup,
WCueMenuPopup QLabel,
WCueMenuPopup QLineEdit,
WTrackMenu,
WTrackMenu QMenu,
WTrackMenu QMenu QCheckBox,
Expand Down Expand Up @@ -74,9 +75,9 @@ WPushButton {
}

WPushButton,
WLibrary QPushButton,
WLibrary QLabel,
WLibrary QRadioButton {
#LibraryFeatureControls QPushButton,
#LibraryFeatureControls QLabel,
#LibraryFeatureControls QRadioButton {
font-size: 12px/12px;
}

Expand Down Expand Up @@ -3054,7 +3055,7 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
image: url(skin:/../Tango/buttons/btn_lib_checkbox.svg);
}

WLibrary QSpinBox {
#LibraryFeatureControls QSpinBox {
min-height: 22px;
max-height: 22px;
min-width: 40px;
Expand All @@ -3079,8 +3080,8 @@ WSearchLineEdit {
}
/* Clear button: see /skins/default.qss */

WLibrary QLabel,
WLibrary QRadioButton { /*
#LibraryFeatureControls QLabel,
#LibraryFeatureControls QRadioButton { /*
background: none;
Extra declaration for QRadioButton otherwise it shows up with
wrong colors in Linux with Gnome */
Expand All @@ -3097,11 +3098,11 @@ QRadioButton#radioButtonRecentlyAdded {
margin: 0px 3px 0px 5px;
}

WLibrary QRadioButton::indicator:checked {
#LibraryFeatureControls QRadioButton::indicator:checked {
image: url(skin:/../Tango/buttons/btn_lib_radio_button_on.svg) center center;
}

WLibrary QRadioButton::indicator:unchecked {
#LibraryFeatureControls QRadioButton::indicator:unchecked {
image: url(skin:/../Tango/buttons/btn_lib_radio_button_off.svg) center center;
}

Expand Down
10 changes: 8 additions & 2 deletions src/widget/wtracktableview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,9 @@ void WTrackTableView::hideOrRemoveSelectedTracks() {
// Hide tracks if this is the main library table
response = QMessageBox::question(this,
tr("Confirm track hide"),
tr("Are you sure you want to hide the selected tracks?"));
tr("Are you sure you want to hide the selected tracks?"),
QMessageBox::Yes | QMessageBox::No,
QMessageBox::No);
if (response == QMessageBox::Yes) {
pTrackModel->hideTracks(indices);
}
Expand All @@ -814,7 +816,11 @@ void WTrackTableView::hideOrRemoveSelectedTracks() {
return;
}

response = QMessageBox::question(this, tr("Confirm track removal"), message);
response = QMessageBox::question(this,
ronso0 marked this conversation as resolved.
Show resolved Hide resolved
tr("Confirm track removal"),
message,
QMessageBox::Yes | QMessageBox::No,
QMessageBox::No);
if (response == QMessageBox::Yes) {
pTrackModel->removeTracks(indices);
}
Expand Down