From 274fcc8137455de703bd88918629623192e38b15 Mon Sep 17 00:00:00 2001
From: Katsarov <me@katsarov.info>
Date: Tue, 14 Jul 2020 22:01:47 +0200
Subject: widget: Add WRateRange widget for displaying the current rate slider
 range

---
 CMakeLists.txt                |  1 +
 src/skin/legacyskinparser.cpp | 16 +++++++++++
 src/skin/legacyskinparser.h   |  1 +
 src/skin/tooltips.cpp         |  4 +++
 src/widget/wraterange.cpp     | 67 +++++++++++++++++++++++++++++++++++++++++++
 src/widget/wraterange.h       | 34 ++++++++++++++++++++++
 6 files changed, 123 insertions(+)
 create mode 100644 src/widget/wraterange.cpp
 create mode 100644 src/widget/wraterange.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b7a2d11c0..12f98a00e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -989,6 +989,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/src/skin/legacyskinparser.cpp b/src/skin/legacyskinparser.cpp
index 912b0cc7fd..9794da8a83 100644
--- a/src/skin/legacyskinparser.cpp
+++ b/src/skin/legacyskinparser.cpp
@@ -62,6 +62,7 @@
 #include "widget/woverviewrgb.h"
 #include "widget/wpixmapstore.h"
 #include "widget/wpushbutton.h"
+#include "widget/wraterange.h"
 #include "widget/wrecordingduration.h"
 #include "widget/wsearchlineedit.h"
 #include "widget/wsingletoncontainer.h"
