Merge branch '2.3' of github.com:mixxxdj/mixxx

25 files changed, 685 insertions, 625 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01f6005388..d6fe06a498 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1000,6 +1000,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/widget/wwidget.cpp
   src/widget/wwidgetgroup.cpp
   src/widget/wwidgetstack.cpp
+  src/widget/wraterange.cpp
 )
 set_target_properties(mixxx-lib PROPERTIES AUTOMOC ON AUTOUIC ON CXX_CLANG_TIDY "${CLANG_TIDY}")
 target_include_directories(mixxx-lib PUBLIC src "${CMAKE_CURRENT_BINARY_DIR}/src")
diff --git a/res/skins/Deere/deck_tempo_column.xml b/res/skins/Deere/deck_tempo_column.xml
index 01c8aea62a..8c27847e5e 100644
--- a/res/skins/Deere/deck_tempo_column.xml
+++ b/res/skins/Deere/deck_tempo_column.xml
@@ -81,19 +81,82 @@
         </Children>
       </WidgetGroup>
 
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
+      <WidgetGroup><!-- Rate slider + range displays -->
+        <Layout>stacked</Layout>
+        <SizePolicy>max,me</SizePolicy>
         <Children>
-          <SliderComposed>
-            <TooltipId>rate</TooltipId>
-            <Size>40f,-1me</Size>
-            <MaximumSize>40,200</MaximumSize>
-            <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
-            <Handle scalemode="STRETCH_ASPECT">handle-vertical-blue.svg</Handle>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,rate</ConfigKey>
-            </Connection>
-          </SliderComposed>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+              <SliderComposed>
+                <TooltipId>rate</TooltipId>
+                <Size>50f,-1me</Size>
+                <MaximumSize>40,200</MaximumSize>
+                <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
+                <Handle scalemode="STRETCH_ASPECT">handle-vertical-blue.svg</Handle>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,rate</ConfigKey>
+                </Connection>
+              </SliderComposed>
+            </Children>
+          </WidgetGroup>
+
+          <!-- Pitch range indicators: prefix / spacer / range number -->
+          <WidgetGroup>
+            <SizePolicy>me,me</SizePolicy>
+            <Layout>vertical</Layout>
+            <Size>50f,-1me</Size>
+            <Children>
+              <WidgetGroup>
+                <SizePolicy>me,me</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <!-- Top range limit + prefix -->
+                  <RateRange>
+                    <TooltipId>rate_range_display</TooltipId>
+                    <ObjectName>RateDisplayTopPrefix</ObjectName>
+                    <Channel><Variable name="i" /></Channel>
+                    <Position>Top</Position>
+                    <Display>prefix</Display>
+                    <SizePolicy>me,me</SizePolicy>
+                  </RateRange>
+                  <RateRange>
+                    <TooltipId>rate_range_display</TooltipId>
+                    <ObjectName>RateDisplayTopRate</ObjectName>
+                    <Channel><Variable name="i" /></Channel>
+                    <Position>Top</Position>
+                    <Display>range</Display>
+                    <SizePolicy>me,me</SizePolicy>
+                  </RateRange>
+                </Children>
+              </WidgetGroup><!-- Pitch range indicators -->
+
+              <WidgetGroup>
+                <SizePolicy>me,me</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <!-- Bottom range limit + prefix -->
+                  <RateRange>
+                    <TooltipId>rate_range_display</TooltipId>
+                    <ObjectName>RateDisplayBottomPrefix</ObjectName>
+                    <Channel><Variable name="i" /></Channel>
+                    <Position>Bottom</Position>
+                    <Align>Bottom</Align>
+                    <Display>prefix</Display>
+                    <SizePolicy>me,me</SizePolicy>
+                  </RateRange>
+                  <RateRange>
+                    <TooltipId>rate_range_display</TooltipId>
+                    <ObjectName>RateDisplayBottomRate</ObjectName>
+                    <Channel><Variable name="i" /></Channel>
+                    <Align>Bottom</Align>
+                    <Display>range</Display>
+                    <SizePolicy>me,me</SizePolicy>
+                  </RateRange>
+                </Children>
+              </WidgetGroup><!-- Pitch range indicators -->
+            </Children>
+          </WidgetGroup>
         </Children>
       </WidgetGroup>
 
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 2b1ccdd4c6..511ee6ca75 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -2221,3 +2221,21 @@ WEffectSelector {
 #CueDeleteButton:hover {
   background-color: #4B4B4B;
 }
