Skins: consolidate all common, platform-specific menu styles in one f…

…ile per platform
mixxxdj · May 1, 2021 · 4ae2713 · 4ae2713
1 parent 7cd6be0
commit 4ae2713
Show file tree

Hide file tree

Showing 23 changed files with 101 additions and 269 deletions.
diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml
@@ -80,9 +80,9 @@
 
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:../Deere/style.qss"
-         src-linux="skin:../Deere/style-linux.qss"
-         src-windows="skin:../Deere/style-windows.qss"
-         src-mac="skin:../Deere/style-mac.qss"/>
+         src-mac="skin:../Deere/style-mac.qss"
+         src-linux="skin:../default-menu-styles-linux.qss"
+         src-windows="skin:../default-menu-styles-windows.qss"/>
 
   <Size>1008me,550me</Size>
   <Layout>horizontal</Layout>

diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
@@ -79,9 +79,9 @@
 
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:../Deere/style.qss"
-         src-linux="skin:../Deere/style-linux.qss"
-         src-windows="skin:../Deere/style-windows.qss"
-         src-mac="skin:../Deere/style-mac.qss"/>
+         src-mac="skin:../Deere/style-mac.qss"
+         src-linux="skin:../default-menu-styles-linux.qss"
+         src-windows="skin:../default-menu-styles-windows.qss"/>
 
   <Size>1008me,550me</Size>
   <Layout>horizontal</Layout>

diff --git a/res/skins/Deere/style-linux.qss b/res/skins/Deere/style-linux.qss
diff --git a/res/skins/Deere/style-mac.qss b/res/skins/Deere/style-mac.qss
@@ -1,21 +1,18 @@
-/*  push skin settings Close button to the left so it's not in the same screen
-    position as the Open button.
-    fixes lp1795663 "settings panel disappears instantly after opening it in Tango & Deere skin"
-*/
+/*  push skin settings Close button to the left so it's not in
+    the same screen position as the Open button. Fixes lp1795663
+    "settings panel disappears instantly after opening it in Tango & Deere skin" */
 #SkinSettingsTop {
   padding-right: 27px;
 }
 
-
-/* Previously necessayr hack to hide the checkmark, otherwise text gets cut off
-on the right on Retina screens. This can only be done for macOS
-because it cuts off text on the left on KDE
-WEffectSelector QAbstractItemView {
-  margin: 0 0 0 -24px;
+/* Previously necessary hack to avoid cut-off effect names with scaled checkbox
+    on Macs with Retina screens */
+/* WEffectSelector QAbstractItemView {
+  margin: 0px 0px 0px -27px;
 } */
 
-/* hide the checkmark just in case the above shows a
-partial checkmark on some untested screen
-WEffectSelector::indicator {
+/* just in case there is a partial checkmark shown on some
+  untested screen, hide the checkmark */
+/* WEffectSelector::indicator {
     border: 0;
 } */
diff --git a/res/skins/Deere/style-windows.qss b/res/skins/Deere/style-windows.qss
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
@@ -2137,16 +2137,18 @@ QLineEdit QMenu::separator {
   border-top: 1px solid #0a0a0a;
 }
 
+/* All menus that have at least one item with a checkbox*/
 WLibrarySidebar QMenu::item,
 WLibrary QHeaderView QMenu::item,
-WTrackMenu::item,
-WTrackMenu QMenu::item {
+#CratesMenu::item {
 /* padding-right reserves space for the submenu expand arrow
   padding-left should be bigger than the menu icon width +
   icon margin-left/-right */
   padding: 5px 12px 5px 26px;
 }
 
+WTrackMenu::item,
+WTrackMenu QMenu::item,
 /* This catches context menus of
   - property cells in the tracks table
   - WCueMenuPopup cue label editor

diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
@@ -282,8 +282,8 @@
 
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:style.qss"
-         src-linux="skin:style_linux.qss"
-         src-windows="skin:style_windows.qss"/>
+         src-linux="skin:../default-menu-styles-linux.qss"
+         src-windows="skin:../default-menu-styles-windows.qss"/>
   <!-- MinimumSize should not be an exact monitor resolution. There needs
   to be space for the title bar or other chrome at full screen.
   https://www.mixxx.org/wiki/doku.php/skin_guidelines#the_optimal_size_for_skins -->

diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
@@ -181,16 +181,18 @@ QLineEdit QMenu::separator {
   margin: 4px;
 }
 
+/* All menus that have at least one item with a checkbox*/
 WLibrarySidebar QMenu::item,
 WLibrary QHeaderView QMenu::item,
-WTrackMenu QMenu::item {
+#CratesMenu::item {
 /* padding-right reserves space for the submenu expand arrow
   padding-left should be bigger than the menu icon width +
   icon margin-left/-right */
   padding: 5px 12px 5px 26px;
 }
 
 WTrackMenu::item,
