From fb572acc6ea3cd4b9aaaa3b2098ecbd24f001ef3 Mon Sep 17 00:00:00 2001
From: Josef Schauer <schauher@mur.at>
Date: Mon, 17 Mar 2014 23:09:42 +0000
Subject: background


diff --git a/RHMixxx1280x800/background1280x1024.png b/RHMixxx1280x800/background1280x1024.png
index 4991e58..741d666 100644
Binary files a/RHMixxx1280x800/background1280x1024.png and b/RHMixxx1280x800/background1280x1024.png differ
diff --git a/RHMixxx1280x800/background1280x1024.xcf b/RHMixxx1280x800/background1280x1024.xcf
index d547244..4ab442d 100644
Binary files a/RHMixxx1280x800/background1280x1024.xcf and b/RHMixxx1280x800/background1280x1024.xcf differ
diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml
index 6a13aa9..57e8dbe 100755
--- a/RHMixxx1280x800/skin.xml
+++ b/RHMixxx1280x800/skin.xml
@@ -644,106 +644,31 @@
 					<ConnectValueToWidget>false</ConnectValueToWidget>
 				</Connection>
 			</PushButton>
-
-			<!-- Channel 2: Button cue -->
+			
+			
 			<PushButton>
-				<Tooltip>Cue&#10;Left-click (while playing): The track will seek to the cue-point and play.&#10;Left-click (while stopped): Places a cue-point at the current position in the track.&#10;Right-click: Will seek to the cue-point and stop.&#10;</Tooltip>
+				<TooltipId>cue_default_cue_gotoandstop</TooltipId>
 				<Style></Style>
 				<NumberStates>1</NumberStates>
 				<State>
 					<Number>0</Number>
-					<Pressed>btn_cue_over.png</Pressed>
-					<Unpressed>btn_cue.png</Unpressed>
+					<Pressed>btn_stop_red.png</Pressed>
+					<Unpressed>btn_stop.png</Unpressed>
 				</State>
-				<Pos>0,109</Pos>
-				<Connection>
-					<ConfigKey>[Channel2],cue_default</ConfigKey>
-					<EmitOnDownPress>true</EmitOnDownPress>
-					<ButtonState>LeftButton</ButtonState>
-				</Connection>
+				<Pos>335,60</Pos>
 				<Connection>
-					<ConfigKey>[Channel2],cue_default</ConfigKey>
-					<EmitOnDownPress>false</EmitOnDownPress>
+					<ConfigKey>[Channe2],start_stop</ConfigKey>
+					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 					<ButtonState>LeftButton</ButtonState>
 				</Connection>
 				<Connection>
-					<ConfigKey>[Channel2],cue_gotoandstop</ConfigKey>
-					<EmitOnDownPress>true</EmitOnDownPress>
-					<ButtonState>RightButton</ButtonState>
-				</Connection>
-				<Connection>
-					<ConfigKey>[Channel2],cue_gotoandstop</ConfigKey>
-					<EmitOnDownPress>false</EmitOnDownPress>
+					<ConfigKey>[Channe2],start_stop</ConfigKey>
+					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 					<ButtonState>RightButton</ButtonState>
 				</Connection>
 			</PushButton>
+            
 
-
-			<!-- Channel 2: Button ff -->
-		    <PushButton>
-		        <Tooltip>Fast Forward&#10;Left-click: Fast forward through the track.&#10;Right-click: Jumps to the end of the track.&#10;</Tooltip>
-		        <Style></Style>
-		        <NumberStates>1</NumberStates>
-		        <State>
-		            <Number>0</Number>
-		            <Pressed>btn_forward_over.png</Pressed>
-		            <Unpressed>btn_forward.png</Unpressed>
-		        </State>
-		        <Pos>101,109</Pos>
-		        <Connection>
-		            <ConfigKey>[Channel2],fwd</ConfigKey>
-		            <EmitOnDownPress>true</EmitOnDownPress>
-		            <ButtonState>LeftButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel2],fwd</ConfigKey>
-		            <EmitOnDownPress>false</EmitOnDownPress>
-		            <ButtonState>LeftButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel2],end</ConfigKey>
-		            <EmitOnDownPress>true</EmitOnDownPress>
-		            <ButtonState>RightButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel2],end</ConfigKey>
-		            <EmitOnDownPress>false</EmitOnDownPress>
-		            <ButtonState>RightButton</ButtonState>
-		        </Connection>
-		    </PushButton>
-
-		    <!-- Channel 2: Button rr -->
-		    <PushButton>
-		        <Tooltip>Fast Rewind&#10;Left-click: Fast rewind through the track.&#10;Right-click: Jumps to the beginning of the track.&#10;</Tooltip>
-		        <Style></Style>
-		        <NumberStates>1</NumberStates>
-		        <State>
-		            <Number>0</Number>
-		            <Pressed>btn_rewind_over.png</Pressed>
-		            <Unpressed>btn_rewind.png</Unpressed>
-		        </State>
-		        <Pos>51,109</Pos>
-		        <Connection>
-		            <ConfigKey>[Channel2],back</ConfigKey>
-		            <EmitOnDownPress>true</EmitOnDownPress>
-		            <ButtonState>LeftButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel2],back</ConfigKey>
-		            <EmitOnDownPress>false</EmitOnDownPress>
-		            <ButtonState>LeftButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel2],start</ConfigKey>
-		            <EmitOnDownPress>true</EmitOnDownPress>
-		            <ButtonState>RightButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel2],start</ConfigKey>
-		            <EmitOnDownPress>false</EmitOnDownPress>
-		            <ButtonState>RightButton</ButtonState>
-		        </Connection>
-		    </PushButton>
     </Children>
     </WidgetGroup>
 
