Merge pull request #12380 from ronso0/lib-checkmark-fix

Fix track color background with Qt6
mixxxdj · Dec 1, 2023 · 6acfe63 · 6acfe63
2 parents 0f0deb1 + b56244b
commit 6acfe63
Show file tree

Hide file tree

Showing 15 changed files with 143 additions and 71 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -884,6 +884,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/parsercsv.cpp
   src/library/parserm3u.cpp
   src/library/parserpls.cpp
+  src/library/playcountdelegate.cpp
   src/library/playlisttablemodel.cpp
   src/library/previewbuttondelegate.cpp
   src/library/proxytrackmodel.cpp

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
@@ -223,15 +223,16 @@ WLibrarySidebar {
 }
 
 /* Prevent OS-style checkbox from being rendered underneath the custom style. */
-WTrackTableView::item,
+#LibraryPlayedCheckbox::item,
 #LibraryBPMButton::item {
   border: 0px;
 }
 
 /* Selected rows in Tree and Tracks table */
 WTrackTableView::item:selected,
 WLibrarySidebar::item:selected,
-#LibraryBPMButton::item:selected {
+#LibraryBPMButton::item:selected,
+#LibraryPlayedCheckbox::item:selected {
   color: #D6D6D6;
   background-color: #006596;
 }
@@ -279,10 +280,10 @@ WBeatSpinBox,
 }
 
 /* checkbox in library "Played" column */
-WTrackTableView::indicator:unchecked {
+#LibraryPlayedCheckbox::indicator:unchecked {
   image: url(skin:/../Deere/icon/ic_library_checkbox.svg);
 }
-WTrackTableView::indicator:checked {
+#LibraryPlayedCheckbox::indicator:checked {
   image: url(skin:/../Deere/icon/ic_library_checkbox_checked.svg);
 }
 

diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
@@ -301,6 +301,11 @@ WTrackTableViewHeader::item {
     padding: 0 0.15em;
   }
 
+/* Prevent OS-style checkbox from being rendered underneath the custom style. */
+#LibraryBPMButton::item,
+#LibraryPlayedCheckbox::item {
+  border: 0px;
+}
 
 #HotcueButton {
   /* ronso0

diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
@@ -1099,10 +1099,10 @@ WSearchLineEdit QAbstractScrollArea,
 #SkinSettingsLabelButton,
 #SkinSettingsNumToggleHeader[displayValue="1"],
 WSearchLineEdit,
+WTrackTableView,
 #LibraryBPMSpinBox,
 #LibraryBPMButton::item,
-WTrackTableView,
-WTrackTableView::indicator,
+#LibraryPlayedCheckbox::item,
 WLibraryTextBrowser,
 WLibrarySidebar,
 #LibraryFeatureControls QLabel,
@@ -2065,15 +2065,11 @@ WLibraryTextBrowser:focus {
   border: 1px solid #d09300;
 }
 
-/* Prevent OS-style checkbox from being rendered underneath the custom style. */
-WTrackTableView::item,
-#LibraryBPMButton::item {
-  border: 0px;
-}
 /* Selected rows in Tree and Tracks table */
 WLibrarySidebar::item:selected,
 WTrackTableView::item:selected,
-#LibraryBPMButton::item:selected {
+#LibraryBPMButton::item:selected,
+#LibraryPlayedCheckbox::item:selected {
   color: #fff;
   background-color: #5e4507;
 }
@@ -2088,7 +2084,7 @@ WLibrarySidebar::item:!selected:focus {
 /* Use the native focus decoration */
 /* This is for all cells including Played and Location */
 WTrackTableView,
-/* This is for the BPM cell */
+/* This is for the BPM and play count cells */
 WTrackTableView QCheckBox:focus {
   outline: 1px solid #fff;
 }
@@ -2143,6 +2139,12 @@ WLibrary QPlainTextEdit,
     #LibraryBPMSpinBox::down-button {
       image: url(skin:../LateNight/classic/buttons/btn__lib_bpm_down.svg) no-repeat;
     }
