Merge pull request #3003 from ronso0/overview-loop-visibility

Overview: allow custom range opacity, improve mark rendering
mixxxdj · Aug 21, 2020 · 522b4b9 · 522b4b9
2 parents 741e04d + ac99c6a
commit 522b4b9
Show file tree

Hide file tree

Showing 12 changed files with 299 additions and 193 deletions.
diff --git a/res/skins/Deere/deck_overview.xml b/res/skins/Deere/deck_overview.xml
@@ -29,67 +29,74 @@
       <TextColor>#FFFFFF</TextColor>
       <Text> %1 </Text>
     </DefaultMark>
+    <Mark>
+      <Control>cue_point</Control>
+      <Align>top|right</Align>
+      <Color>#FF001C</Color>
+      <TextColor>#FFFFFF</TextColor>
+      <Text>C</Text>
+    </Mark>
+    <!-- Loop -->
     <MarkRange>
       <StartControl>loop_start_position</StartControl>
       <EndControl>loop_end_position</EndControl>
       <EnabledControl>loop_enabled</EnabledControl>
       <Color>#00FF00</Color>
+      <Opacity>0.7</Opacity>
       <DisabledColor>#FFFFFF</DisabledColor>
+      <DisabledOpacity>0.6</DisabledOpacity>
     </MarkRange>
+    <!-- Intro -->
     <MarkRange>
       <StartControl>intro_start_position</StartControl>
       <EndControl>intro_end_position</EndControl>
-      <Color>#0000FF</Color>
       <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-      <DurationTextColor>#ffffff</DurationTextColor>
-      <DurationTextLocation>after</DurationTextLocation>
-    </MarkRange>
-    <MarkRange>
-      <StartControl>outro_start_position</StartControl>
-      <EndControl>outro_end_position</EndControl>
       <Color>#0000FF</Color>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+      <Opacity>0.6</Opacity>
       <DurationTextColor>#ffffff</DurationTextColor>
-      <DurationTextLocation>before</DurationTextLocation>
+      <DurationTextLocation>after</DurationTextLocation>
     </MarkRange>
     <Mark>
       <Control>intro_start_position</Control>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
       <Text></Text>
       <Align>top|right</Align>
       <Color>#0000FF</Color>
       <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
     </Mark>
     <Mark>
       <Control>intro_end_position</Control>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
       <Text>&#9698;</Text>
       <Align>top|left</Align>
       <Color>#0000FF</Color>
       <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
     </Mark>
+    <!-- Outro -->
+    <MarkRange>
+      <StartControl>outro_start_position</StartControl>
+      <EndControl>outro_end_position</EndControl>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+      <Color>#0000FF</Color>
+      <Opacity>0.6</Opacity>
+      <DurationTextColor>#ffffff</DurationTextColor>
+      <DurationTextLocation>before</DurationTextLocation>
+    </MarkRange>
     <Mark>
       <Control>outro_start_position</Control>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
       <Text>&#9699;</Text>
       <Align>top|right</Align>
       <Color>#0000FF</Color>
       <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
     </Mark>
     <Mark>
       <Control>outro_end_position</Control>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
       <Text></Text>
       <Align>top|left</Align>
       <Color>#0000FF</Color>
       <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-    </Mark>
-    <Mark>
-      <Control>cue_point</Control>
-      <Align>top|right</Align>
-      <Color>#FF001C</Color>
-      <TextColor>#FFFFFF</TextColor>
-      <Text>C</Text>
     </Mark>
     <Connection>
       <ConfigKey><Variable name="group"/>,playposition</ConfigKey>

diff --git a/res/skins/Deere/deck_visual_row.xml b/res/skins/Deere/deck_visual_row.xml
@@ -38,12 +38,23 @@
           <TextColor>#000000</TextColor>
           <Text> %1 </Text>
         </DefaultMark>
+        <Mark>
+          <Control>cue_point</Control>
+          <Pixmap>image/marker_cue.png</Pixmap>
+          <Text>CUE</Text>
+          <Align>bottom</Align>
+          <Color>#FF001C</Color>
+          <TextColor>#FFFFFF</TextColor>
+        </Mark>
+        <!-- Loop -->
         <MarkRange>
           <StartControl>loop_start_position</StartControl>
           <EndControl>loop_end_position</EndControl>
           <EnabledControl>loop_enabled</EnabledControl>
           <Color>#00FF00</Color>
