Merge branch 'master' of github.com:mixxxdj/mixxx into serato-library…

…-feature
mixxxdj · Feb 15, 2020 · 0c5c24e · 0c5c24e
2 parents 13914af + 26fc46f
commit 0c5c24e
Show file tree

Hide file tree

Showing 257 changed files with 7,449 additions and 4,873 deletions.
diff --git a/.flake8 b/.flake8
@@ -0,0 +1,5 @@
+[flake8]
+# E203 is not PEP8 compliant and is not compatible with black:
+# https://black.readthedocs.io/en/stable/the_black_code_style.html#slices
+# W503 conflicts with black, too.
+ignore = E203,W503
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -78,6 +78,16 @@ repos:
     stages:
     - commit
     - manual
+-   repo: https://github.com/psf/black
+    rev: stable
+    hooks:
+    -   id: black
+        files: ^scripts/.*$
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: '3.7.9'
+    hooks:
+    -   id: flake8
+        files: ^scripts/.*$
 - repo: local
   hooks:
   - id: qsscheck

diff --git a/build/osx/otool.py b/build/osx/otool.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,2 @@
+[tool.black]
+line-length = 79
diff --git a/res/skins/Deere/beatjump.xml b/res/skins/Deere/beatjump.xml
@@ -8,12 +8,13 @@
 <Template>
   <WidgetGroup>
     <Layout>vertical</Layout>
-    <SizePolicy>f,min</SizePolicy>
+    <SizePolicy>min,min</SizePolicy>
     <Children>
 
       <BeatSpinBox>
         <ObjectName>BeatjumpSizeSpinBox</ObjectName>
         <TooltipId>beatjump_size</TooltipId>
+        <Size>54f,25f</Size>
         <Value><Variable name="group"/>,beatjump_size</Value>
       </BeatSpinBox>
 

diff --git a/res/skins/Deere/hotcue_button.xml b/res/skins/Deere/hotcue_button.xml
@@ -11,9 +11,9 @@
   <PushButton>
     <TooltipId>hotcue</TooltipId>
     <ObjectName>HotcueButton</ObjectName>
-    <MinimumSize><Variable name="SquareButtonMinimumSize"/></MinimumSize>
-    <MaximumSize><Variable name="SquareButtonMaximumSize"/></MaximumSize>
-    <SizePolicy><Variable name="SquareButtonSizePolicy"/></SizePolicy>
+    <MinimumSize>18,22</MinimumSize>
+    <MaximumSize>22,22</MaximumSize>
+    <SizePolicy>me,f</SizePolicy>
     <NumberStates>2</NumberStates>
     <LeftClickIsPushButton><Variable name="LeftClickIsPushButton"/></LeftClickIsPushButton>
     <RightClickIsPushButton><Variable name="RightClickIsPushButton"/></RightClickIsPushButton>

diff --git a/res/skins/Deere/hotcues.xml b/res/skins/Deere/hotcues.xml
@@ -16,6 +16,7 @@
       <WidgetGroup>
         <ObjectName>HotcueGrid</ObjectName>
         <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
         <Children>
           <Template src="skin:hotcue_button.xml">
             <SetVariable name="hotcue">1</SetVariable>
@@ -29,6 +30,7 @@
       <WidgetGroup>
         <ObjectName>HotcueGrid</ObjectName>
         <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
         <Children>
           <Template src="skin:hotcue_button.xml">
             <SetVariable name="hotcue">3</SetVariable>
@@ -58,6 +60,7 @@
       <WidgetGroup>
         <ObjectName>HotcueGrid</ObjectName>
         <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
         <Children>
           <Template src="skin:hotcue_button.xml">
             <SetVariable name="hotcue">1</SetVariable>
@@ -77,6 +80,7 @@
       <WidgetGroup>
         <ObjectName>HotcueGrid</ObjectName>
         <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
         <Children>
           <Template src="skin:hotcue_button.xml">
             <SetVariable name="hotcue">5</SetVariable>