+
+WRateRange {
+    font-size: 10px;
+}
+
+#RateDisplayTopPrefix {
+    qproperty-alignment: 'AlignLeft | AlignTop';
+}
+#RateDisplayTopRate {
+    qproperty-alignment: 'AlignRight | AlignTop';
+}
+
+#RateDisplayBottomPrefix {
+    qproperty-alignment: 'AlignLeft | AlignBottom';
+}
+#RateDisplayBottomRate {
+    qproperty-alignment: 'AlignRight | AlignBottom';
+}
diff --git a/res/skins/LateNight/decks/deck_singletons.xml b/res/skins/LateNight/decks/deck_singletons.xml
index 453811903a..28a7824eef 100644
--- a/res/skins/LateNight/decks/deck_singletons.xml
+++ b/res/skins/LateNight/decks/deck_singletons.xml
@@ -9,8 +9,7 @@
       </Children>
     </SingletonDefinition>
 
-    <!-- ...used in full & compact deck, minimal deck has its own instance
-         with smaller labels. -->
+    <!-- ...used in full & compact deck -->
     <SingletonDefinition>
       <ObjectName>DeckOverview<Variable name="ChanNum"/></ObjectName>
       <Children>
@@ -20,7 +19,6 @@
       </Children>
     </SingletonDefinition>
 
-    <!-- ...used in full & compact deck. -->
     <SingletonDefinition>
       <ObjectName>DeckSettings<Variable name="ChanNum"/></ObjectName>
       <Children>
@@ -28,7 +26,6 @@
       </Children>
     </SingletonDefinition>
 
-    <!-- ...used in full & compact deck -->
     <SingletonDefinition>
       <ObjectName>KeyControls<Variable name="ChanNum"/></ObjectName>
       <Children>
@@ -36,6 +33,64 @@
       </Children>
     </SingletonDefinition>
 
+    <!-- Rate range displays, top & bottom -->
+    <SingletonDefinition>
+      <ObjectName>RateRangeDisplayTop<Variable name="ChanNum"/></ObjectName>
+      <Children>
+        <WidgetGroup>
+          <Size>53f,17f</Size>
+          <Children>
+            <RateRange>
+              <TooltipId>rate_range_display</TooltipId>
+              <ObjectName>RateRangePrefix</ObjectName>
+              <Channel><Variable name="ChanNum"/></Channel>
+              <Position>Top</Position>
+              <Display>prefix</Display>
+              <Size>7f,16f</Size>
+              <Pos>3,0</Pos>
+            </RateRange>
+            <RateRange>
+              <TooltipId>rate_range_display</TooltipId>
+              <ObjectName>RateRangeText</ObjectName>
+              <Channel><Variable name="ChanNum"/></Channel>
+              <Position>Top</Position>
+              <Display>range</Display>
+              <Size>18f,16f</Size>
+              <Pos>35,1</Pos>
+            </RateRange>
+          </Children>
+        </WidgetGroup>
+      </Children>
+    </SingletonDefinition>
+    <SingletonDefinition>
+      <ObjectName>RateRangeDisplayBottom<Variable name="ChanNum"/></ObjectName>
+      <Children>
+        <WidgetGroup>
+          <Size>53f,16f</Size>
+          <Children>
+            <RateRange>
+              <TooltipId>rate_range_display</TooltipId>
+              <ObjectName>RateRangePrefix</ObjectName>
+              <Channel><Variable name="ChanNum" /></Channel>
+              <Position>Bottom</Position>
+              <Display>prefix</Display>
+              <Size>7f,16f</Size>
+              <Pos>3,0</Pos>
+            </RateRange>
+            <RateRange>
+              <TooltipId>rate_range_display</TooltipId>
+              <ObjectName>RateRangeText</ObjectName>
+              <Channel><Variable name="ChanNum" /></Channel>
+              <Position>Bottom</Position>
+              <Display>range</Display>
+              <Size>18f,16f</Size>
+              <Pos>35,0</Pos>
+            </RateRange>
+          </Children>
+        </WidgetGroup>
+      </Children>
+    </SingletonDefinition>
+
 <!-- Decks -->
     <!-- minimal deck. used in deck stack and above library -->
     <SingletonDefinition>
diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml
index bb577d4fea..342db91725 100644
--- a/res/skins/LateNight/decks/rate_controls.xml
+++ b/res/skins/LateNight/decks/rate_controls.xml
@@ -90,43 +90,66 @@
 
           <WidgetGroup>
             <ObjectName>RateControls</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
             <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
             <Children>