+          <Opacity>0.8</Opacity>
           <DisabledColor>#FFFFFF</DisabledColor>
+          <DisabledOpacity>0.5</DisabledOpacity>
         </MarkRange>
         <Mark>
           <Control>loop_start_position</Control>
@@ -61,63 +72,59 @@
           <Color>#00FF00</Color>
           <TextColor>#FFFFFF</TextColor>
         </Mark>
+        <!-- Intro -->
         <MarkRange>
           <StartControl>intro_start_position</StartControl>
           <EndControl>intro_end_position</EndControl>
-          <Color>#0000FF</Color>
           <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-        </MarkRange>
-        <MarkRange>
-          <StartControl>outro_start_position</StartControl>
-          <EndControl>outro_end_position</EndControl>
           <Color>#0000FF</Color>
-          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+          <Opacity>0.1</Opacity>
         </MarkRange>
         <Mark>
           <Control>intro_start_position</Control>
+          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
           <Text>|&#9698;</Text>
           <Align>bottom</Align>
           <Color>#0000FF</Color>
           <TextColor>#FFFFFF</TextColor>
-          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
         </Mark>
         <Mark>
           <Control>intro_end_position</Control>
+          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
           <Text>&#9698;|</Text>
           <Align>bottom</Align>
           <Color>#0000FF</Color>
           <TextColor>#FFFFFF</TextColor>
-          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
         </Mark>
+        <!-- Outro -->
+        <MarkRange>
+          <StartControl>outro_start_position</StartControl>
+          <EndControl>outro_end_position</EndControl>
+          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+          <Color>#0000FF</Color>
+          <Opacity>0.1</Opacity>
+        </MarkRange>
         <Mark>
           <Control>outro_start_position</Control>
+          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
           <Text>|&#9699;</Text>
           <Align>bottom</Align>
           <Color>#0000FF</Color>
           <TextColor>#FFFFFF</TextColor>
-          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
         </Mark>
         <Mark>
           <Control>outro_end_position</Control>
+          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
           <Text>&#9699;|</Text>
           <Align>bottom</Align>
           <Color>#0000FF</Color>
           <TextColor>#FFFFFF</TextColor>
-          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
         </Mark>
         <!--
         The hotcues not represented by a button in the current skin show only in the waveform under two circumstances:
         - if a MIDI device which supports more hotcues than buttons are in the current skin has them activated
         - if you change from a skin which supports more hotcues than buttons are in the current skin (and has them activated)
         -->
-        <Mark>
-          <Control>cue_point</Control>
-          <Pixmap>image/marker_cue.png</Pixmap>
-          <Text>CUE</Text>
-          <Align>bottom</Align>
-          <Color>#FF001C</Color>
-          <TextColor>#FFFFFF</TextColor>
-        </Mark>
       </Visual>
 
       <WidgetGroup>

diff --git a/res/skins/LateNight/decks/overview.xml b/res/skins/LateNight/decks/overview.xml
@@ -40,17 +40,20 @@
       <EndControl>loop_end_position</EndControl>
       <EnabledControl>loop_enabled</EnabledControl>
       <Color><Variable name="LoopColor"/></Color>
+      <Opacity>0.7</Opacity>
       <DisabledColor>#FFFFFF</DisabledColor>
+      <DisabledOpacity>0.6</DisabledOpacity>
     </MarkRange>
     <Mark>
       <Control>loop_start_position</Control>
-      <!--Text>IN</Text-->
-      <Align>bottom|right</Align>
+      <Text>&#8635;</Text>
+      <Align>top|left</Align>
       <Color><Variable name="LoopColor"/></Color>
       <TextColor>#FFFFFF</TextColor>
     </Mark>
     <Mark>
       <Control>loop_end_position</Control>
+      <VisibilityControl><Variable name="Group"/>,loop_enabled</VisibilityControl>
       <!--Text>OUT</Text-->
       <Align>bottom|right</Align>
       <Color><Variable name="LoopColor"/></Color>
@@ -60,51 +63,53 @@
     <MarkRange>
       <StartControl>intro_start_position</StartControl>
       <EndControl>intro_end_position</EndControl>
-      <Color><Variable name="IntroOutroColor"/></Color>
       <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+      <Color><Variable name="IntroOutroColor"/></Color>