+#LibraryPlayedCheckbox::indicator:checked {
+  image: url(skin:../LateNight/classic/buttons/btn__lib_checkbox_checked.svg);
+}
+#LibraryPlayedCheckbox::indicator:unchecked {
+  image: url(skin:../LateNight/classic/buttons/btn__lib_checkbox.svg);
+}
 
 WCueMenuPopup QPushButton:focus {
   outline: none;
@@ -2607,15 +2609,6 @@ QPlainTextEdit QMenu::item:disabled {
     image: url(skin:../LateNight/classic/style/menu_arrow_white.svg);
   }
 
-/* This is the only way to select the 'Played' checkbox.
-  Note that this also selects the BPM lock. */
-  WTrackTableView::indicator:checked {
-    image: url(skin:../LateNight/classic/buttons/btn__lib_checkbox_checked.svg);
-    }
-  WTrackTableView::indicator:unchecked {
-    image: url(skin:../LateNight/classic/buttons/btn__lib_checkbox.svg);
-    }
-
   #MainMenu QMenu::separator,
   WLibrarySidebar QMenu::separator,
   WTrackTableViewHeader QMenu::separator,

diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
@@ -1189,10 +1189,9 @@ WEffectChainPresetSelector,
 WSearchLineEdit,
 WTime,
 #PreviewDeckTextBox, #PreviewTitle, #PreviewBPM,
-#LibraryBPMSpinBox,
-#LibraryBPMButton::item,
 WTrackTableView,
-WTrackTableView::indicator,
+#LibraryBPMButton::item,
+#LibraryPlayedCheckbox::item,
 WLibraryTextBrowser,
 WLibrarySidebar,
 #LibraryFeatureControls QLabel,
@@ -2550,15 +2549,11 @@ WLibrarySidebar {
 WLibrarySidebar {
   outline: none;
 }
-/* Prevent OS-style checkbox from being rendered underneath the custom style. */
-WTrackTableView::item,
-#LibraryBPMButton::item {
-  border: 0px;
-}
 /* Selected rows in Tree and Tracks table */
 WLibrarySidebar::item:selected,
 WTrackTableView::item:selected,
-#LibraryBPMButton::item:selected {
+#LibraryBPMButton::item:selected,
+#LibraryPlayedCheckbox::item:selected {
   color: #fff;
   background-color: #2c454f;
 }
@@ -2583,7 +2578,7 @@ WLibrarySidebar {
 /* Use the native focus decoration */
 /* This is for all cells including Played and Location */
 WTrackTableView,
-/* This is for the BPM cell */
+/* This is for the BPM and play count cells */
 WTrackTableView QCheckBox:focus {
   outline: 1px solid #fff;
 }
@@ -2631,6 +2626,10 @@ WLibrary QPlainTextEdit,
       image: url(skin:../LateNight/palemoon/buttons/btn__lib_spinbox_down.svg) no-repeat center center;
       }
 
+#LibraryPlayedCheckbox::indicator:unchecked {
+  image: url(skin:../LateNight/palemoon/buttons/btn__lib_checkbox.svg);
+}
+
 /* Button in library "Preview" column */
 #LibraryPreviewButton {
   margin: 0px;
@@ -3080,14 +3079,9 @@ QPlainTextEdit QMenu::item:disabled {
       image: url(skin:../LateNight/palemoon/buttons/btn__menu_checkbox.svg);
     }
 
-  /* This is the only way to select the 'Played' checkbox.
-    Note that this also selects the BPM lock, so style that afterwards. */
-  WTrackTableView::indicator:unchecked {
-    image: url(skin:../LateNight/palemoon/buttons/btn__lib_checkbox.svg);
-  }
   WLibrarySidebar QMenu::indicator:checked,
   WTrackTableViewHeader QMenu::indicator:checked,