@@ -534,6 +535,8 @@ QList<QWidget*> LegacySkinParser::parseNode(const QDomElement& node) {
         result = wrapWidget(parseBeatSpinBox(node));
     } else if (nodeName == "NumberRate") {
         result = wrapWidget(parseNumberRate(node));
+    } else if (nodeName == "RateRange") {
+        result = wrapWidget(parseRateRange(node));
     } else if (nodeName == "NumberPos") {
         result = wrapWidget(parseNumberPos(node));
     } else if (nodeName == "Number" || nodeName == "NumberBpm") {
@@ -1121,6 +1124,19 @@ QWidget* LegacySkinParser::parseStarRating(const QDomElement& node) {
     return pStarRating;
 }
 
+QWidget* LegacySkinParser::parseRateRange(const QDomElement& node) {
+    QString group = lookupNodeGroup(node);
+    QPalette palette;
+
+    palette.setBrush(QPalette::Button, Qt::NoBrush);
+
+    WRateRange* pRateRange = new WRateRange(group, m_pParent);
+    setupLabelWidget(node, pRateRange);
+    pRateRange->setPalette(palette);
+
+    return pRateRange;
+}
+
 QWidget* LegacySkinParser::parseNumberRate(const QDomElement& node) {
     QString group = lookupNodeGroup(node);
     QColor c(255,255,255);
diff --git a/src/skin/legacyskinparser.h b/src/skin/legacyskinparser.h
index 546ebea840..29d6d62f3a 100644
--- a/src/skin/legacyskinparser.h
+++ b/src/skin/legacyskinparser.h
@@ -79,6 +79,7 @@ class LegacySkinParser : public QObject, public SkinParser {
     QWidget* parseText(const QDomElement& node);
     QWidget* parseTrackProperty(const QDomElement& node);
     QWidget* parseStarRating(const QDomElement& node);
+    QWidget* parseRateRange(const QDomElement& node);
     QWidget* parseNumberRate(const QDomElement& node);
     QWidget* parseNumberPos(const QDomElement& node);
     QWidget* parseEngineKey(const QDomElement& node);
diff --git a/src/skin/tooltips.cpp b/src/skin/tooltips.cpp
index 92e140df2f..7d531c458d 100644
--- a/src/skin/tooltips.cpp
+++ b/src/skin/tooltips.cpp
@@ -596,6 +596,10 @@ void Tooltips::addStandardTooltips() {
             << tr("Pitch Rate")
             << tr("Displays the current playback rate of the track.");
 
+    add("rate_range_display")
+            << tr("Tempo Range Display")
+            << tr("Displays the current range of the tempo slider.");
+
     add("repeat")
             << tr("Repeat")
             << tr("When active the track will repeat if you go past the end or reverse before the start.");
diff --git a/src/widget/wraterange.cpp b/src/widget/wraterange.cpp
new file mode 100644
index 0000000000..42c5f7d678
--- /dev/null
+++ b/src/widget/wraterange.cpp
@@ -0,0 +1,67 @@
+#include "widget/wraterange.h"
+
+#include "control/controlobject.h"
+#include "control/controlproxy.h"
+#include "moc_wraterange.cpp"
+#include "util/math.h"
+
+WRateRange::WRateRange(const QString& group, QWidget* parent)
+        : WNumber(parent) {
+    m_pRateRangeControl = new ControlProxy(
+            group, "rateRange", this, ControlFlag::NoAssertIfMissing);
+    m_pRateRangeControl->connectValueChanged(this, &WRateRange::setValue);
+    m_pRateDirControl = new ControlProxy(
+            group, "rate_dir", this, ControlFlag::NoAssertIfMissing);
+    m_pRateDirControl->connectValueChanged(this, &WRateRange::slotRateDirChanged);
+}
+
+void WRateRange::setup(const QDomNode& node, const SkinContext& context) {
+    WNumber::setup(node, context);
+
+    QDomElement RateRangePosition = context.selectElement(node, "Position");
+    QDomElement RateRangeType = context.selectElement(node, "Display");
+    m_nodePosition = RateRangePosition.text() == "Top"
+            ? VerticalPosition::Top
+            : VerticalPosition::Bottom;
+    if (RateRangeType.text() == "prefix") {
+        m_nodeDisplay = DisplayType::Prefix;
+    } else if (RateRangeType.text() == "range") {
+        m_nodeDisplay = DisplayType::Range;
+    } else {
+        m_nodeDisplay = DisplayType::Default;
+    }
+
+    // Initialize the widget (overrides the base class initial value).
+    const double range = m_pRateRangeControl->get();
+    setValue(range);
+}
+
+void WRateRange::slotRateDirChanged(double dir) {
+    Q_UNUSED(dir);
+
+    const double range = m_pRateRangeControl->get();
+    setValue(range);
+}
+
+void WRateRange::setValue(double range) {
+    const double direction = m_pRateDirControl->get();
+
+    QString prefix('-');
+    if (m_nodePosition == VerticalPosition::Top && direction > 0) {
+        prefix = '+';
+    }
+
+    if (m_nodePosition == VerticalPosition::Bottom && direction < 0) {
+        prefix = '+';
+    }
+
+    if (m_nodeDisplay == DisplayType::Prefix) {
+        m_nodeText = prefix;
+    } else if (m_nodeDisplay == DisplayType::Range) {
+        m_nodeText = QString::number(range * 100).append("\%");
+    } else {
+        m_nodeText = prefix.append(QString::number(range * 100)).append("\%");
+    }
+
+    setText(m_nodeText);
+}
diff --git a/src/widget/wraterange.h b/src/widget/wraterange.h
new file mode 100644
index 0000000000..43c5c3a84e
--- /dev/null
+++ b/src/widget/wraterange.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "widget/wnumber.h"
+
+class ControlProxy;
+
+enum class VerticalPosition {
+    Top,
+    Bottom
+};
+
+enum class DisplayType {
+    Default,
+    Prefix,
+    Range
+};
+
+class WRateRange : public WNumber {
+    Q_OBJECT
+  public:
+    explicit WRateRange(const QString& group, QWidget* parent = nullptr);
+    void setup(const QDomNode& node, const SkinContext& context) override;
+
+  private slots:
+    void slotRateDirChanged(double dir);
+    void setValue(double range) override;
+
+  private:
+    ControlProxy* m_pRateRangeControl;
+    ControlProxy* m_pRateDirControl;
+    VerticalPosition m_nodePosition;
+    DisplayType m_nodeDisplay;
+    QString m_nodeText;
+};
-- 
cgit v1.2.3


From 4ceb65da057dd4e0403419d69be74949c9879699 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 11 Mar 2021 20:45:13 +0100
Subject: LateNight: Add tempo range display

---
 res/skins/LateNight/decks/rate_controls.xml        | 120 +++++++++++++-----
 .../LateNight/decks/rate_controls_compact.xml      | 139 +++++++++++++++++----
 res/skins/LateNight/style.qss                      |   7 ++
 res/skins/LateNight/style_palemoon.qss             |   9 +-
 4 files changed, 212 insertions(+), 63 deletions(-)

diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml
index bb577d4fea..fa295ecdb9 100644
--- a/res/skins/LateNight/decks/rate_controls.xml
+++ b/res/skins/LateNight/decks/rate_controls.xml
@@ -90,43 +90,97 @@
 
           <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>53f,121f</Size>
+                    <Children>
+                      <Label>
+                        <ObjectName>RateCenter</ObjectName>
+                        <Size>5f,5f</Size>
+                        <Pos>2,57</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,113f</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 -->
+
+                  <!-- Pitch range indicators: prefix / spacer / range number -->
+                  <WidgetGroup>
+                    <SizePolicy>min,me</SizePolicy>
+                    <Children>
+                      <!-- Top range limit + prefix -->
+                      <RateRange>
+                        <TooltipId>rate_range_display</TooltipId>
+                        <ObjectName>RateDisplayTop</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>RateDisplayTop</ObjectName>
+                        <Channel><Variable name="ChanNum" /></Channel>
+                        <Position>Top</Position>
+                        <Display>range</Display>
+                        <Size>17f,16f</Size>
+                        <Pos>35,1</Pos>
+                      </RateRange>
+                      <!-- Bottom range limit + prefix -->
+                      <RateRange>
+                        <TooltipId>rate_range_display</TooltipId>
+                        <ObjectName>RateDisplayBottom</ObjectName>
+                        <Channel><Variable name="ChanNum" /></Channel>
+                        <Position>Bottom</Position>
+                        <Display>prefix</Display>
+                        <Size>7f,16f</Size>
+                        <Pos>3,99</Pos>
+                      </RateRange>
+                      <RateRange>
+                        <TooltipId>rate_range_display</TooltipId>
+                        <ObjectName>RateDisplayBottom</ObjectName>
+                        <Channel><Variable name="ChanNum" /></Channel>
+                        <Position>Bottom</Position>
+                        <Display>range</Display>
+                        <Size>17f,16f</Size>
+                        <Pos>35,99</Pos>
+                      </RateRange>
+                    </Children>
+                  </WidgetGroup><!-- Pitch 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..3590adbe24 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>53f,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,72 @@
                           </SliderComposed>
                         </Children>
                       </WidgetGroup><!-- Rate slider + center indicator -->
+
+                      <!-- Pitch range indicators: prefix / spacer / range number -->
+                      <WidgetGroup>
+                        <SizePolicy>min,me</SizePolicy>
+                        <Children>
+                          <!-- Top range limit + prefix -->
+                          <RateRange>
+                            <TooltipId>rate_range_display</TooltipId>
+                            <ObjectName>RateDisplayTop</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>RateDisplayTop</ObjectName>
+                            <Channel><Variable name="ChanNum" /></Channel>
+                            <Position>Top</Position>
+                            <Display>range</Display>
+                            <Size>17f,16f</Size>
+                            <Pos>35,1</Pos>
+                          </RateRange>
+                          <!-- Bottom range limit + prefix -->
+                          <RateRange>
+                            <TooltipId>rate_range_display</TooltipId>
+                            <ObjectName>RateDisplayBottom</ObjectName>
+                            <Channel><Variable name="ChanNum" /></Channel>
+                            <Position>Bottom</Position>
+                            <Display>prefix</Display>
+                            <Size>7f,16f</Size>
+                            <Pos>3,65</Pos>
+                          </RateRange>
+                          <RateRange>
+                            <TooltipId>rate_range_display</TooltipId>
+                            <ObjectName>RateDisplayBottom</ObjectName>
+                            <Channel><Variable name="ChanNum" /></Channel>
+                            <Position>Bottom</Position>
+                            <Display>range</Display>
+                            <Size>17f,16f</Size>
+                            <Pos>35,65</Pos>
+                          </RateRange>
+                        </Children>
+                      </WidgetGroup><!-- Pitch 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>53f,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 +214,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 +231,58 @@
                       </SliderComposed>
                     </Children>
                   </WidgetGroup><!-- Rate slider + center indicator -->
+
+                  <!-- Pitch range indicators: prefix / spacer / range number -->
+                  <WidgetGroup>
+                    <SizePolicy>min,me</SizePolicy>
+                    <Children>
+                      <!-- Top range limit + prefix -->
+                      <RateRange>
+                        <TooltipId>rate_range_display</TooltipId>
+                        <ObjectName>RateDisplayTop</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>RateDisplayTop</ObjectName>
+                        <Channel><Variable name="ChanNum" /></Channel>
+                        <Position>Top</Position>
+                        <Display>range</Display>
+                        <Size>17f,16f</Size>
+                        <Pos>35,1</Pos>
+                      </RateRange>
+                      <!-- Bottom range limit + prefix -->
+                      <RateRange>
+                        <TooltipId>rate_range_display</TooltipId>
+                        <ObjectName>RateDisplayBottom</ObjectName>
+                        <Channel><Variable name="ChanNum" /></Channel>
+                        <Position>Bottom</Position>
+                        <Display>prefix</Display>
+                        <Size>7f,16f</Size>
+                        <Pos>3,81</Pos>
+                      </RateRange>
+                      <RateRange>
+                        <TooltipId>rate_range_display</TooltipId>
+                        <ObjectName>RateDisplayBottom</ObjectName>
+                        <Channel><Variable name="ChanNum" /></Channel>
+                        <Position>Bottom</Position>
+                        <Display>range</Display>
+                        <Size>17f,16f</Size>
+                        <Pos>35,81</Pos>
+                      </RateRange>
+                    </Children>
+                  </WidgetGroup><!-- Pitch 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/style.qss b/res/skins/LateNight/style.qss
index 1420cae170..95bf7a7910 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -329,6 +329,13 @@ WSpinny { /*
   background: none;*/
 }
 
+#RateDisplayTop, #RateDisplayBottom {
+  qproperty-alignment: 'AlignRight';
+  color: #888;
+  font-size: 12px;
+  line-height: 10px;
+}
+
 #BpmText,
 #RateText {
   qproperty-alignment: 'AlignCenter';
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index 71ae27b7b9..22805fd4e9 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -639,11 +639,12 @@ WSearchLineEdit {
   }
 
   #RateControls {
-    margin: 0px 2px;
-    }
-    #RateButtons {
-      margin-right: 2px;
+    margin: 0px 1px 0px 2px;
+    /*background-color: #000;*/
     }
+  #RateSlider {
+    /*background-color: rgba(255,0,0,80);*/
+  }
 
 
 /********************** Loop Controls / AutoDJ spinbox ************************/