-              <WidgetGroup>
-                <ObjectName></ObjectName>
-                <Size>45f,119f</Size>
+
+              <WidgetGroup><!-- Rate slider + range displays -->
+                <Layout>stacked</Layout>
+                <SizePolicy>max,me</SizePolicy>
                 <Children>
-                  <Label>
-                    <ObjectName>RateCenter</ObjectName>
-                    <Size>5f,5f</Size>
-                    <Pos>2,58</Pos>
-                    <Connection>
-                      <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
-                      <Transform><IsEqual>0.5</IsEqual></Transform>
-                      <BindProperty>highlight</BindProperty>
-                    </Connection>
-                  </Label>
-                  <SliderComposed>
-                    <ObjectName>RateSlider</ObjectName>
-                    <Size>40f,119f</Size>
-                    <Pos>5,0</Pos>
-                    <TooltipId>rate</TooltipId>
-                    <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_deck.svg</Handle>
-                    <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_deck.svg</Slider>
-                    <Horizontal>false</Horizontal>
-                    <BarWidth><Variable name="BarWidth"/></BarWidth>
-                    <BarMargins><Variable name="BarMarginPitch"/></BarMargins>
-                    <BarColor><Variable name="BarColorPitch"/>
-                    </BarColor><BarRoundCaps>true</BarRoundCaps>
-                    <BarAxisPos>20.0</BarAxisPos>
-                    <BarUnipolar>false</BarUnipolar>
-                    <Connection>
-                      <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
-                    </Connection>
-                  </SliderComposed>
+
+                  <!-- Rate slider + center indicator -->
+                  <WidgetGroup>
+                    <ObjectName>RateSliderBox</ObjectName>
+                    <Size>54f,121f</Size>
+                    <Children>
+                      <Label>
+                        <ObjectName>RateCenter</ObjectName>
+                        <Size>5f,5f</Size>
+                        <Pos>2,59</Pos>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
+                          <Transform><IsEqual>0.5</IsEqual></Transform>
+                          <BindProperty>highlight</BindProperty>
+                        </Connection>
+                      </Label>
+                      <SliderComposed>
+                        <ObjectName>RateSlider</ObjectName>
+                        <Size>40f,119f</Size>
+                        <Pos>5,2</Pos>
+                        <TooltipId>rate</TooltipId>
+                        <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_deck.svg</Handle>
+                        <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_deck.svg</Slider>
+                        <Horizontal>false</Horizontal>
+                        <BarWidth><Variable name="BarWidth"/></BarWidth>
+                        <BarMargins><Variable name="BarMarginPitch"/></BarMargins>
+                        <BarColor><Variable name="BarColorPitch"/></BarColor>
+                        <BarRoundCaps>true</BarRoundCaps>
+                        <BarAxisPos>20.0</BarAxisPos>
+                        <BarUnipolar>false</BarUnipolar>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
+                        </Connection>
+                      </SliderComposed>
+                    </Children>
+                  </WidgetGroup><!-- Rate slider + center indicator -->
+
+                  <WidgetGroup><!-- Rate range indicators -->
+                    <SizePolicy>min,me</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>RateRangeDisplayTop<Variable name="ChanNum"/></ObjectName>
+                      </SingletonContainer>
+                      <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+                      <SingletonContainer>
+                        <ObjectName>RateRangeDisplayBottom<Variable name="ChanNum"/></ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                  </WidgetGroup><!-- Rate range indicators -->
                 </Children>
-              </WidgetGroup>
+              </WidgetGroup><!-- Rate slider + range displays -->
 
               <WidgetGroup><!-- RateButtons for different rate directions -->
                 <ObjectName>RateButtons</ObjectName>
diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml
index 5129d881c8..e89e6af9cd 100644
--- a/res/skins/LateNight/decks/rate_controls_compact.xml
+++ b/res/skins/LateNight/decks/rate_controls_compact.xml
@@ -78,16 +78,11 @@
             <SizePolicy>min,min</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-              <!-- show_sync_button_compact -->
+              <!-- Rate controls with Sync button -->
               <WidgetGroup>
-                <Connection>
-                  <ConfigKey persist="true">[LateNight],show_sync_button_compact</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
                 <SizePolicy>min,min</SizePolicy>
                 <Layout>vertical</Layout>
                 <Children>
-
                   <WidgetGroup>
                     <ObjectName>SyncBoxCompact</ObjectName>
                     <Layout>horizontal</Layout>
