From a8b1325dd68b4584f776864ec1f2bd2b2b5bf276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nino=20Mi=C5=A1ki=C4=87-Pletenac?= Date: Tue, 21 Dec 2021 01:23:45 +0100 Subject: [PATCH 1/2] Tweak remove/hide track confirm message to match confirm exit message This is seeking to fix https://bugs.launchpad.net/mixxx/+bug/1947992. --- src/widget/wtracktableview.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp index 92ee26bed0a..8392f7356dc 100644 --- a/src/widget/wtracktableview.cpp +++ b/src/widget/wtracktableview.cpp @@ -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); } @@ -814,7 +816,11 @@ void WTrackTableView::hideOrRemoveSelectedTracks() { return; } - response = QMessageBox::question(this, tr("Confirm track removal"), message); + response = QMessageBox::question(this, + tr("Confirm track removal"), + message, + QMessageBox::Yes | QMessageBox::No, + QMessageBox::No); if (response == QMessageBox::Yes) { pTrackModel->removeTracks(indices); } From 49d10e59a12f23f3f4c41ec29d1cb5e85027731e Mon Sep 17 00:00:00 2001 From: ronso0 Date: Sun, 26 Dec 2021 20:57:36 +0100 Subject: [PATCH 2/2] Track Hide/Remove dialog: don't inherit style from WLibrary --- res/skins/Deere/style.qss | 20 +++++++------- res/skins/LateNight/style.qss | 8 +++--- res/skins/LateNight/style_palemoon.qss | 7 ++--- res/skins/Shade/style.qss | 35 +++++++++++++------------ res/skins/Shade/style_dark.qss | 4 +-- res/skins/Shade/style_summer_sunset.qss | 2 +- res/skins/Tango/style.qss | 27 ++++++++++--------- 7 files changed, 53 insertions(+), 50 deletions(-) diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss index fec76762361..db940696c6d 100644 --- a/res/skins/Deere/style.qss +++ b/res/skins/Deere/style.qss @@ -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) @@ -802,7 +802,7 @@ WSearchLineEdit QAbstractScrollArea::corner, #Mixxx, WWidget, QToolTip, -WLabel, QLabel, +WLabel, #LibraryFeatureControls QLabel, WNumber, WNumberPos, WPushButton, WKey, @@ -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; diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index e8c93047056..9faf53b041c 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -4,7 +4,7 @@ #Mixxx, WWidget, -WLabel, QLabel, +WLabel, WNumber, WNumberPos, WPushButton, WKey, @@ -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 diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss index a1b106d939b..d6e2fe78658 100644 --- a/res/skins/LateNight/style_palemoon.qss +++ b/res/skins/LateNight/style_palemoon.qss @@ -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; } diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss index b99805454a7..fa192d22f3b 100644 --- a/res/skins/Shade/style.qss +++ b/res/skins/Shade/style.qss @@ -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, @@ -36,6 +39,8 @@ WLibraryTextBrowser QMenu, QLineEdit QMenu, WCueMenuPopup, WCueMenuPopup QMenu, +WCueMenuPopup QLabel, +WCueMenuPopup QLineEdit, WCoverArtMenu, WTrackMenu, WTrackMenu QMenu, @@ -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 { @@ -233,7 +235,7 @@ WEffectSelector, WEffectSelector QAbstractScrollArea, #fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea, -WLibrary QPushButton:enabled, +#LibraryFeatureControls QPushButton:enabled, WBeatSpinBox, #spinBoxTransition { font-size: 13px; @@ -522,7 +524,7 @@ WTrackTableView { #LibraryBPMButton::item { color: #cfcfcf; } - WLibrary QCheckBox { + WLibrary > QCheckBox { text-align: right; alignment: right; } @@ -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; @@ -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 @@ -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; diff --git a/res/skins/Shade/style_dark.qss b/res/skins/Shade/style_dark.qss index c631f00c154..5a687a2c11e 100644 --- a/res/skins/Shade/style_dark.qss +++ b/res/skins/Shade/style_dark.qss @@ -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 { diff --git a/res/skins/Shade/style_summer_sunset.qss b/res/skins/Shade/style_summer_sunset.qss index 5f86de1649c..0979f340d63 100644 --- a/res/skins/Shade/style_summer_sunset.qss +++ b/res/skins/Shade/style_summer_sunset.qss @@ -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; } diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss index 9b28da1de83..b66d65bec08 100644 --- a/res/skins/Tango/style.qss +++ b/res/skins/Tango/style.qss @@ -15,7 +15,7 @@ background-color: #1e1e1e; } -WLabel, QLabel, +WLabel, WNumber, WNumberPos, WPushButton, WKey, @@ -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; @@ -43,7 +42,9 @@ WLibrary QRadioButton { #MainMenu, #MainMenu QMenu, QToolTip, +WCueMenuPopup, WCueMenuPopup QLabel, +WCueMenuPopup QLineEdit, WTrackMenu, WTrackMenu QMenu, WTrackMenu QMenu QCheckBox, @@ -74,9 +75,9 @@ WPushButton { } WPushButton, -WLibrary QPushButton, -WLibrary QLabel, -WLibrary QRadioButton { +#LibraryFeatureControls QPushButton, +#LibraryFeatureControls QLabel, +#LibraryFeatureControls QRadioButton { font-size: 12px/12px; } @@ -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; @@ -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 */ @@ -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; }