-- 
cgit v1.2.3


From e982c0f996e79779f8527277b65d29bc7dcb27f5 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 11 Mar 2021 21:25:58 +0100
Subject: WRateRange: Remove % signal to make room for a second digit

---
 src/widget/wraterange.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/widget/wraterange.cpp b/src/widget/wraterange.cpp
index 42c5f7d678..1d5b0bfea1 100644
--- a/src/widget/wraterange.cpp
+++ b/src/widget/wraterange.cpp
@@ -58,9 +58,9 @@ void WRateRange::setValue(double range) {
     if (m_nodeDisplay == DisplayType::Prefix) {
         m_nodeText = prefix;
     } else if (m_nodeDisplay == DisplayType::Range) {
-        m_nodeText = QString::number(range * 100).append("\%");
+        m_nodeText = QString::number(range * 100);
     } else {
-        m_nodeText = prefix.append(QString::number(range * 100)).append("\%");
+        m_nodeText = prefix.append(QString::number(range * 100));
     }
 
     setText(m_nodeText);
-- 
cgit v1.2.3


From 63c2c4b6cab8b73c2bf0ef527568ac6cbfd490ae Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 11 Mar 2021 23:49:40 +0100
Subject: LateNight: Increase WRateRange width to make "100" fit

---
 res/skins/LateNight/decks/rate_controls.xml         |  6 +++---
 res/skins/LateNight/decks/rate_controls_compact.xml | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml
index fa295ecdb9..81e161549e 100644
--- a/res/skins/LateNight/decks/rate_controls.xml
+++ b/res/skins/LateNight/decks/rate_controls.xml
@@ -102,7 +102,7 @@
                   <!-- Rate slider + center indicator -->
                   <WidgetGroup>
                     <ObjectName>RateSliderBox</ObjectName>
-                    <Size>53f,121f</Size>
+                    <Size>56f,121f</Size>
                     <Children>
                       <Label>
                         <ObjectName>RateCenter</ObjectName>
@@ -155,7 +155,7 @@
                         <Channel><Variable name="ChanNum" /></Channel>
                         <Position>Top</Position>
                         <Display>range</Display>
-                        <Size>17f,16f</Size>
+                        <Size>20f,16f</Size>
                         <Pos>35,1</Pos>
                       </RateRange>
                       <!-- Bottom range limit + prefix -->
@@ -174,7 +174,7 @@
                         <Channel><Variable name="ChanNum" /></Channel>
                         <Position>Bottom</Position>
                         <Display>range</Display>
-                        <Size>17f,16f</Size>
+                        <Size>20f,16f</Size>
                         <Pos>35,99</Pos>
                       </RateRange>
                     </Children>
diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml
index 3590adbe24..c49814e141 100644
--- a/res/skins/LateNight/decks/rate_controls_compact.xml
+++ b/res/skins/LateNight/decks/rate_controls_compact.xml
@@ -106,7 +106,7 @@
                     <Children>
 
                       <WidgetGroup><!-- Rate slider + center indicator -->
-                        <Size>53f,81f</Size>
+                        <Size>56f,81f</Size>
                         <Children>
                           <Label>
                             <ObjectName>RateCenter</ObjectName>
@@ -159,7 +159,7 @@
                             <Channel><Variable name="ChanNum" /></Channel>
                             <Position>Top</Position>
                             <Display>range</Display>
-                            <Size>17f,16f</Size>
+                            <Size>20f,16f</Size>
                             <Pos>35,1</Pos>
                           </RateRange>
                           <!-- Bottom range limit + prefix -->
@@ -178,7 +178,7 @@
                             <Channel><Variable name="ChanNum" /></Channel>
                             <Position>Bottom</Position>
                             <Display>range</Display>
-                            <Size>17f,16f</Size>
+                            <Size>20f,16f</Size>
                             <Pos>35,65</Pos>
                           </RateRange>
                         </Children>
@@ -198,7 +198,7 @@
                 <Children>
                   <WidgetGroup><!-- Rate slider + center indicator -->
                     <ObjectName></ObjectName>
-                    <Size>53f,97f</Size>
+                    <Size>56f,97f</Size>
                     <Children>
                       <Label>
                         <ObjectName>RateCenter</ObjectName>
@@ -252,7 +252,7 @@
                         <Channel><Variable name="ChanNum" /></Channel>
                         <Position>Top</Position>
                         <Display>range</Display>
-                        <Size>17f,16f</Size>
+                        <Size>20f,16f</Size>
                         <Pos>35,1</Pos>
                       </RateRange>
                       <!-- Bottom range limit + prefix -->
@@ -271,7 +271,7 @@
                         <Channel><Variable name="ChanNum" /></Channel>
                         <Position>Bottom</Position>
                         <Display>range</Display>
-                        <Size>17f,16f</Size>
+                        <Size>20f,16f</Size>
                         <Pos>35,81</Pos>
                       </RateRange>
                     </Children>
-- 
cgit v1.2.3


From 60616e9cc819d7fc1824752695bdee93af15c950 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Fri, 12 Mar 2021 00:02:01 +0100
Subject: LateNight: Decrease RateRange size (and font size)

---
 res/skins/LateNight/decks/rate_controls.xml         |  6 +++---
 res/skins/LateNight/decks/rate_controls_compact.xml | 12 ++++++------
 res/skins/LateNight/style.qss                       |  5 ++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml
index 81e161549e..db6a3ce8e3 100644
--- a/res/skins/LateNight/decks/rate_controls.xml
+++ b/res/skins/LateNight/decks/rate_controls.xml
@@ -102,7 +102,7 @@
                   <!-- Rate slider + center indicator -->
                   <WidgetGroup>
                     <ObjectName>RateSliderBox</ObjectName>
-                    <Size>56f,121f</Size>
+                    <Size>54f,121f</Size>
                     <Children>
                       <Label>
                         <ObjectName>RateCenter</ObjectName>
@@ -155,7 +155,7 @@
                         <Channel><Variable name="ChanNum" /></Channel>
                         <Position>Top</Position>
                         <Display>range</Display>
-                        <Size>20f,16f</Size>
+                        <Size>18f,16f</Size>
                         <Pos>35,1</Pos>
                       </RateRange>
                       <!-- Bottom range limit + prefix -->
@@ -174,7 +174,7 @@
                         <Channel><Variable name="ChanNum" /></Channel>
                         <Position>Bottom</Position>
                         <Display>range</Display>
-                        <Size>20f,16f</Size>
+                        <Size>18f,16f</Size>
                         <Pos>35,99</Pos>
                       </RateRange>
                     </Children>
diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml
index c49814e141..fb70171d5d 100644
--- a/res/skins/LateNight/decks/rate_controls_compact.xml
+++ b/res/skins/LateNight/decks/rate_controls_compact.xml
@@ -106,7 +106,7 @@
                     <Children>
 
                       <WidgetGroup><!-- Rate slider + center indicator -->
-                        <Size>56f,81f</Size>
+                        <Size>54f,81f</Size>
                         <Children>
                           <Label>
                             <ObjectName>RateCenter</ObjectName>
@@ -159,7 +159,7 @@
                             <Channel><Variable name="ChanNum" /></Channel>
                             <Position>Top</Position>
                             <Display>range</Display>
-                            <Size>20f,16f</Size>
+                            <Size>18f,16f</Size>
                             <Pos>35,1</Pos>
                           </RateRange>
                           <!-- Bottom range limit + prefix -->
@@ -178,7 +178,7 @@
                             <Channel><Variable name="ChanNum" /></Channel>
                             <Position>Bottom</Position>
                             <Display>range</Display>
-                            <Size>20f,16f</Size>
+                            <Size>18f,16f</Size>
                             <Pos>35,65</Pos>
                           </RateRange>
                         </Children>
@@ -198,7 +198,7 @@
                 <Children>
                   <WidgetGroup><!-- Rate slider + center indicator -->
                     <ObjectName></ObjectName>
-                    <Size>56f,97f</Size>
+                    <Size>54f,97f</Size>
                     <Children>
                       <Label>
                         <ObjectName>RateCenter</ObjectName>
@@ -252,7 +252,7 @@
                         <Channel><Variable name="ChanNum" /></Channel>
                         <Position>Top</Position>
                         <Display>range</Display>
-                        <Size>20f,16f</Size>
+                        <Size>18f,16f</Size>
                         <Pos>35,1</Pos>
                       </RateRange>
                       <!-- Bottom range limit + prefix -->
@@ -271,7 +271,7 @@
                         <Channel><Variable name="ChanNum" /></Channel>
                         <Position>Bottom</Position>
                         <Display>range</Display>
-                        <Size>20f,16f</Size>
+                        <Size>18f,16f</Size>
                         <Pos>35,81</Pos>
                       </RateRange>
                     </Children>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 95bf7a7910..9938015c6e 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -330,10 +330,9 @@ WSpinny { /*
 }
 
 #RateDisplayTop, #RateDisplayBottom {
-  qproperty-alignment: 'AlignRight';
+  qproperty-alignment: 'AlignCenter';
   color: #888;
-  font-size: 12px;
-  line-height: 10px;
+  font-size: 10px;
 }
 
 #BpmText,
-- 
cgit v1.2.3


From 289ec2770627ffa0532f52b3cd22e8c235a55066 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Fri, 12 Mar 2021 01:05:40 +0100
Subject: Deere: Add rate range display

---
 res/skins/Deere/deck_tempo_column.xml | 87 ++++++++++++++++++++++++++++++-----
 res/skins/Deere/style.qss             | 18 ++++++++
 2 files changed, 93 insertions(+), 12 deletions(-)

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 6ba7ce445f..75e811d8b4 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';
+}
-- 
cgit v1.2.3


From c2550a27f19977932f621f72ef2a7fa32c227e1e Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 12 Mar 2021 03:39:49 +0100
Subject: LateNight: restore pitch slider size (unblur), adjust rate range size
 & color

---
 res/skins/LateNight/decks/rate_controls.xml |  8 ++++----
 res/skins/LateNight/style.qss               | 12 +++++-------
 res/skins/LateNight/style_classic.qss       |  5 +----
 res/skins/LateNight/style_palemoon.qss      |  3 ++-
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml
index db6a3ce8e3..3c618d92ab 100644
--- a/res/skins/LateNight/decks/rate_controls.xml
+++ b/res/skins/LateNight/decks/rate_controls.xml
@@ -107,7 +107,7 @@
                       <Label>
                         <ObjectName>RateCenter</ObjectName>
                         <Size>5f,5f</Size>
-                        <Pos>2,57</Pos>
+                        <Pos>2,59</Pos>
                         <Connection>
                           <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
                           <Transform><IsEqual>0.5</IsEqual></Transform>
@@ -116,7 +116,7 @@
                       </Label>
                       <SliderComposed>
                         <ObjectName>RateSlider</ObjectName>
-                        <Size>40f,113f</Size>
+                        <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>
@@ -124,8 +124,8 @@
                         <Horizontal>false</Horizontal>
                         <BarWidth><Variable name="BarWidth"/></BarWidth>
                         <BarMargins><Variable name="BarMarginPitch"/></BarMargins>
-                        <BarColor><Variable name="BarColorPitch"/>
-                        </BarColor><BarRoundCaps>true</BarRoundCaps>
+                        <BarColor><Variable name="BarColorPitch"/></BarColor>
+                        <BarRoundCaps>true</BarRoundCaps>
                         <BarAxisPos>20.0</BarAxisPos>
                         <BarUnipolar>false</BarUnipolar>
                         <Connection>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 9938015c6e..44f06197b6 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -107,6 +107,7 @@ QLabel#labelRecStatistics {
 #KnobLabel,
 #FxKnobLabel,
 #FxButtonLabel,
+#RateRangeText,
 #LatencyLabel {
   font-size: 10px;
   text-align: center;
@@ -119,6 +120,7 @@ WPushButton,
   font-size: 11px;
 }
 
+#RateRangePrefix,
 #RecDuration[highlight="2"],
 #SamplerTitleMini,
 #EQKillButton,
@@ -329,14 +331,10 @@ WSpinny { /*
   background: none;*/
 }
 
-#RateDisplayTop, #RateDisplayBottom {
-  qproperty-alignment: 'AlignCenter';
-  color: #888;
-  font-size: 10px;
-}
-
 #BpmText,