-  WTrackTableView::indicator:checked,
+  #LibraryPlayedCheckbox::indicator:checked,
   WTrackMenu QMenu QCheckBox::indicator:checked,
   WEffectChainPresetButton QMenu QCheckBox::indicator:checked {
     image: url(skin:../LateNight/palemoon/buttons/btn__lib_checkmark_blue.svg);

diff --git a/res/skins/Shade/btn/btn_lib_bpm_unlocked_black.svg b/res/skins/Shade/btn/btn_lib_bpm_unlocked_black.svg
diff --git a/res/skins/Shade/btn/btn_lib_bpm_unlocked_white.svg b/res/skins/Shade/btn/btn_lib_bpm_unlocked_white.svg
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
@@ -453,7 +453,6 @@ WLibraryTextBrowser,
 WLibrarySidebar {
   border: 1px solid #585858;
   font-weight: normal;
-  color: #9e9e9e;
   background-color: #0f0f0f;
   alternate-background-color: #1a1a1a;
 /* In selected library rows this sets the color of
@@ -467,9 +466,18 @@ WLibraryTextBrowser {
   padding-left: 10px;
 }
 
+WTrackTableView,
+WLibraryTextBrowser,
+WLibrarySidebar,
+#LibraryBPMButton::item,
+#LibraryPlayedCheckbox::item {
+  color: #9e9e9e;
+}
+
+
 /* Prevent OS-style checkbox from being rendered underneath the custom style. */
-WTrackTableView::item,
-#LibraryBPMButton::item {
+#LibraryBPMButton::item,
+#LibraryPlayedCheckbox::item {
   border: 0px;
 }
 
@@ -478,7 +486,8 @@ WSearchLineEdit::item:selected,
 WSearchLineEdit::item:checked,
 WLibrarySidebar::item:selected,
 WLibrarySidebar::branch:selected,
-#LibraryBPMButton::item:selected {
+#LibraryBPMButton::item:selected,
+#LibraryPlayedCheckbox::item:selected {
   color: #fff;
   background-color: #656d75;
   }