@@ -105,19 +100,18 @@
                     </Children>
                   </WidgetGroup>
 
-                  <WidgetGroup>
-                    <ObjectName>AlignCenter</ObjectName>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Layout>vertical</Layout>
+                  <WidgetGroup><!-- Rate slider + range displays -->
+                    <Layout>stacked</Layout>
+                    <SizePolicy>max,me</SizePolicy>
                     <Children>
+
                       <WidgetGroup><!-- Rate slider + center indicator -->
-                        <ObjectName></ObjectName>
-                        <Size>50f,79f</Size>
+                        <Size>54f,81f</Size>
                         <Children>
                           <Label>
                             <ObjectName>RateCenter</ObjectName>
                             <Size>5f,5f</Size>
-                            <Pos>2,37</Pos>
+                            <Pos>2,39</Pos>
                             <Connection>
                               <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
                               <Transform><IsEqual>0.5</IsEqual></Transform>
@@ -127,7 +121,7 @@
                           <SliderComposed>
                             <ObjectName>RateSlider</ObjectName>
                             <Size>40f,79f</Size>
-                            <Pos>5,0</Pos>
+                            <Pos>5,2</Pos>
                             <TooltipId>rate</TooltipId>
                             <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_deck.svg</Handle>
                             <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_deck_compact_sync.svg</Slider>
@@ -144,29 +138,41 @@
                           </SliderComposed>
                         </Children>
                       </WidgetGroup><!-- Rate slider + center indicator -->
+
+                      <WidgetGroup><!-- Rate range indicators -->
+                        <SizePolicy>min,me</SizePolicy>
+                        <Layout>vertical</Layout>
+                        <Children>
+                          <SingletonContainer>
+                            <ObjectName>RateRangeDisplayTop<Variable name="ChanNum"/></ObjectName>
+                          </SingletonContainer>
+                          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+                          <SingletonContainer>
+                            <ObjectName>RateRangeDisplayBottom<Variable name="ChanNum"/></ObjectName>
+                          </SingletonContainer>
+                        </Children>
+                      </WidgetGroup><!-- Rate range indicators -->
                     </Children>
-                  </WidgetGroup>
+                  </WidgetGroup><!-- Rate slider + range displays -->
                 </Children>
-              </WidgetGroup><!-- show_sync_button_compact -->
-
-              <WidgetGroup><!-- !show_sync_button_compact -->
-                <ObjectName>AlignCenter</ObjectName>
                 <Connection>
                   <ConfigKey persist="true">[LateNight],show_sync_button_compact</ConfigKey>
-                  <Transform><Not/></Transform>
                   <BindProperty>visible</BindProperty>
                 </Connection>
-                <SizePolicy>min,min</SizePolicy>
-                <Layout>horizontal</Layout>
+              </WidgetGroup><!-- Rate controls with Sync button -->
+
+              <WidgetGroup><!-- Rate controls (no Sync button) -->
+                <SizePolicy>max,min</SizePolicy>
+                <Layout>stacked</Layout>
                 <Children>
                   <WidgetGroup><!-- Rate slider + center indicator -->
                     <ObjectName></ObjectName>
-                    <Size>50f,95f</Size>
+                    <Size>54f,97f</Size>
                     <Children>
                       <Label>
                         <ObjectName>RateCenter</ObjectName>
                         <Size>5f,5f</Size>
-                        <Pos>2,45</Pos>
+                        <Pos>2,47</Pos>
                         <Connection>
                           <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
                           <Transform><IsEqual>0.5</IsEqual></Transform>
@@ -177,7 +183,7 @@
                       <SliderComposed>
                         <ObjectName>RateSlider</ObjectName>
                         <Size>40f,95f</Size>
-                        <Pos>5,0</Pos>
+                        <Pos>5,2</Pos>
                         <TooltipId>rate</TooltipId>
                         <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_deck.svg</Handle>
                         <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_deck_compact.svg</Slider>
@@ -194,8 +200,27 @@
                       </SliderComposed>
                     </Children>
                   </WidgetGroup><!-- Rate slider + center indicator -->
+
+                  <WidgetGroup><!-- Rate range indicators -->
+                    <SizePolicy>min,me</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>RateRangeDisplayTop<Variable name="ChanNum"/></ObjectName>
+                      </SingletonContainer>
+                      <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+                      <SingletonContainer>
+                        <ObjectName>RateRangeDisplayBottom<Variable name="ChanNum"/></ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                  </WidgetGroup><!-- Rate range indicators -->
                 </Children>