@@ -771,9 +696,10 @@
 				<PeakFallTime>50</PeakFallTime>
 				<PeakFallStep>1</PeakFallStep>
 				<Connection>
-					<ConfigKey>[Channel1],VuMeter</ConfigKey>
+					<ConfigKey>[Channel1],VuMeterL</ConfigKey>
 				</Connection>
 			</VuMeter>
+			
 			<StatusLight>
 				<Tooltip>Peak Indicator&#10;Indicates when the signal on the channel is clipping,&#10;(too loud for the hardware and is being distorted).&#10;</Tooltip>
 				<Style></Style>
@@ -781,13 +707,40 @@
 				<PathBack>btn_clipping.png</PathBack>
 				<Pos>24,34</Pos>
 				<Connection>
-					<ConfigKey>[Channel1],PeakIndicator</ConfigKey>
+					<ConfigKey>[Channel1],PeakIndicatorL</ConfigKey>
 				</Connection>
 			</StatusLight>
 			
+			
+			<VuMeter>
+				<Tooltip>Channel volume meter&#10;Shows the right channel (1) volume&#10;</Tooltip>
+				<Style></Style>
+				<PathVu>btn_volume_display_small_over.png</PathVu>
+				<PathBack>btn_volume_display_small.png</PathBack>
+				<Pos>34,34</Pos>
+				<Horizontal>false</Horizontal>
+				<PeakHoldSize>5</PeakHoldSize>
+				<PeakHoldTime>500</PeakHoldTime>
+				<PeakFallTime>50</PeakFallTime>
+				<PeakFallStep>1</PeakFallStep>
+				<Connection>
+					<ConfigKey>[Channel1],VuMeterR</ConfigKey>
+				</Connection>
+			</VuMeter>
+			
+			<StatusLight>
+				<Tooltip>Peak Indicator&#10;Indicates when the signal on the right channel is clipping,&#10;(too loud for the hardware and is being distorted).&#10;</Tooltip>
+				<Style></Style>
+				<PathStatusLight>btn_clipping_over.png</PathStatusLight>
+				<PathBack>btn_clipping.png</PathBack>
+				<Pos>24,34</Pos>
+				<Connection>
+					<ConfigKey>[Channel1],PeakIndicatorR</ConfigKey>
+				</Connection>
+			</StatusLight>
 						<!-- CHANNEL 2 -->
 			<VuMeter>
-				<Tooltip>Channel volume meter&#10;Shows the right channel (2) volume&#10;</Tooltip>
+				<Tooltip>Channel volume meter&#10;Shows the left channel (2) volume&#10;</Tooltip>
 				<Style></Style>
 				<PathVu>btn_volume_display_small_over.png</PathVu>
 				<PathBack>btn_volume_display_small.png</PathBack>
@@ -798,7 +751,34 @@
 				<PeakFallTime>50</PeakFallTime>
 				<PeakFallStep>1</PeakFallStep>
 				<Connection>
-					<ConfigKey>[Channel2],VuMeter</ConfigKey>
+					<ConfigKey>[Channel2],VuMeterL</ConfigKey>
+				</Connection>
+			</VuMeter>
+
+			<StatusLight>
+				<Tooltip>Peak Indicator&#10;Indicates when the signal on the left channel is clipping,&#10;(too loud for the hardware and is being distorted).&#10;</Tooltip>
+				<Style></Style>
+				<PathStatusLight>btn_clipping_over.png</PathStatusLight>
+				<PathBack>btn_clipping.png</PathBack>
+				<Pos>204,34</Pos>
+				<Connection>
+					<ConfigKey>[Channel2],PeakIndicatorL</ConfigKey>
+				</Connection>
+			</StatusLight>
+			
+			<VuMeter>
+				<Tooltip>Channel volume meter&#10;Shows the right channel (2) volume&#10;</Tooltip>
+				<Style></Style>
+				<PathVu>btn_volume_display_small_over.png</PathVu>
+				<PathBack>btn_volume_display_small.png</PathBack>
+				<Pos>214,34</Pos>
+				<Horizontal>false</Horizontal>
+				<PeakHoldSize>5</PeakHoldSize>
+				<PeakHoldTime>500</PeakHoldTime>
+				<PeakFallTime>50</PeakFallTime>
+				<PeakFallStep>1</PeakFallStep>
+				<Connection>
+					<ConfigKey>[Channel2],VuMeterR</ConfigKey>
 				</Connection>
 			</VuMeter>
 
@@ -809,7 +789,7 @@
 				<PathBack>btn_clipping.png</PathBack>
 				<Pos>204,34</Pos>
 				<Connection>
-					<ConfigKey>[Channel2],PeakIndicator</ConfigKey>
+					<ConfigKey>[Channel2],PeakIndicatorR</ConfigKey>
 				</Connection>
 			</StatusLight>
 		</Children>
-- 
cgit v0.10.2