From b23c33ea02d7b0769d57cf57806ae6724d71a6e5 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jholthuis@mixxx.org>
Date: Sun, 7 Nov 2021 22:54:52 +0100
Subject: [PATCH] LateNight: Add buttons for setting/removing beats markers
 [WIP]

---
 .../buttons/btn__beats_remove_marker.svg      |  2 ++
 .../btn__beats_remove_marker_active.svg       |  2 ++
 ...os_large.svg => btn__beats_set_marker.svg} |  0
 ...e.svg => btn__beats_set_marker_active.svg} |  0
 res/skins/LateNight/style_palemoon.qss        | 14 +++++++---
 res/skins/LateNight/waveform.xml              | 27 ++++++++++++-------
 6 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 res/skins/LateNight/palemoon/buttons/btn__beats_remove_marker.svg
 create mode 100644 res/skins/LateNight/palemoon/buttons/btn__beats_remove_marker_active.svg
 rename res/skins/LateNight/palemoon/buttons/{btn__beat_curpos_large.svg => btn__beats_set_marker.svg} (100%)
 rename res/skins/LateNight/palemoon/buttons/{btn__beat_curpos_large_active.svg => btn__beats_set_marker_active.svg} (100%)

diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_remove_marker.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_remove_marker.svg
new file mode 100644
index 000000000000..86ac6e0a9a53
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_remove_marker.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"><g transform="translate(1,-10)"><path d="m8 31h2v-18h-2z"/><path d="m13 31h2v-18h-2z"/><path d="m18 31h2v-18h-2z"/><path d="m3 31h2v-18h-2z"/></g></g><g transform="translate(1,-10)" fill="#3f3d3d"><path d="m8 31h2v-18h-2z"/><path d="m13 31h2v-18h-2z"/><path d="m3 31h2v-18h-2z"/><path d="m18 31h2v-18h-2z"/></g></svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_remove_marker_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_remove_marker_active.svg
new file mode 100644
index 000000000000..628d885e42fe
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_remove_marker_active.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g transform="translate(1,-10)"><path d="m8 31h2v-18h-2z"/><path d="m13 31h2v-18h-2z"/><path d="m3 31h2v-18h-2z"/><path d="m18 31h2v-18h-2z"/></g></svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_set_marker.svg
similarity index 100%
rename from res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large.svg
rename to res/skins/LateNight/palemoon/buttons/btn__beats_set_marker.svg
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_set_marker_active.svg
similarity index 100%
rename from res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large_active.svg
rename to res/skins/LateNight/palemoon/buttons/btn__beats_set_marker_active.svg
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index 29dbf10fe2d8..0b09f6f4239d 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -2318,11 +2318,17 @@ WPushButton#PlayDeck[value="0"] {
     image: url(skin:../LateNight/palemoon/buttons/btn__beatgrid_controls_collapse.svg) no-repeat center center;
   }
 
-  #BeatCurposLarge[displayValue="0"] {
-    image: url(skin:../LateNight/palemoon/buttons/btn__beat_curpos_large.svg) no-repeat center center;
+  #BeatsSetMarker[displayValue="0"] {
+    image: url(skin:../LateNight/palemoon/buttons/btn__beats_set_marker.svg) no-repeat center center;
     }
-    #BeatCurposLarge[pressed="true"] {
-      image: url(skin:../LateNight/palemoon/buttons/btn__beat_curpos_large_active.svg) no-repeat center center;
+    #BeatsSetMarker[pressed="true"] {
+      image: url(skin:../LateNight/palemoon/buttons/btn__beats_set_marker_active.svg) no-repeat center center;
+    }
+  #BeatsRemoveMarker[displayValue="0"] {
+    image: url(skin:../LateNight/palemoon/buttons/btn__beats_remove_marker.svg) no-repeat center center;
+    }
+    #BeatsRemoveMarker[pressed="true"] {
+      image: url(skin:../LateNight/palemoon/buttons/btn__beats_remove_marker_active.svg) no-repeat center center;
     }
 
   #BeatsEarlier {
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index 4a86a6194fde..fbe1354e18d6 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -155,15 +155,24 @@
 
               <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
 
-              <!-- CurPos -->
-              <Template src="skin:../LateNight/controls/button_1state_right.xml">
-                <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
-                <SetVariable name="ObjectName">BeatCurposLarge</SetVariable>
-                <SetVariable name="Size">26f,52f</SetVariable>
-                <SetVariable name="BtnSize">library_tall</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="Group"/>,beats_translate_curpos</SetVariable>
-                <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beats_translate_match_alignment</SetVariable>
-              </Template>
+              <WidgetGroup><!-- beats set & remove marker -->
+                <Layout>vertical</Layout>
+                <Size>26f,52f</Size>
+                <Children>
+                  <Template src="skin:../LateNight/controls/button_1state.xml">
+                    <SetVariable name="TooltipId">beats_set_marker</SetVariable>
+                    <SetVariable name="ObjectName">BeatsSetMarker</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beats_set_marker</SetVariable>
+                  </Template>
+                  <Template src="skin:../LateNight/controls/button_1state.xml">
+                    <SetVariable name="TooltipId">beats_remove_marker</SetVariable>
+                    <SetVariable name="ObjectName">BeatsRemoveMarker</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beats_remove_marker</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup><!-- /beats set & remove marker -->
 
               <WidgetGroup><!-- beats earlier & faster -->
                 <Layout>vertical</Layout>