+WTrackMenu QMenu::item,
 /* This catches context menus of
   - property cells in the tracks table
   - WCueMenuPopup cue label editor

diff --git a/res/skins/LateNight/style_linux.qss b/res/skins/LateNight/style_linux.qss
diff --git a/res/skins/LateNight/style_windows.qss b/res/skins/LateNight/style_windows.qss
diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
@@ -217,9 +217,8 @@
   -->
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:style.qss"
-         src-mac="skin:style_mac.qss"
-         src-linux="skin:style_linux.qss"
-         src-windows="skin:style_windows.qss"/>
+         src-linux="skin:../default-menu-styles-linux.qss"
+         src-windows="skin:../default-menu-styles-windows.qss"/>
   <Size>1008e,500e</Size>
   <Layout>vertical</Layout>
     <LaunchImageStyle>

diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
@@ -392,16 +392,18 @@ WEffectSelector QAbstractScrollArea,
     border-color: #666;
   }
 
+/* All menus that have at least one item with a checkbox*/
 WLibrarySidebar QMenu::item,
 WLibrary QHeaderView QMenu::item,
-WTrackMenu::item,
-WTrackMenu QMenu::item {
+#CratesMenu::item {
 /* padding-right reserves space for the submenu expand arrow
   padding-left should be bigger than the menu icon width +
   icon margin-left/-right */
   padding: 5px 12px 5px 26px;
 }
 
+WTrackMenu::item,
+WTrackMenu QMenu::item,
 /* This catches context menus of
   - property cells in the tracks table
   - WCueMenuPopup cue label editor

diff --git a/res/skins/Shade/style_linux.qss b/res/skins/Shade/style_linux.qss
diff --git a/res/skins/Shade/style_mac.qss b/res/skins/Shade/style_mac.qss
diff --git a/res/skins/Shade/style_windows.qss b/res/skins/Shade/style_windows.qss
diff --git a/res/skins/Tango (64 Samplers)/skin.xml b/res/skins/Tango (64 Samplers)/skin.xml
@@ -127,9 +127,9 @@
 
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:../Tango/style.qss"
-         src-linux="skin:../Tango/style-linux.qss"
-         src-windows="skin:../Tango/style-windows.qss"
-         src-mac="skin:../Tango/style-mac.qss"/>
+         src-mac="skin:../Tango/style-mac.qss"
+         src-linux="skin:../default-menu-styles-linux.qss"
+         src-windows="skin:../default-menu-styles-windows.qss"/>
   <MinimumSize>1008,500</MinimumSize>
   <SizePolicy>me,me</SizePolicy>
   <Layout>vertical</Layout>

diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
@@ -121,9 +121,9 @@
 
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:../Tango/style.qss"
-         src-linux="skin:../Tango/style-linux.qss"
-         src-windows="skin:../Tango/style-windows.qss"
-         src-mac="skin:../Tango/style-mac.qss"/>
+         src-mac="skin:../Tango/style-mac.qss"
+         src-linux="skin:../default-menu-styles-linux.qss"
+         src-windows="skin:../default-menu-styles-windows.qss"/>
   <MinimumSize>1008,500</MinimumSize>
   <SizePolicy>me,me</SizePolicy>
   <Layout>vertical</Layout>

diff --git a/res/skins/Tango/style-linux.qss b/res/skins/Tango/style-linux.qss
diff --git a/res/skins/Tango/style-mac.qss b/res/skins/Tango/style-mac.qss
@@ -1,18 +1,18 @@
-/*  push skin settings Close button to the left so it's not in the same screen
-    position as the Open button.
-    fixes lp1795663 "settings panel disappears instantly after opening it in Tango & Deere skin"
-*/
+/*  push skin settings Close button to the left so it's not in
+    the same screen position as the Open button. Fixes lp1795663
+    "settings panel disappears instantly after opening it in Tango & Deere skin" */
 #SkinSettingsHeader {
   padding-right: 27px;
 }
 
-/* Previously necessary hack around text getting cut off with scaled checkbox on Macs with Retina screens
-WEffectSelector QAbstractItemView {
-	margin: 0px 0px 0px -27px;
+/* Previously necessary hack to avoid cut-off effect names with scaled checkbox
+    on Macs with Retina screens */
+/* WEffectSelector QAbstractItemView {
+  margin: 0px 0px 0px -27px;
 } */
 
-/* just in case there is a partial checkmark shown on some untested screen, hide
-the checkmark
-WEffectSelector::indicator {
+/* just in case there is a partial checkmark shown on some
+  untested screen, hide the checkmark */
+/* WEffectSelector::indicator {
     border: 0;
 } */