-              </WidgetGroup><!-- !show_sync_button_compact -->
+                <Connection>
+                  <ConfigKey persist="true">[LateNight],show_sync_button_compact</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- Rate controls (no Sync button) -->
             </Children>
           </WidgetGroup><!-- RateControls -->
 
diff --git a/res/skins/LateNight/palemoon/sliders/slider_pitch_deck.svg b/res/skins/LateNight/palemoon/sliders/slider_pitch_deck.svg
index 694a5773a5..c82d884457 100644
--- a/res/skins/LateNight/palemoon/sliders/slider_pitch_deck.svg
+++ b/res/skins/LateNight/palemoon/sliders/slider_pitch_deck.svg
@@ -1,174 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg84"
-   version="1.1"
-   height="119"
-   width="40">
-  <metadata
-     id="metadata90">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs88" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="m 8,19.500404 h 8 V 20.5 H 8 Z"
-     id="path2" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="m 8,32.5 h 8 v 0.999596 H 8 Z"
-     id="path4" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="m 8,45.500404 h 8 V 46.5 H 8 Z"
-     id="path6" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="m 6,58.500202 10,2.02e-4 V 59.5 L 6,59.499798 Z"
-     id="path8" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="m 8,71.500404 h 8 V 72.5 H 8 Z"
-     id="path10" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="m 8,84.500404 h 8 V 85.5 H 8 Z"
-     id="path12" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="m 8,97.500404 h 8 V 98.5 H 8 Z"
-     id="path14" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="M 32,19.500404 H 24 V 20.5 h 8 z"
-     id="path16" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="m 32,32.5 h -8 v 0.999596 h 8 z"
-     id="path18" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="M 32,45.500404 H 24 V 46.5 h 8 z"
-     id="path20" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="M 34,58.500404 H 24 V 59.5 h 10 z"
-     id="path22" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="M 32,71.500404 H 24 V 72.5 h 8 z"
-     id="path24" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="M 32,84.500404 H 24 V 85.5 h 8 z"
-     id="path26" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="M 32,97.500404 H 24 V 98.5 h 8 z"
-     id="path28" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="m 8,6.5 h 8 V 7.499596 H 8 Z"
-     id="path30" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="m 32,6.5 h -8 v 0.999596 h 8 z"
-     id="path32" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="m 8,110.5004 h 8 V 111.5 H 8 Z"
-     id="path34" />
-  <path
-     style="color:#000000;fill:#050505;stroke-width:0.999798"
-     d="M 32,110.5004 H 24 V 111.5 h 8 z"
-     id="path36" />
-  <path
-     style="color:#000000;fill:#636363;stroke-width:0.999798"
-     d="M 6,59.000404 H 16 V 60 H 6 Z"
-     id="path40" />
-  <path
-     style="color:#000000;fill:#636363;stroke-width:0.999798"
-     d="M 34,59.000404 H 24 V 60 h 10 z"
-     id="path42" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="m 8,20.000404 h 8 V 21 H 8 Z"
-     id="path46" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="m 8,33 h 8 v 0.999596 H 8 Z"
-     id="path48" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="m 8,46.000404 h 8 V 47 H 8 Z"
-     id="path50" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="m 8,72.000404 h 8 V 73 H 8 Z"
-     id="path52" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="m 8,85.000404 h 8 V 86 H 8 Z"
-     id="path54" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="m 8,98.000404 h 8 V 99 H 8 Z"
-     id="path56" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="M 32,20.000404 H 24 V 21 h 8 z"
-     id="path58" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="m 32,33 h -8 v 0.999596 h 8 z"
-     id="path60" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="M 32,46.000404 H 24 V 47 h 8 z"
-     id="path62" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="M 32,72.000404 H 24 V 73 h 8 z"
-     id="path64" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="M 32,85.000404 H 24 V 86 h 8 z"
-     id="path66" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="M 32,98.000404 H 24 V 99 h 8 z"
-     id="path68" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="m 8,7 h 8 V 7.999596 H 8 Z"
-     id="path70" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="m 32,7 h -8 v 0.999596 h 8 z"
-     id="path72" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="m 8,111.0004 h 8 V 112 H 8 Z"
-     id="path74" />
-  <path
-     style="color:#000000;fill:#404040;stroke-width:0.999798"
-     d="M 32,111.0004 H 24 V 112 h 8 z"
-     id="path76" />
-  <path
-     style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.68231;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path80"