LateNight: Add buttons for setting/removing beats markers [WIP]

mixxxdj · Dec 18, 2023 · d6c5070 · d6c5070
1 parent f0054fe
commit d6c5070
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 13 deletions.
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_remove_marker.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_remove_marker.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
diff --git a/...lemoon/buttons/btn__beat_curpos_large.svg → ...alemoon/buttons/btn__beats_set_marker.svg b/...lemoon/buttons/btn__beat_curpos_large.svg → ...alemoon/buttons/btn__beats_set_marker.svg
diff --git a/...buttons/btn__beat_curpos_large_active.svg → .../buttons/btn__beats_set_marker_active.svg b/...buttons/btn__beat_curpos_large_active.svg → .../buttons/btn__beats_set_marker_active.svg
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
@@ -2322,11 +2322,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
@@ -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>