diff --git a/res/skins/Deere/icon/ic_delete.svg b/res/skins/Deere/icon/ic_delete.svg
diff --git a/res/skins/Deere/icon/ic_lib_spinbox_down_white.svg b/res/skins/Deere/icon/ic_lib_spinbox_down_white.svg
diff --git a/res/skins/Deere/icon/ic_lib_spinbox_up_white.svg b/res/skins/Deere/icon/ic_lib_spinbox_up_white.svg
diff --git a/res/skins/Deere/icon/ic_library_checkmark_blue.svg b/res/skins/Deere/icon/ic_library_checkmark_blue.svg
diff --git a/res/skins/Deere/icon/ic_library_checkmark_grey.svg b/res/skins/Deere/icon/ic_library_checkmark_grey.svg
diff --git a/res/skins/Deere/library.xml b/res/skins/Deere/library.xml
@@ -4,85 +4,95 @@
     Library widget.
 -->
 <Template>
+<!-- This additional wrapper is necessary for being able to address
+    QMenus in QTableView, QTreeView etc. at once with #LibraryContainer QMenu
+    like in LateNight. Go figure... -->
   <WidgetGroup>
-    <ObjectName>LibraryContainer</ObjectName>
-    <Layout>vertical</Layout>
     <!-- 'Ignore' is the only thing that lets it
           shrink to nothing. -->
     <SizePolicy>me,i</SizePolicy>
+    <Layout>vertical</Layout>
     <Children>
-      <!-- QSplitter between LibrarySidebar and Library -->
-      <Splitter>
-        <ObjectName>LibrarySplitter</ObjectName>
-        <Orientation>horizontal</Orientation>
+      <WidgetGroup>
+        <ObjectName>LibraryContainer</ObjectName>
+        <Layout>vertical</Layout>
         <SizePolicy>me,me</SizePolicy>
-        <SplitSizesConfigKey>[Skin],librarySidebar_splitsize</SplitSizesConfigKey>
-        <SplitSizes>2,8</SplitSizes>
         <Children>
-          <WidgetGroup>
-            <Layout>vertical</Layout>
+          <!-- QSplitter between LibrarySidebar and Library -->
+          <Splitter>
+            <ObjectName>LibrarySplitter</ObjectName>
+            <Orientation>horizontal</Orientation>
+            <SizePolicy>me,me</SizePolicy>
+            <SplitSizesConfigKey>[Skin],librarySidebar_splitsize</SplitSizesConfigKey>
+            <SplitSizes>2,8</SplitSizes>
             <Children>
-              <Template src="skin:preview_deck.xml"/>
               <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <SearchBox>
-                  </SearchBox>
-                  <Template src="skin:hide_show_button.xml">
-                    <SetVariable name="TooltipId">maximize_library</SetVariable>
-                    <SetVariable name="object_name">LibraryToggle</SetVariable>
-                    <SetVariable name="control">[Master],maximize_library</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-              <!-- QSplitter between LibrarySidebar and CoverArt -->
-              <Splitter>
-                <ObjectName>LibraryCoverArtSplitter</ObjectName>
-                <Orientation>vertical</Orientation>
-                <SizePolicy>me,me</SizePolicy>
-                <MinimumSize>30,30</MinimumSize>
-                <SplitSizesConfigKey>[Skin],coverArt_splitsize</SplitSizesConfigKey>
-                <SplitSizes>2,8</SplitSizes>
-                <Collapsible>0,0</Collapsible>
+                <Layout>vertical</Layout>
                 <Children>
-                  <LibrarySidebar>
-                  </LibrarySidebar>
-
-                  <CoverArt>
-                    <ObjectName>LibraryCoverArt</ObjectName>
-                    <TooltipId>coverart</TooltipId>
+                  <Template src="skin:preview_deck.xml"/>
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <SearchBox></SearchBox>
+                      <Template src="skin:hide_show_button.xml">
+                        <SetVariable name="TooltipId">maximize_library</SetVariable>
+                        <SetVariable name="object_name">LibraryToggle</SetVariable>
+                        <SetVariable name="control">[Master],maximize_library</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+                  <!-- QSplitter between LibrarySidebar and CoverArt -->
+                  <Splitter>
+                    <ObjectName>LibraryCoverArtSplitter</ObjectName>
+                    <Orientation>vertical</Orientation>
                     <SizePolicy>me,me</SizePolicy>
                     <MinimumSize>30,30</MinimumSize>