+      <Opacity>0.6</Opacity>
       <DurationTextColor>#ffffff</DurationTextColor>
       <DurationTextLocation>after</DurationTextLocation>
     </MarkRange>
     <Mark>
       <Control>intro_start_position</Control>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
       <Text></Text>
       <Align>top|right</Align>
       <Color><Variable name="IntroOutroColor"/></Color>
       <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
     </Mark>
     <Mark>
       <Control>intro_end_position</Control>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
       <Text>&#9698;</Text>
       <Align>top|left</Align>
       <Color><Variable name="IntroOutroColor"/></Color>
       <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
     </Mark>
     <!-- Outro -->
     <MarkRange>
       <StartControl>outro_start_position</StartControl>
       <EndControl>outro_end_position</EndControl>
-      <Color><Variable name="IntroOutroColor"/></Color>
       <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+      <Color><Variable name="IntroOutroColor"/></Color>
+      <Opacity>0.6</Opacity>
       <DurationTextColor>#ffffff</DurationTextColor>
       <DurationTextLocation>before</DurationTextLocation>
     </MarkRange>
     <Mark>
       <Control>outro_start_position</Control>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
       <Text>&#9699;</Text>
       <Align>top|right</Align>
       <Color><Variable name="IntroOutroColor"/></Color>
       <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
     </Mark>
     <Mark>
       <Control>outro_end_position</Control>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
       <Text></Text>
       <Align>top|left</Align>
       <Color><Variable name="IntroOutroColor"/></Color>
       <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
     </Mark>
   </Overview>
 </Template>
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
@@ -49,18 +49,19 @@
               <EndControl>loop_end_position</EndControl>
               <EnabledControl>loop_enabled</EnabledControl>
               <Color><Variable name="LoopColor"/></Color>
+              <Opacity>0.8</Opacity>
               <DisabledColor>#FFFFFF</DisabledColor>
+              <DisabledOpacity>0.5</DisabledOpacity>
             </MarkRange>
             <Mark>
               <Control>loop_start_position</Control>
-              <!--Text>IN</Text-->
-              <Align>bottom|right</Align>
+              <Text>&#8635;</Text>
+              <Align>top|left</Align>
               <Color><Variable name="LoopColor"/></Color>
               <TextColor>#FFFFFF</TextColor>
             </Mark>
             <Mark>
               <Control>loop_end_position</Control>
-              <!--Text>OUT</Text-->
               <Align>bottom|right</Align>
               <Color><Variable name="LoopColor"/></Color>
               <TextColor>#FFFFFF</TextColor>
@@ -69,51 +70,53 @@
             <MarkRange>
               <StartControl>intro_start_position</StartControl>
               <EndControl>intro_end_position</EndControl>
-              <Color><Variable name="IntroOutroColor"/></Color>
               <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+              <Color><Variable name="IntroOutroColor"/></Color>
+              <Opacity>0.1</Opacity>
               <DurationTextColor>#ffffff</DurationTextColor>
               <DurationTextLocation>after</DurationTextLocation>
             </MarkRange>
             <Mark>
               <Control>intro_start_position</Control>
+              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
               <Text></Text>
               <Align>top|right</Align>
               <Color><Variable name="IntroOutroColor"/></Color>
               <TextColor>#FFFFFF</TextColor>
-              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
             </Mark>
             <Mark>
               <Control>intro_end_position</Control>
+              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
               <Text>&#9698;</Text>
               <Align>top|left</Align>
               <Color><Variable name="IntroOutroColor"/></Color>
               <TextColor>#FFFFFF</TextColor>
-              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
             </Mark>
             <!-- Outro -->
             <MarkRange>
               <StartControl>outro_start_position</StartControl>
               <EndControl>outro_end_position</EndControl>
-              <Color><Variable name="IntroOutroColor"/></Color>
               <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+              <Color><Variable name="IntroOutroColor"/></Color>
+              <Opacity>0.1</Opacity>
               <DurationTextColor>#ffffff</DurationTextColor>
               <DurationTextLocation>before</DurationTextLocation>
             </MarkRange>
             <Mark>
               <Control>outro_start_position</Control>
+              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
               <Text>&#9699;</Text>
               <Align>top|right</Align>
               <Color><Variable name="IntroOutroColor"/></Color>
               <TextColor>#FFFFFF</TextColor>
-              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
             </Mark>
             <Mark>
               <Control>outro_end_position</Control>
+              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
               <Text></Text>
               <Align>top|left</Align>
               <Color><Variable name="IntroOutroColor"/></Color>
               <TextColor>#FFFFFF</TextColor>
-              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
             </Mark>
           </Visual>
         </Children>