diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_on_blue.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_on.svg similarity index 100% rename from res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_on_blue.svg rename to res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_on.svg diff --git a/res/skins/LateNight/palemoon/buttons/btn__pref_checkbox.svg b/res/skins/LateNight/palemoon/buttons/btn__pref_checkbox.svg new file mode 100644 index 00000000000..8d1dc960e00 --- /dev/null +++ b/res/skins/LateNight/palemoon/buttons/btn__pref_checkbox.svg @@ -0,0 +1,3 @@ + + + diff --git a/res/skins/LateNight/palemoon/buttons/btn__pref_checkbox_disabled.svg b/res/skins/LateNight/palemoon/buttons/btn__pref_checkbox_disabled.svg new file mode 100644 index 00000000000..ee8ea6028f8 --- /dev/null +++ b/res/skins/LateNight/palemoon/buttons/btn__pref_checkbox_disabled.svg @@ -0,0 +1,3 @@ + + + diff --git a/res/skins/LateNight/palemoon/buttons/btn__pref_radio_button_on.svg b/res/skins/LateNight/palemoon/buttons/btn__pref_radio_button_on.svg new file mode 100644 index 00000000000..7c3c214c8ee --- /dev/null +++ b/res/skins/LateNight/palemoon/buttons/btn__pref_radio_button_on.svg @@ -0,0 +1,4 @@ + + + + diff --git a/res/skins/LateNight/palemoon/buttons/btn__pref_spinbox_down.svg b/res/skins/LateNight/palemoon/buttons/btn__pref_spinbox_down.svg new file mode 100644 index 00000000000..717eadb488d --- /dev/null +++ b/res/skins/LateNight/palemoon/buttons/btn__pref_spinbox_down.svg @@ -0,0 +1,4 @@ + + + + diff --git a/res/skins/LateNight/palemoon/buttons/btn__pref_spinbox_up.svg b/res/skins/LateNight/palemoon/buttons/btn__pref_spinbox_up.svg new file mode 100644 index 00000000000..98d750c66cd --- /dev/null +++ b/res/skins/LateNight/palemoon/buttons/btn__pref_spinbox_up.svg @@ -0,0 +1,4 @@ + + + + diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss index aa9e5bcd129..bdb5cce6a56 100644 --- a/res/skins/LateNight/style_palemoon.qss +++ b/res/skins/LateNight/style_palemoon.qss @@ -79,7 +79,8 @@ #SidebarCoverSplitter:handle, #LibrarySplitter::handle, #LibraryFeatureControls, -QAbstractScrollArea::corner { +QAbstractScrollArea::corner, +DlgPreferences QAbstractScrollArea::corner { border-top: 1px solid #212123; border-right: 1px solid #111; border-bottom: 1px solid #020202; @@ -1376,6 +1377,7 @@ WSearchLineEdit QAbstractScrollArea, WEffectSelector QAbstractScrollArea, WEffectChainPresetSelector QAbstractScrollArea, #fadeModeCombobox QAbstractScrollArea, +/*DlgPreferences QAbstractScrollArea,*/ #GuiToggleButton[displayValue="0"], #RecDuration[highlight="0"], #BroadcastButton[displayValue="0"], @@ -2794,7 +2796,8 @@ WTrackTableViewHeader::down-arrow { WEffectSelector QAbstractScrollArea QScrollBar, WEffectChainPresetSelector QAbstractScrollArea QScrollBar, WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar, -WSearchLineEdit QAbstractScrollArea QScrollBar { +WSearchLineEdit QAbstractScrollArea QScrollBar, +DlgPreferences QAbstractScrollArea QScrollBar { border: 0px solid #585858; background: #000; border-radius: 2px; @@ -2805,7 +2808,8 @@ WSearchLineEdit QAbstractScrollArea QScrollBar { WEffectSelector QAbstractScrollArea QScrollBar:horizontal, WEffectChainPresetSelector QAbstractScrollArea QScrollBar:horizontal, WEffectChainPresetSelector QAbstractScrollArea QScrollBar:horizontal, - WSearchLineEdit QAbstractScrollArea QScrollBar:horizontal { + WSearchLineEdit QAbstractScrollArea QScrollBar:horizontal, + DlgPreferences QAbstractScrollArea QScrollBar:horizontal { min-width: 12px; height: 15px; border-top-left-radius: 0px; @@ -2816,7 +2820,8 @@ WSearchLineEdit QAbstractScrollArea QScrollBar { WEffectSelector QAbstractScrollArea QScrollBar:vertical, WEffectChainPresetSelector QAbstractScrollArea QScrollBar:vertical, WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar:vertical, - WSearchLineEdit QAbstractScrollArea QScrollBar:vertical { + WSearchLineEdit QAbstractScrollArea QScrollBar:vertical, + DlgPreferences QAbstractScrollArea QScrollBar:vertical { min-height: 12px; width: 15px; border-top-left-radius: 0px; @@ -2834,7 +2839,8 @@ WSearchLineEdit QAbstractScrollArea QScrollBar { WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal, WEffectChainPresetSelector QAbstractScrollArea QScrollBar::handle:horizontal, WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::handle:horizontal, - WSearchLineEdit QAbstractScrollArea QScrollBar::handle:horizontal { + WSearchLineEdit QAbstractScrollArea QScrollBar::handle:horizontal, + DlgPreferences QAbstractScrollArea QScrollBar::handle:horizontal { background-color: #333338; min-width: 25px; } @@ -2842,7 +2848,8 @@ WSearchLineEdit QAbstractScrollArea QScrollBar { WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical, WEffectChainPresetSelector QAbstractScrollArea QScrollBar::handle:vertical, WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::handle:vertical, - WSearchLineEdit QAbstractScrollArea QScrollBar::handle:vertical { + WSearchLineEdit QAbstractScrollArea QScrollBar::handle:vertical, + DlgPreferences QAbstractScrollArea QScrollBar::handle:vertical { background-color: #333338; min-height: 25px; } @@ -2857,7 +2864,9 @@ WEffectChainPresetSelector QAbstractScrollArea QScrollBar::sub-page, WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::add-page, WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::sub-page, WSearchLineEdit QAbstractScrollArea QScrollBar::add-page, -WSearchLineEdit QAbstractScrollArea QScrollBar::sub-page { +WSearchLineEdit QAbstractScrollArea QScrollBar::sub-page, +DlgPreferences QAbstractScrollArea QScrollBar::add-page, +DlgPreferences QAbstractScrollArea QScrollBar::sub-page { min-width: 15px; min-height: 15px; background-color: #000; @@ -2873,7 +2882,9 @@ WEffectChainPresetSelector QAbstractScrollArea QScrollBar::sub-line, WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::add-line, WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::sub-line, WSearchLineEdit QAbstractScrollArea QScrollBar::add-line, -WSearchLineEdit QAbstractScrollArea QScrollBar::sub-line { +WSearchLineEdit QAbstractScrollArea QScrollBar::sub-line, +DlgPreferences QAbstractScrollArea QScrollBar::add-line, +DlgPreferences QAbstractScrollArea QScrollBar::sub-line { width: 0px; height: 0px; border: 0px; @@ -2884,7 +2895,8 @@ WSearchLineEdit QAbstractScrollArea QScrollBar::sub-line { WEffectSelector QAbstractScrollArea QScrollBar::corner, WEffectChainPresetSelector QAbstractScrollArea QScrollBar::corner, WEffectChainPresetButton QMenu QAbstractScrollArea QScrollBar::corner, -WSearchLineEdit QAbstractScrollArea QScrollBar::corner { +WSearchLineEdit QAbstractScrollArea QScrollBar::corner, +DlgPreferences QAbstractScrollArea QScrollBar::corner { border: 0px; border: 0px; background-color: #1e1e1e; @@ -3041,7 +3053,8 @@ WEffectSelector QAbstractScrollArea, WEffectChainPresetButton QMenu, WEffectChainPresetSelector QAbstractScrollArea, WSearchLineEdit QAbstractScrollArea, -#fadeModeCombobox QAbstractScrollArea { +#fadeModeCombobox QAbstractScrollArea, +DlgPreferences QComboBox QAbstractScrollArea { border: 1px solid #333; border-radius: 1px; } @@ -3082,7 +3095,8 @@ WEffectChainPresetButton QMenu QCheckBox, #fadeModeCombobox QAbstractScrollArea, #fadeModeCombobox::item, WSearchLineEdit QAbstractScrollArea, -WSearchLineEdit::item { +WSearchLineEdit::item, +DlgPreferences QComboBox QAbstractScrollArea { background-color: #151517; } /* hovered items */ @@ -3127,7 +3141,8 @@ WSearchLineEdit::item:selected, } WEffectSelector QAbstractItemView, WEffectChainPresetSelector QAbstractItemView, - WSearchLineEdit QAbstractItemView { + WSearchLineEdit QAbstractItemView, + DlgPreferences QComboBox QAbstractItemView { selection-color: #fff; selection-background-color: #2c454f; border-radius: 1px; @@ -3249,3 +3264,314 @@ WSearchLineEdit::indicator:unchecked:selected { } /************** common styles for WEffectSelector ****************************** *************** QSpinBox, QMenu, QToolTip *************************************/ + + +/************** styles for Track Properties & Preferences ********************** +*******************************************************************************/ +DlgPreferences, +DlgPreferencePage, +DlgPreferencePage > QWidget, +DlgPreferences QAbstractScrollArea, +DlgPreferences QStackedWidget, +DlgPreferencePage QTabWidget::pane, +#DlgTrackInfo, +#DlgTrackInfoMulti, +#DlgTrackInfo QTabWidget::pane, +#DlgTrackInfoMulti QTabWidget::pane { + background: #282828; /* without ::pane it's rendered as #323232 */ + padding: 0px; + margin: 0px; + qproperty-layoutSpacing: 0; + } + DlgPreferences, + #DlgTrackInfo, + #DlgTrackInfoMulti { + /* we need to set a border to get the bg color */ + border: 0px solid red; + } + DlgPreferencePage QTabWidget::pane, + #DlgTrackInfo QTabWidget::pane, + #DlgTrackInfoMulti QTabWidget::pane { + border: 1px solid #444; + /* eliminate bottom border of tab */ + top: -1; + } + +DlgPreferences QTreeWidget, +DlgPreferences QListView { + background-color: #202020; + color: #c2b3a5; +} + +DlgPreferencePage QTabBar::tab-bar { + bottom: 1px; +} +DlgPreferencePage QTabBar::tab, +#DlgTrackInfo QTabBar::tab, +#DlgTrackInfoMulti QTabBar::tab { + color: #c2b3a5; + background-color: #202020; + border: 1px solid #202020; + /* fake/restore hidden top border of tab pane */ + border-bottom: 1px solid #444; + border-radius: 2px; + padding: 4px 10px; + } + DlgPreferencePage QTabBar::tab:selected, + #DlgTrackInfo QTabBar::tab:selected, + #DlgTrackInfoMulti QTabBar::tab:selected { + color: #decec0; + background-color: #282828; + border: 1px solid #444; + border-bottom: 0px; + border-bottom-left-radius: 0px; + border-bottom-right-radius: 0px; + } + DlgPreferencePage QTabBar::tab:focus, + #DlgTrackInfo QTabBar::tab:focus, + #DlgTrackInfoMulti QTabBar::tab:focus { + /* background-color: none;*/ + outline: nones; + border: 1px solid #257b82; + border-bottom: 0px; + } + +DlgPreferencePage QGroupBox, +#DlgTrackInfo QGroupBox, +#DlgTrackInfoMulti QGroupBox { + background: transparent; + border: 1px solid #444; + border-radius: 1px; + /*padding: 0px; + margin-top: 0px; + qproperty-layoutSpacing: 0;*/ + } +DlgPreferencePage QGroupBox { + margin-top: 0.6em; + padding-top: 0.2em; + } + DlgPreferencePage QGroupBox::title { + color: #decec0; + font-weight: bold; + subcontrol-origin: margin; + subcontrol-position: top left; + padding: 0em 0.2em 0 0em; + margin: 0px 0px 0px 0em; + } + +DlgPreferencePage QLabel, +DlgPreferencePage QCheckBox, +DlgPreferencePage QRadioButton, +DlgPreferencePage QCheckBox, +#DlgTrackInfo QLabel, +#DlgTrackInfo WStarRating, +#DlgTrackInfoMulti QLabel, +#DlgTrackInfoMulti WStarRating { + /* same as QTabWidget::pane */ + background: #282828; + color: #c2b3a5; +} + +DlgPreferencePage QLineEdit, +DlgPreferencePage QSpinBox, +DlgPreferencePage QDoubleSpinBox, +#DlgTrackInfo QLineEdit, +#DlgTrackInfo QPlainTextEdit, +#DlgTrackInfo QSpinBox, +#DlgTrackInfo QDoubleSpinBox, +#DlgTrackInfoMulti QLineEdit, +#DlgTrackInfoMulti QPlainTextEdit, +#DlgTrackInfoMulti QSpinBox, +#DlgTrackInfoMulti QDoubleSpinBox { + /* these inherit styles from + WLibrary QLineEdit, + WLibrary QPlainTextEdit, + #LibraryBPMSpinBox + so override properties as required */ + /* Also used for border of CoverArtLabel?? */ + color: #c2b3a5; + background-color: #1f1f1f; + border: 1px solid #444; + padding: 2px; + } + #DlgTrackInfo QPlainTextEdit, + #DlgTrackInfoMulti QPlainTextEdit { + padding: 0px; + } + DlgPreferencePage QLineEdit:focus, + DlgPreferencePage QPlainTextEdit:focus, + DlgPreferencePage QSpinBox:focus, + #DlgTrackInfo QLineEdit:focus, + #DlgTrackInfo QPlainTextEdit:focus, + #DlgTrackInfo QSpinBox:focus, + #DlgTrackInfoMulti QLineEdit:focus, + #DlgTrackInfoMulti QPlainTextEdit:focus, + #DlgTrackInfoMulti QSpinBox:focus { + border: 1px solid #257b82; + } + DlgPreferencePage QLineEdit:disabled, + DlgPreferences QComboBox:disabled, + DlgPreferencePage QSpinBox:disabled, + DlgPreferences QDoubleSpinBox:disabled, + #DlgTrackInfo QDoubleSpinBox:disabled, + #DlgTrackInfo QCheckBox:disabled { + color: #888; + background-color: #282828; + } + +#DlgTrackInfo WCoverArtLabel, +#DlgTrackInfoMulti WCoverArtLabel { + border: 0px; +} + +DlgPreferences QPushButton, +DlgPreferences QToolButton, /* Library font selector */ +DlgPreferences QComboBox, +DlgPreferencePage QComboBox, +#DlgTrackInfo QPushButton, +#DlgTrackInfoMulti QPushButton { + outline: none; + border-width: 2px 2px 2px 2px; + border-image: url(skins:LateNight/palemoon/buttons/btn_embedded_library.svg) 2 2 2 2; + background-color: #333; + color: #decec0; + padding: 2px 4px; + } + DlgPreferencePage QPushButton:focus, + #DlgTrackInfo QPushButton:focus, + #DlgTrackInfoMulti QPushButton:focus { + outline: none; + border-width: 2px 2px 2px 2px; + border-image: url(skins:LateNight/palemoon/buttons/btn_embedded_library_focus_blue.svg) 2 2 2 2; + } +DlgPreferences QComboBox::drop-down { + border: 0px solid green; +} +DlgPreferences QComboBox::down-arrow, +#DlgTrackInfo #btnColorPicker::menu-indicator, +#DlgTrackInfoMulti #btnColorPicker::menu-indicator { + padding: 0px; + margin: 0px; + border: 0px; + image: url(skins:LateNight/palemoon/buttons/btn__fx_selector_down.svg); + width: 16px; + height: 24px; +} + +DlgPreferences QSpinBox::up-button, +DlgPreferences QSpinBox::down-button, +DlgPreferences QDoubleSpinBox::up-button, +DlgPreferences QDoubleSpinBox::down-button, +#DlgTrackInfo QDoubleSpinBox::up-button, +#DlgTrackInfo QDoubleSpinBox::down-button { + border: 0; + /* height: 10px;*/ + /* width: 28px;*/ + margin-right: 3px; + } + DlgPreferences QSpinBox::up-button, + DlgPreferences QDoubleSpinBox::up-button, + #DlgTrackInfo QDoubleSpinBox::up-button { + image: url(skins:LateNight/palemoon/buttons/btn__pref_spinbox_up.svg) no-repeat; + } + DlgPreferences QSpinBox::down-button, + DlgPreferences QDoubleSpinBox::down-button, + #DlgTrackInfo QDoubleSpinBox::down-button { + image: url(skins:LateNight/palemoon/buttons/btn__pref_spinbox_down.svg) no-repeat; + } + +DlgPreferences QCheckBox::indicator, +DlgPreferences QRadioButton::indicator, +#DlgTrackInfo QCheckBox::indicator, +#DlgTrackInfoMulti QCheckBox::indicator { + width: 0.8em; + height: 0.8em; + margin-top: 0.1em; /* align icon with text */ + } + #DlgTrackInfo QCheckBox::indicator:unchecked, + #DlgTrackInfoMulti QCheckBox::indicator:unchecked, + DlgPreferences QCheckBox::indicator:unchecked { + image: url(skins:LateNight/palemoon/buttons/btn__pref_checkbox.svg); + } + #DlgTrackInfo QCheckBox::indicator:disabled:unchecked, + #DlgTrackInfoMulti QCheckBox::indicator:disabled:unchecked, + DlgPreferences QCheckBox::indicator:disabled:unchecked { + image: url(skins:LateNight/palemoon/buttons/btn__pref_checkbox_disabled.svg); + } + #DlgTrackInfo QCheckBox::indicator:checked, + #DlgTrackInfoMulti QCheckBox::indicator:checked, + DlgPreferences QCheckBox::indicator:checked { + image: url(skins:LateNight/palemoon/buttons/btn__lib_checkmark_blue.svg); + } + #DlgTrackInfo QCheckBox::indicator:disabled:checked, + #DlgTrackInfoMulti QCheckBox::indicator:disabled:checked, + DlgPreferences QCheckBox::indicator:disabled:checked { + image: url(skins:LateNight/palemoon/buttons/btn__lib_checkmark_grey.svg); + } + + DlgPreferences QRadioButton::indicator:checked { + image: url(skins:LateNight/palemoon/buttons/btn__pref_radio_button_on.svg) center center; + } + DlgPreferences QRadioButton::indicator:unchecked { + image: url(skins:LateNight/palemoon/buttons/btn__lib_radio_button_off.svg) center center; + } + +DlgPreferences QSlider::groove:horizontal { + border: 1px solid #333; + border-radius: 2px; + background-color: #111; + height: 3px; + } + DlgPreferences QSlider::groove:disabled:horizontal { + border: 1px solid #333; + border-radius: 2px; + background-color: #222; + height: 3px; + } + DlgPreferences QSlider::sub-page:horizontal { + height: 4px; + background-color: #4097BA; + margin: 1px; + } + DlgPreferences QSlider::sub-page:disabled:horizontal { + height: 4px; + background-color: #444; + margin: 1px; + } + DlgPreferences QSlider::handle:horizontal { + height: 18px; + width: 12px; + border: 1px solid #666; + border-radius: 2px; + background-color: #444; + /* make handle taller than slider groove */ + margin: -6px 0px; + } + +/* TODO Preferences + + QSpinBox buttons + + * Controllers: mapping tables + + * Library: directory list view + + * QComboBox views: + * white borders at top/bottom + * frame + + * Treeview: + * selected item colors + + * clicked buttons + + * scrollbars + + * Mixer: crossfader curve graph + + * Broadcasting: + * conn. profile table + * Description box + + * inactive QCheckBoxes + + */ diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp index 396f85d1d91..739ec8307b9 100644 --- a/src/controllers/dlgprefcontroller.cpp +++ b/src/controllers/dlgprefcontroller.cpp @@ -448,12 +448,14 @@ void DlgPrefController::enumerateMappings(const QString& selectedMappingPath) { // qDebug() << "Enumerating mappings for controller" << m_pController->getName(); // Check the text color of the palette for whether to use dark or light icons + // TODO Update icons when stylesheet is set QDir iconsPath; - if (!Color::isDimColor(palette().text().color())) { - iconsPath.setPath(":/images/preferences/light/"); - } else { - iconsPath.setPath(":/images/preferences/dark/"); - } + // if (!Color::isDimColor(palette().text().color())) { + // iconsPath.setPath(":/images/preferences/light/"); + // } else { + // iconsPath.setPath(":/images/preferences/dark/"); + // } + iconsPath.setPath(":/images/preferences/light/"); // Insert a dummy item at the top to try to make it less confusing. // (We don't want the first found file showing up as the default item when a diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp index 47b32bcc021..e6251b05012 100644 --- a/src/library/dlgtrackinfo.cpp +++ b/src/library/dlgtrackinfo.cpp @@ -35,11 +35,10 @@ const mixxx::Duration kMaxInterval = mixxx::Duration::fromMillis( } // namespace DlgTrackInfo::DlgTrackInfo( + QWidget* pParent, UserSettingsPointer pUserSettings, const TrackModel* trackModel) - // No parent because otherwise it inherits the style parent's - // style which can make it unreadable. Bug #673411 - : QDialog(nullptr), + : QDialog(pParent), m_pUserSettings(std::move(pUserSettings)), m_pTrackModel(trackModel), m_tapFilter(this, kFilterLength, kMaxInterval), diff --git a/src/library/dlgtrackinfo.h b/src/library/dlgtrackinfo.h index a05a7bfcb5f..aa20fe69e2d 100644 --- a/src/library/dlgtrackinfo.h +++ b/src/library/dlgtrackinfo.h @@ -30,6 +30,7 @@ class DlgTrackInfo : public QDialog, public Ui::DlgTrackInfo { public: // TODO: Remove dependency on TrackModel explicit DlgTrackInfo( + QWidget* pParent, UserSettingsPointer pUserSettings, const TrackModel* trackModel = nullptr); ~DlgTrackInfo() override = default; diff --git a/src/library/dlgtrackinfomulti.cpp b/src/library/dlgtrackinfomulti.cpp index 80326da771e..d06ad2d3705 100644 --- a/src/library/dlgtrackinfomulti.cpp +++ b/src/library/dlgtrackinfomulti.cpp @@ -95,10 +95,10 @@ void setCommonValueOrVariousStringAndFormatFont(QLabel* pLabel, } // namespace -DlgTrackInfoMulti::DlgTrackInfoMulti(UserSettingsPointer pUserSettings) - // No parent because otherwise it inherits the style parent's - // style which can make it unreadable. Bug #673411 - : QDialog(nullptr), +DlgTrackInfoMulti::DlgTrackInfoMulti( + QWidget* pParent, + UserSettingsPointer pUserSettings) + : QDialog(pParent), m_pUserSettings(std::move(pUserSettings)), m_pWCoverArtMenu(make_parented(this)), m_pWCoverArtLabel(make_parented(this, m_pWCoverArtMenu)), diff --git a/src/library/dlgtrackinfomulti.h b/src/library/dlgtrackinfomulti.h index 5c531127972..2c534203daf 100644 --- a/src/library/dlgtrackinfomulti.h +++ b/src/library/dlgtrackinfomulti.h @@ -25,7 +25,9 @@ class WCoverArtLabel; class DlgTrackInfoMulti : public QDialog, public Ui::DlgTrackInfoMulti { Q_OBJECT public: - explicit DlgTrackInfoMulti(UserSettingsPointer pUserSettings); + explicit DlgTrackInfoMulti( + QWidget* pParent, + UserSettingsPointer pUserSettings); ~DlgTrackInfoMulti() override = default; void loadTracks(const QList& pTracks); diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp index f02692c2b81..d156a46e1c8 100644 --- a/src/mixxxmainwindow.cpp +++ b/src/mixxxmainwindow.cpp @@ -332,6 +332,8 @@ void MixxxMainWindow::initialize() { m_pMenuBar->setStyleSheet(m_pCentralWidget->styleSheet()); } + m_pPrefDlg->setStyleSheet(m_pCentralWidget->styleSheet()); + // Check direct rendering and warn user if they don't have it if (!CmdlineArgs::Instance().getSafeMode()) { checkDirectRendering(); @@ -1205,6 +1207,7 @@ void MixxxMainWindow::rebootMixxxView() { return; } m_pMenuBar->setStyleSheet(m_pCentralWidget->styleSheet()); + m_pPrefDlg->setStyleSheet(m_pCentralWidget->styleSheet()); setCentralWidget(m_pCentralWidget); #ifdef __LINUX__ diff --git a/src/preferences/dialog/dlgpreferences.cpp b/src/preferences/dialog/dlgpreferences.cpp index 47b96b9fa06..4e09c61ef81 100644 --- a/src/preferences/dialog/dlgpreferences.cpp +++ b/src/preferences/dialog/dlgpreferences.cpp @@ -91,11 +91,13 @@ DlgPreferences::DlgPreferences( } // Check the text color of the palette for whether to use dark or light icons - if (!Color::isDimColor(palette().text().color())) { - m_iconsPath.setPath(":/images/preferences/light/"); - } else { - m_iconsPath.setPath(":/images/preferences/dark/"); - } + // TODO Update icons when stylesheet is set + // if (!Color::isDimColor(palette().text().color())) { + // m_iconsPath.setPath(":/images/preferences/light/"); + //} else { + // m_iconsPath.setPath(":/images/preferences/dark/"); + //} + m_iconsPath.setPath(":/images/preferences/light/"); // Construct widgets for use in tabs. m_soundPage = PreferencesPage( diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp index 6630fa6c8b1..568b51c8d83 100644 --- a/src/skin/legacy/legacyskinparser.cpp +++ b/src/skin/legacy/legacyskinparser.cpp @@ -2266,7 +2266,7 @@ QString LegacySkinParser::getStyleFromNode(const QDomNode& node) { // switched to QFrame and there should be no reason we would ever use a // QGroupBox in a skin. To support legacy skins, we rewrite QGroupBox // selectors to use WWidgetGroup directly. - style = style.replace("QGroupBox", "WWidgetGroup"); + // style = style.replace("QGroupBox", "WWidgetGroup"); return style; } diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp index b7fa3eda6d7..306ea3e6e0d 100644 --- a/src/widget/wtrackmenu.cpp +++ b/src/widget/wtrackmenu.cpp @@ -2539,6 +2539,7 @@ void WTrackMenu::slotShowDlgTrackInfo() { // Use the batch editor. // Create a fresh dialog on invocation. m_pDlgTrackInfoMulti = std::make_unique( + this, m_pConfig); connect(m_pDlgTrackInfoMulti.get(), &QDialog::finished, @@ -2559,6 +2560,7 @@ void WTrackMenu::slotShowDlgTrackInfo() { // Use the single-track editor with Next/Prev buttons and DlgTagFetcher. // Create a fresh dialog on invocation. m_pDlgTrackInfo = std::make_unique( + this, m_pConfig, m_pTrackModel); connect(m_pDlgTrackInfo.get(),