-                    <Connection>
-                      <ConfigKey>[Library],show_coverart</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </CoverArt>
+                    <SplitSizesConfigKey>[Skin],coverArt_splitsize</SplitSizesConfigKey>
+                    <SplitSizes>2,8</SplitSizes>
+                    <Collapsible>0,0</Collapsible>
+                    <Children>
+                      <LibrarySidebar>
+                      </LibrarySidebar>
+
+                      <CoverArt>
+                        <ObjectName>LibraryCoverArt</ObjectName>
+                        <TooltipId>coverart</TooltipId>
+                        <SizePolicy>me,me</SizePolicy>
+                        <MinimumSize>30,30</MinimumSize>
+                        <Connection>
+                          <ConfigKey>[Library],show_coverart</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </CoverArt>
+                    </Children>
+                  </Splitter>
                 </Children>
-              </Splitter>
+              </WidgetGroup>
+
+              <Library>
+                <ShowButtonText>false</ShowButtonText>
+              </Library>
+
             </Children>
-          </WidgetGroup>
-          <Library>
-            <ShowButtonText>false</ShowButtonText>
-          </Library>
-        </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_library</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </Splitter>
+            <!--Connection>
+              <ConfigKey>[Skin],show_library</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection-->
+          </Splitter>
 
-      <WidgetGroup>
-        <ObjectName>Spacer22</ObjectName>
-        <SizePolicy>me,me</SizePolicy>
-        <Children/>
-        <Connection>
-          <ConfigKey>[Skin],show_library</ConfigKey>
-          <Transform><Not/></Transform>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
+          <!--WidgetGroup>
+            <ObjectName>Spacer22</ObjectName>
+            <SizePolicy>me,me</SizePolicy>
+            <Children/>
+            <Connection>
+              <ConfigKey>[Skin],show_library</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup-->
 
-    </Children>
-  </WidgetGroup>
+        </Children>
+      </WidgetGroup>
+        </Children>
+      </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/loop.xml b/res/skins/Deere/loop.xml
@@ -9,7 +9,6 @@
   <WidgetGroup>
     <ObjectName>LoopContainer</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>f,min</SizePolicy>
     <Children>
 
       <WidgetGroup><!-- SpinBox + loop_activate -->
@@ -19,11 +18,12 @@
           <BeatSpinBox>
             <ObjectName>BeatloopSizeSpinBox</ObjectName>
             <TooltipId>beatloop_size</TooltipId>
+            <Size>54f,25f</Size>
             <Value><Variable name="group"/>,beatloop_size</Value>
           </BeatSpinBox>
 
           <!-- Workaround for layout spacing -->
-          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+          <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
 
           <Template src="skin:left_right_2state_button.xml">
             <SetVariable name="TooltipId">beatloop_activate</SetVariable>
@@ -50,9 +50,7 @@
       <WidgetGroup><!-- loop_in, loop_out, reloop -->
         <Layout>horizontal</Layout>
         <Children>
-
-          <!-- Workaround for layout spacing -->
-          <Template src="skin:spacer_h.xml"/>
+          <WidgetGroup><Size>4f,0min</Size></WidgetGroup>
 
           <Template src="skin:left_right_1state_button.xml">
             <SetVariable name="TooltipId">loop_in</SetVariable>
@@ -84,7 +82,7 @@
           </Template>
 
           <!-- Workaround for layout spacing -->
-          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
+          <WidgetGroup><Size>5f,0min</Size></WidgetGroup>
 
           <Template src="skin:left_right_display_2state_button.xml">
             <SetVariable name="TooltipId">reloop_toggle</SetVariable>

diff --git a/res/skins/Deere/style-mac.qss b/res/skins/Deere/style-mac.qss
@@ -7,15 +7,15 @@
 }
 
 
-/* hack to hide the checkmark, otherwise text gets cut off
+/* 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 */
+because it cuts off text on the left on KDE
 WEffectSelector QAbstractItemView {
   margin: 0 0 0 -24px;
-}
+} */
 
 /* hide the checkmark just in case the above shows a
-partial checkmark on some untested screen */
+partial checkmark on some untested screen
 WEffectSelector::indicator {
     border: 0;
-}
+} */