-#RateText {
+#RateText,
+#RateRangePrefix,
+#RateRangeText {
   qproperty-alignment: 'AlignCenter';
 }
 
diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
index b8d4790856..b35c8d1f2a 100644
--- a/res/skins/LateNight/style_classic.qss
+++ b/res/skins/LateNight/style_classic.qss
@@ -1089,10 +1089,7 @@ WTrackMenu QMenu QCheckBox,
     color: #0795b5;
   }
 
-/* Grey. default for all deck labels */
-#PlayPositionText, #PlayPositionTextSmall,
-#DurationText, #RateText,
-#KeyText, #KeyTextSmall,
+/* Grey */
 #PreviewLabel,
 WEffectSelector, WEffectSelector QAbstractScrollArea,
 #fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea,
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index 22805fd4e9..e90370d4f9 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -1329,7 +1329,8 @@ WEffectSelector,
 
 /* Grey. default for all deck labels */
 #PlayPositionText, #PlayPositionTextSmall,
-#DurationText, #RateText,
+#DurationText,
+#RateText, #RateRangePrefix, #RateRangeText,
 #MixerMasterHeadphone #FxAssignButtons WPushButton[displayValue="0"],
 #PreviewLabel,
 WEffectSelector QAbstractScrollArea,
-- 
cgit v1.2.3


