Deere: style main menubar

mixxxdj · Apr 14, 2021 · 4083cf5 · 4083cf5
1 parent 36d453e
commit 4083cf5
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 2 deletions.
diff --git a/res/skins/Deere/icon/ic_mainmenu_checkbox.svg b/res/skins/Deere/icon/ic_mainmenu_checkbox.svg
diff --git a/res/skins/Deere/icon/ic_mainmenu_checkbox_checked.svg b/res/skins/Deere/icon/ic_mainmenu_checkbox_checked.svg
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
@@ -78,7 +78,10 @@
   </manifest>
 
   <ObjectName>Mixxx</ObjectName>
-  <Style src="skin:../Deere/style.qss" src-mac="skin:../Deere/style-mac.qss"/>
+  <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"/>
 
   <Size>1008me,550me</Size>
   <Layout>horizontal</Layout>

diff --git a/res/skins/Deere/style-linux.qss b/res/skins/Deere/style-linux.qss
@@ -0,0 +1,19 @@
+
+#MainMenu::item {
+}
+#MainMenu QMenu::item {
+  padding: 0.1em 0.3em 0.2em 0.3em;
+  margin: 0em 0em 0em 1.4em;
+  }
+  /* Checkbox preceeding menu items */
+  #MainMenu QMenu::indicator {
+    /*width: 1em;*/
+    /*height: 1em;*/
+    margin: 0em -0.1em 0em -1.5em;
+    padding: 0.2em 0em 0.2em 0em;
+  }
+  #MainMenu QMenu::indicator,
+  #MainMenu QMenu::indicator:selected,
+  #MainMenu QMenu::indicator:checked,
+  #MainMenu QMenu::indicator:checked:selected {
+  }
diff --git a/res/skins/Deere/style-windows.qss b/res/skins/Deere/style-windows.qss
@@ -0,0 +1,34 @@
+
+#MainMenu::item {
+}
+#MainMenu QMenu::item {
+  padding: 0.1em 0.3em 0.2em 0.3em;
+  margin: 0em 0em 0em 1.2em;
+  }
+  /* Checkbox preceeding menu items */
+  #MainMenu QMenu::indicator {
+    /*width: 1em;*/
+    /*height: 1em;*/
+    margin: 0em 0em 0em -1.3em;
+    padding: 0.3em 0em 0.3em 0.3em;
+  }
+  #MainMenu QMenu::indicator,
+  #MainMenu QMenu::indicator:selected,
+  #MainMenu QMenu::indicator:checked,
+  #MainMenu QMenu::indicator:checked:selected {
+  }
+
+/* Icons  (copy, paste, ...) in context menus of
+    - property cells in the tracks table
+    - WCueMenuPopup cue label editor
+    - WBeatSpinBox
+    - AutoDJ transition QSpinBox */
+#LibraryContainer QMenu::icon,
+QLineEdit QMenu::icon,
+/* - checkbox in Crate name context menu
+      "[ ] Auto DJ Track Source"
+   - QHeaderView QMenu::indicator */
+#LibraryContainer QMenu::indicator {
+  /* Linux: margin-right pushes the entire icon to the right !?? */
+  margin: 0px -20px 0px 5px;
+    }
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
@@ -977,7 +977,6 @@ WBeatSpinBox,
 #ToolBar {
   padding: 0px 4px 0px 4px;
   qproperty-layoutSpacing: 5;
-  background-color: #111111;
   border-width: 0px 0px 3px 0px;
   border-style: solid;
   border-color: #222;
@@ -1924,6 +1923,12 @@ WEffectSelector QAbstractScrollArea,
 WEffectSelector QAbstractScrollArea,
 #fadeModeCombobox QAbstractScrollArea,
 QToolTip,
+#MainMenu,
+#MainMenu::item,
+#MainMenu QMenu,
+#MainMenu QMenu::item,
+#MainMenu QMenu QCheckBox,
+#ToolBar,
 #LibraryContainer QMenu,
 #LibraryContainer QMenu::item,
 #LibraryContainer QMenu QCheckBox,
@@ -1960,6 +1965,12 @@ WTrackMenu QMenu {
   border-radius: 1px;
 }
   /* hovered items */
+  #MainMenu::item:selected,
+  #MainMenu QMenu::item:selected,
+  #MainMenu QMenu::item:focus,
+  #MainMenu QMenu::item:hover,
+  #MainMenu QMenu::indicator:checked:selected,
+  #MainMenu QMenu::indicator:unchecked:selected,
   WEffectSelector::item:selected,
   #fadeModeCombobox::item:selected,
   WBeatSpinBox QMenu::item:selected,
@@ -1983,6 +1994,42 @@ WTrackMenu QMenu {
       outline: none;
     }
 
+#MainMenu {
+  margin-bottom: 0px;
+  padding-bottom: 0px;
+  }
+  #MainMenu::item {
+    /* No big deal, just try to make it look like native menus */
+    padding: 0.1em 0.5em 0.1em 0.5em;
+    margin: 0em;
+  }
+  #MainMenu QMenu {
+    padding: 0.08em;
+    border: 1px solid #888;
+    border-radius: 2px;
+  }
+  #MainMenu QMenu::separator {
+    height: 0px;
+    margin: 0.25em;
+    border-top: 1px solid #0a0a0a;
+  }
+  #MainMenu QMenu::right-arrow {
+    width: 0.7em;
+    height: 0.7em;
+  }
+
+  #MainMenu QMenu::indicator {
+    width: 1em;
+    height: 1em;
+  }
+  #MainMenu QMenu::indicator:checked,
+  #MainMenu QMenu::indicator:checked:selected {
+    image: url(skin:/icon/ic_mainmenu_checkbox_checked.svg);
+  }
+  #MainMenu QMenu::indicator:unchecked,
+  #MainMenu QMenu::indicator:unchecked:selected {
+    image: url(skin:/icon/ic_mainmenu_checkbox.svg);
+  }
 
 
 WEffectSelector:!editable,
@@ -2138,6 +2185,8 @@ WEffectSelector:!editable:on {
     image: url(skin:/icon/ic_library_checkmark.svg);
     }
   /* disabled menu item and checkbox */
+  #MainMenu::item:!enabled,
+  #MainMenu QMenu::item:!enabled,
   #LibraryContainer QMenu::item:!enabled,
   WBeatSpinBox QMenu::item:!enabled,
   WCueMenuPopup QMenu::item:!enabled,
@@ -2172,6 +2221,11 @@ WEffectSelector:!editable:on {
   WTrackMenu QMenu::right-arrow {
     width: 16px;
     height: 16px;
+  }
+  #MainMenu QMenu::right-arrow,
+  #LibraryContainer QMenu::right-arrow,
+  WTrackMenu::right-arrow,
+  WTrackMenu QMenu::right-arrow {
     image: url(skin:/icon/ic_chevron_right_48px.svg);
   }