@@ -507,7 +516,7 @@ WLibrarySidebar::item:!selected:focus {
 /* Use the native focus decoration */
 /* This is for all cells including Played and Location */
 WTrackTableView,
-/* This is for the BPM cell */
+/* This is for the BPM and play count cells */
 WTrackTableView QCheckBox:focus {
   outline: 1px solid #c9c9c9;
 }
@@ -536,9 +545,9 @@ WTrackTableView {
     #LibraryBPMButton::indicator:unchecked {
       image: url(skin:/btn/btn_lib_bpm_unlocked.svg);
       }
-  #LibraryBPMButton::item {
-    color: #cfcfcf;
-    }
+    #LibraryBPMButton::indicator:unchecked:selected {
+      image: url(skin:/btn/btn_lib_bpm_unlocked_black.svg);
+      }
     WLibrary > QCheckBox {
       text-align: right;
       alignment: right;
@@ -586,15 +595,10 @@ WTrackTableView {
 
 
   /* checkbox in library "Played" column */
-  WTrackTableView::indicator {
-    margin: 0px;
-    padding: 0px;
-    border: 0px;
-    }
-  WTrackTableView::indicator:unchecked {
+  #LibraryPlayedCheckbox::indicator:unchecked {
     image: url(skin:/btn/btn_lib_checkbox.svg);
     }
-  WTrackTableView::indicator:checked {
+  #LibraryPlayedCheckbox::indicator:checked {
     image: url(skin:/btn/btn_lib_checkbox_checked.svg);
     }
 

diff --git a/res/skins/Shade/style_dark.qss b/res/skins/Shade/style_dark.qss
@@ -154,6 +154,7 @@ WEffectSelector::indicator:unchecked:selected,
 
 WTrackTableView,
 WLibrarySidebar {
+  selection-color: #000;
   /* background of Color delegate in selected row */
   selection-background-color: #666;
   /*outline: 1px solid yellow;*/
@@ -172,16 +173,11 @@ WSearchLineEdit QToolButton:focus {
   image: url(skin:/btn/btn_lib_clear_search_focus_green.svg);
 }
 
-/* Prevent OS-style checkbox from being rendered underneath the custom style. */
-WTrackTableView::item,
-#LibraryBPMButton::item {
-  border: 0px;
-}
-
 WLibrarySidebar::item:selected,
 WTrackTableView::item:selected,
 WLibrarySidebar::branch:selected,
-#LibraryBPMButton::item:selected {
+#LibraryBPMButton::item:selected,
+#LibraryPlayedCheckbox::item:selected {
   color: #000;
   selection-color: #000;
   background-color: #666;
@@ -193,7 +189,7 @@ WLibrarySidebar::item:focus {
 /* Use the native focus decoration */
 /* This is for all cells including Played and Location */
 WTrackTableView,
-/* This is for the BPM cell */
+/* This is for the BPM and play count cells */
 WTrackTableView QCheckBox:focus {
   outline: 1px solid #ccc;
 }
@@ -220,7 +216,7 @@ WTrackTableView {
   }
 
 /* checkbox in library "Played" column */
-WTrackTableView::indicator:unchecked:selected {
+#LibraryPlayedCheckbox::indicator:unchecked:selected {
   background: none;
   color: #cfcfcf;
   border: 1px solid #000;

diff --git a/res/skins/Shade/style_summer_sunset.qss b/res/skins/Shade/style_summer_sunset.qss
@@ -154,6 +154,10 @@ WSearchLineEdit:focus {
   border-color: #78C70B;
 }
 
+#LibraryBPMButton::indicator:unchecked:selected {
+  image: url(skin:/btn/btn_lib_bpm_unlocked_white.svg);
+}
+
 #LibraryFeatureControls QPushButton:enabled {
   background-color: #998A3C;
   border: 1px solid #998A3C;

diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
@@ -2556,7 +2556,6 @@ WLibraryTextBrowser,
 WLibrarySidebar {
   border: 2px solid #585858;
   /* font-weight: normal; */
-  color: #9e9e9e;
   background-color: #0f0f0f;
   alternate-background-color: #1a1a1a;
   /* In selected library rows this sets the color of
@@ -2567,16 +2566,24 @@ WLibrarySidebar {
   /* background of Color delegate in selected row */
   selection-background-color: #555;
 }
+WTrackTableView,
+WLibraryTextBrowser,
+WLibrarySidebar,
+#LibraryBPMButton::item,
+#LibraryPlayedCheckbox::item {
+  color: #9e9e9e;
+}
 
 /* Prevent OS-style checkbox from being rendered underneath the custom style. */
-WTrackTableView::item,
+#LibraryPlayedCheckbox::item,
 #LibraryBPMButton::item {
   border: 0px;
 }
 
 /* selected table row */
 WTrackTableView::item:selected,
-#LibraryBPMButton::item:selected {
+#LibraryBPMButton::item:selected,
+#LibraryPlayedCheckbox::item:selected {
   color: #fff;
   background-color: #555;
 }
@@ -3023,10 +3030,6 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
   #LibraryBPMButton::indicator:unchecked {
     image: url(skin:/../Tango/buttons/btn_lib_bpm_unlocked.svg);
     }
-  /* BPM value */
-  #LibraryBPMButton::item {
-    color: #cfcfcf;
-    }
 
 #LibraryBPMSpinBox {
   padding: 0px;
@@ -3079,10 +3082,10 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
     }*/
 
   /* checkbox in library "Played" column */
-  WTrackTableView::indicator:checked {
+  #LibraryPlayedCheckbox::indicator:checked {
     image: url(skin:/../Tango/buttons/btn_lib_checkbox_checked.svg);
     }
-  WTrackTableView::indicator:unchecked {
+  #LibraryPlayedCheckbox::indicator:unchecked {
     image: url(skin:/../Tango/buttons/btn_lib_checkbox.svg);
     }