From fb3902b50fe90f6555c13d154a86a0c45d217f76 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 12 Mar 2021 03:44:05 +0100
Subject: LateNight: move rate range displays into Singleton

---
 res/skins/LateNight/decks/deck_singletons.xml      |  63 ++++++++++++-
 res/skins/LateNight/decks/rate_controls.xml        |  51 ++---------
 .../LateNight/decks/rate_controls_compact.xml      | 102 ++++-----------------
 3 files changed, 89 insertions(+), 127 deletions(-)

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 3c618d92ab..342db91725 100644
--- a/res/skins/LateNight/decks/rate_controls.xml
+++ b/res/skins/LateNight/decks/rate_controls.xml
@@ -135,50 +135,19 @@
                     </Children>
                   </WidgetGroup><!-- Rate slider + center indicator -->
 
-                  <!-- Pitch range indicators: prefix / spacer / range number -->
-                  <WidgetGroup>
+                  <WidgetGroup><!-- Rate range indicators -->
                     <SizePolicy>min,me</SizePolicy>
+                    <Layout>vertical</Layout>
                     <Children>
-                      <!-- Top range limit + prefix -->
-                      <RateRange>
-                        <TooltipId>rate_range_display</TooltipId>
-                        <ObjectName>RateDisplayTop</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>RateDisplayTop</ObjectName>
-                        <Channel><Variable name="ChanNum" /></Channel>
-                        <Position>Top</Position>
-                        <Display>range</Display>
-                        <Size>18f,16f</Size>
-                        <Pos>35,1</Pos>
-                      </RateRange>
-                      <!-- Bottom range limit + prefix -->
-                      <RateRange>
-                        <TooltipId>rate_range_display</TooltipId>
-                        <ObjectName>RateDisplayBottom</ObjectName>
-                        <Channel><Variable name="ChanNum" /></Channel>
-                        <Position>Bottom</Position>
-                        <Display>prefix</Display>
-                        <Size>7f,16f</Size>
-                        <Pos>3,99</Pos>
-                      </RateRange>
-                      <RateRange>
-                        <TooltipId>rate_range_display</TooltipId>
-                        <ObjectName>RateDisplayBottom</ObjectName>
-                        <Channel><Variable name="ChanNum" /></Channel>
-                        <Position>Bottom</Position>
-                        <Display>range</Display>
-                        <Size>18f,16f</Size>
-                        <Pos>35,99</Pos>
-                      </RateRange>
+                      <SingletonContainer>
+                        <ObjectName>RateRangeDisplayTop<Variable name="ChanNum"/></ObjectName>
+                      </SingletonContainer>
+                      <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+                      <SingletonContainer>
+                        <ObjectName>RateRangeDisplayBottom<Variable name="ChanNum"/></ObjectName>
+                      </SingletonContainer>
                     </Children>
-                  </WidgetGroup><!-- Pitch range indicators -->
+                  </WidgetGroup><!-- Rate range indicators -->
                 </Children>
               </WidgetGroup><!-- Rate slider + range displays -->
 
diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml
index fb70171d5d..e89e6af9cd 100644
--- a/res/skins/LateNight/decks/rate_controls_compact.xml
+++ b/res/skins/LateNight/decks/rate_controls_compact.xml
@@ -139,50 +139,19 @@
                         </Children>
                       </WidgetGroup><!-- Rate slider + center indicator -->
 
-                      <!-- Pitch range indicators: prefix / spacer / range number -->
-                      <WidgetGroup>
+                      <WidgetGroup><!-- Rate range indicators -->
                         <SizePolicy>min,me</SizePolicy>
+                        <Layout>vertical</Layout>
                         <Children>
-                          <!-- Top range limit + prefix -->
-                          <RateRange>
-                            <TooltipId>rate_range_display</TooltipId>
-                            <ObjectName>RateDisplayTop</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>RateDisplayTop</ObjectName>
-                            <Channel><Variable name="ChanNum" /></Channel>
-                            <Position>Top</Position>
-                            <Display>range</Display>
-                            <Size>18f,16f</Size>
-                            <Pos>35,1</Pos>
-                          </RateRange>
-                          <!-- Bottom range limit + prefix -->
-                          <RateRange>
-                            <TooltipId>rate_range_display</TooltipId>
-                            <ObjectName>RateDisplayBottom</ObjectName>
-                            <Channel><Variable name="ChanNum" /></Channel>
-                            <Position>Bottom</Position>
-                            <Display>prefix</Display>
-                            <Size>7f,16f</Size>
-                            <Pos>3,65</Pos>
-                          </RateRange>
-                          <RateRange>
-                            <TooltipId>rate_range_display</TooltipId>
-                            <ObjectName>RateDisplayBottom</ObjectName>
-                            <Channel><Variable name="ChanNum" /></Channel>
-                            <Position>Bottom</Position>
-                            <Display>range</Display>
-                            <Size>18f,16f</Size>
-                            <Pos>35,65</Pos>
-                          </RateRange>
+                          <SingletonContainer>
+                            <ObjectName>RateRangeDisplayTop<Variable name="ChanNum"/></ObjectName>
+                          </SingletonContainer>
+                          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+                          <SingletonContainer>
+                            <ObjectName>RateRangeDisplayBottom<Variable name="ChanNum"/></ObjectName>
+                          </SingletonContainer>
                         </Children>
-                      </WidgetGroup><!-- Pitch range indicators -->
+                      </WidgetGroup><!-- Rate range indicators -->
                     </Children>
                   </WidgetGroup><!-- Rate slider + range displays -->
                 </Children>
@@ -232,50 +201,19 @@
                     </Children>
                   </WidgetGroup><!-- Rate slider + center indicator -->
 
-                  <!-- Pitch range indicators: prefix / spacer / range number -->
-                  <WidgetGroup>
+                  <WidgetGroup><!-- Rate range indicators -->
                     <SizePolicy>min,me</SizePolicy>
+                    <Layout>vertical</Layout>
                     <Children>
-                      <!-- Top range limit + prefix -->
-                      <RateRange>
-                        <TooltipId>rate_range_display</TooltipId>
-                        <ObjectName>RateDisplayTop</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>RateDisplayTop</ObjectName>
-                        <Channel><Variable name="ChanNum" /></Channel>
-                        <Position>Top</Position>
-                        <Display>range</Display>
-                        <Size>18f,16f</Size>
-                        <Pos>35,1</Pos>
-                      </RateRange>
-                      <!-- Bottom range limit + prefix -->
-                      <RateRange>
-                        <TooltipId>rate_range_display</TooltipId>
-                        <ObjectName>RateDisplayBottom</ObjectName>
-                        <Channel><Variable name="ChanNum" /></Channel>
-                        <Position>Bottom</Position>
-                        <Display>prefix</Display>
-                        <Size>7f,16f</Size>
-                        <Pos>3,81</Pos>
-                      </RateRange>
-                      <RateRange>
-                        <TooltipId>rate_range_display</TooltipId>
-                        <ObjectName>RateDisplayBottom</ObjectName>
-                        <Channel><Variable name="ChanNum" /></Channel>
-                        <Position>Bottom</Position>
-                        <Display>range</Display>
-                        <Size>18f,16f</Size>
-                        <Pos>35,81</Pos>
-                      </RateRange>
+                      <SingletonContainer>
+                        <ObjectName>RateRangeDisplayTop<Variable name="ChanNum"/></ObjectName>
+                      </SingletonContainer>
+                      <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+                      <SingletonContainer>
+                        <ObjectName>RateRangeDisplayBottom<Variable name="ChanNum"/></ObjectName>
+                      </SingletonContainer>
                     </Children>
-                  </WidgetGroup><!-- Pitch range indicators -->
+                  </WidgetGroup><!-- Rate range indicators -->
                 </Children>
                 <Connection>
                   <ConfigKey persist="true">[LateNight],show_sync_button_compact</ConfigKey>
-- 
cgit v1.2.3


From f0a04278d2198936e0f3f3eb5bd6144f00b701ea Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Fri, 12 Mar 2021 12:53:24 +0100
Subject: Shade: Add rate range display to tempo slider

---
 res/skins/Shade/deck.xml  | 43 +++++++++++++++++++++++++++++++++++++++++--
 res/skins/Shade/style.qss |  5 +++++
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/res/skins/Shade/deck.xml b/res/skins/Shade/deck.xml
index ee40bcb84a..8484886045 100644
--- a/res/skins/Shade/deck.xml
+++ b/res/skins/Shade/deck.xml
@@ -516,6 +516,45 @@
                     </Connection>
                   </SliderComposed>
 
+                  <!-- Pitch range indicators -->
+                  <RateRange>
+                    <TooltipId>rate_range_display</TooltipId>
+                    <ObjectName>RateDisplayTopPrefix</ObjectName>
+                    <Channel><Variable name="channum" /></Channel>
+                    <Position>Top</Position>
+                    <Display>prefix</Display>
+                    <Size>20f,-1me</Size>
+                    <Pos>0,62</Pos>
+                  </RateRange>
+                  <RateRange>
+                    <TooltipId>rate_range_display</TooltipId>
+                    <ObjectName>RateDisplayTopRate</ObjectName>
+                    <Channel><Variable name="channum" /></Channel>
+                    <Position>Top</Position>
+                    <Display>range</Display>
+                    <Size>20f,-1me</Size>
+                    <Pos>32,62</Pos>
+                  </RateRange>
+                  <RateRange>
+                    <TooltipId>rate_range_display</TooltipId>
+                    <ObjectName>RateDisplayBottomPrefix</ObjectName>
+                    <Channel><Variable name="channum" /></Channel>
+                    <Position>Bottom</Position>
+                    <Align>Bottom</Align>
+                    <Display>prefix</Display>
+                    <Size>20f,-1me</Size>
+                    <Pos>0,148</Pos>
+                  </RateRange>
+                  <RateRange>
+                    <TooltipId>rate_range_display</TooltipId>
+                    <ObjectName>RateDisplayBottomRate</ObjectName>
+                    <Channel><Variable name="channum" /></Channel>
+                    <Align>Bottom</Align>
+                    <Display>range</Display>
+                    <Size>20f,-1me</Size>
+                    <Pos>32,148</Pos>
+                  </RateRange>
+
                   <SliderComposed>
                     <TooltipId>rate</TooltipId>
                     <Handle>knob_pitch.png</Handle>
@@ -536,7 +575,7 @@
                       <Number>0</Number>
                       <Text>►</Text>
                     </State>
-                    <Pos>36,148</Pos>
+                    <Pos>36,138</Pos>
                     <Connection>
                       <ConfigKey><Variable name="group"/>,rate_temp_up</ConfigKey>
                       <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
@@ -557,7 +596,7 @@
                       <Number>0</Number>
                       <Text>◄</Text>
                     </State>
-                    <Pos>7,148</Pos>
+                    <Pos>7,138</Pos>
                     <Connection>
                       <ConfigKey><Variable name="group"/>,rate_temp_down</ConfigKey>
                       <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 6b4bce8eca..fb1783e51e 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -915,3 +915,8 @@ QPushButton#pushButtonRepeatPlaylist {
 #HotcueButton {
     background-color: #aab2b7;
 }
+
+WRateRange {
+  font-size: 10px;
+  qproperty-alignment: 'AlignCenter';
+}
-- 
cgit v1.2.3


From deb0cb2e75b40a949720c71f2347963c3650ecc1 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Fri, 12 Mar 2021 13:26:03 +0100
Subject: Tango: Add rate range to pitch slider

---
 res/skins/Tango/rate_pitch_key.xml | 89 ++++++++++++++++++++++++++++++++------
 res/skins/Tango/style.qss          | 16 ++++++-
 2 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/res/skins/Tango/rate_pitch_key.xml b/res/skins/Tango/rate_pitch_key.xml
index faee2b07fc..fc2e2be342 100644
--- a/res/skins/Tango/rate_pitch_key.xml
+++ b/res/skins/Tango/rate_pitch_key.xml
@@ -163,20 +163,83 @@ Variables:
             </Connection>
           </WidgetGroup><!-- /Rate adjust buttons -->
 
-          <SliderComposed>
-            <ObjectName>PitchSlider</ObjectName>
-