From 41157a3923a8bb333e936405816f4c333c06ac4c Mon Sep 17 00:00:00 2001
From: Josef Schauer <schauher@mur.at>
Date: Sun, 6 Apr 2014 21:40:04 +0000
Subject: sdsd


diff --git a/RHMixxx1280x800/background1280x1024.png b/RHMixxx1280x800/background1280x1024.png
index a27f25b..ed1a1ed 100644
Binary files a/RHMixxx1280x800/background1280x1024.png and b/RHMixxx1280x800/background1280x1024.png differ
diff --git a/RHMixxx1280x800/background1280x1024.xcf b/RHMixxx1280x800/background1280x1024.xcf
index fda9540..0d315df 100644
Binary files a/RHMixxx1280x800/background1280x1024.xcf and b/RHMixxx1280x800/background1280x1024.xcf differ
diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml
index 8f6f7d4..e9cf5b2 100755
--- a/RHMixxx1280x800/skin.xml
+++ b/RHMixxx1280x800/skin.xml
@@ -333,7 +333,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				</Style>
 				<Channel>1</Channel>
 				<Pos>10,1</Pos>
-				<Size>315,50</Size>
+				<Size>310,50</Size>
 				<BgColor>#ffffff</BgColor>
 				<HfcColor>#000000</HfcColor>
 				<SignalColor>#CC0000</SignalColor>
@@ -384,7 +384,11 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<TooltipId>waveform_overview</TooltipId>
 				<Channel>1</Channel>
 				<Pos>10,60</Pos>
+<<<<<<< .mine
+				<Size>254,40</Size>
+=======
 				<Size>259,42</Size>
+>>>>>>> .r63
 				<BgColor>#061319</BgColor>
 				<BgPixmap></BgPixmap>
 				<SignalColor>#CC0000</SignalColor>
@@ -412,7 +416,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<Pressed>btn_play_over.png</Pressed>
 					<Unpressed>btn_play_over.png</Unpressed>
 				</State>
-				<Pos>339,1</Pos>
+				<Pos>330,0</Pos>
 				<Connection>
 					<ConfigKey>[Channel1],play</ConfigKey>
 					<EmitOnDownPress>true</EmitOnDownPress>
@@ -458,7 +462,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<Pressed>btn_stop_red.png</Pressed>
 					<Unpressed>btn_stop.png</Unpressed>
 				</State>
-				<Pos>279,60</Pos>
+				<Pos>264,60</Pos>
 				<Connection>
 					<ConfigKey>[Channel1],start_stop</ConfigKey>
 					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
@@ -471,51 +475,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				</Connection>
 			</PushButton>
 			
-		    <!--Channel 1: VU-Meter Players-->
-			
-			<VuMeter>
-				<Tooltip>Channel volume meter&#10;Shows the left channel of player 1 volume&#10;</Tooltip>
-				<Style></Style>
-				<PathVu>btn_volume_display_small_over.png</PathVu>
-				<PathBack>btn_volume_display_small.png</PathBack>
-				<Pos>444,27</Pos>
-				<Horizontal>false</Horizontal>
-				<PeakHoldSize>5</PeakHoldSize>
-				<PeakHoldTime>500</PeakHoldTime>
-				<PeakFallTime>50</PeakFallTime>
-				<PeakFallStep>1</PeakFallStep>
-				<Connection>
-					<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>
-				<PathStatusLight>btn_clipping_master_over.png</PathStatusLight>
-				<PathBack>btn_clipping_master.png</PathBack>
-				<Pos>444,10</Pos>
-				<Connection>
-					<ConfigKey>[Channel1],PeakIndicator</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>458,27</Pos>
-				<Horizontal>false</Horizontal>
-				<PeakHoldSize>5</PeakHoldSize>
-				<PeakHoldTime>500</PeakHoldTime>
-				<PeakFallTime>50</PeakFallTime>
-				<PeakFallStep>1</PeakFallStep>
-				<Connection>
-					<ConfigKey>[Channel1],VuMeterR</ConfigKey>
-				</Connection>
-			</VuMeter>
+		    
 	    </Children>
     </WidgetGroup>
 
@@ -534,7 +494,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				</Style>
 				<Channel>2</Channel>
 				<Pos>0,1</Pos>
-				<Size>330,50</Size>
+				<Size>310,50</Size>
 				<BgColor>#ffffff</BgColor>
 				<HfcColor>#000000</HfcColor>
 				<SignalColor>#CC0000</SignalColor>
@@ -585,7 +545,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<TooltipId>waveform_overview</TooltipId>
 				<Channel>2</Channel>
 				<Pos>0,60</Pos>
-				<Size>260,40</Size>
+				<Size>254,40</Size>
 				<BgColor>#061319</BgColor>
 				<BgPixmap></BgPixmap>
 				<SignalColor>#CC0000</SignalColor>
@@ -613,7 +573,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<Pressed>btn_play_over.png</Pressed>
 					<Unpressed>btn_play_over.png</Unpressed>
 				</State>
-				<Pos>338,0</Pos>
+				<Pos>320,0</Pos>
 				<Connection>
 					<ConfigKey>[Channel2],play</ConfigKey>
 					<EmitOnDownPress>true</EmitOnDownPress>
@@ -659,7 +619,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<Pressed>btn_stop_red.png</Pressed>
 					<Unpressed>btn_stop.png</Unpressed>
 				</State>
-				<Pos>295,60</Pos>
+				<Pos>264,60</Pos>
 				<Connection>
 					<ConfigKey>[Channel2],start_stop</ConfigKey>
 					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
@@ -672,51 +632,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				</Connection>
 			</PushButton>
 			
-		    <!--Channel 2: VU-Meter-->
-			
-			<VuMeter>
-				<Tooltip>Channel volume meter&#10;Shows the left channel of player 1 volume&#10;</Tooltip>
-				<Style></Style>
-				<PathVu>btn_volume_display_small_over.png</PathVu>
-				<PathBack>btn_volume_display_small.png</PathBack>
-				<Pos>440,27</Pos>
-				<Horizontal>true</Horizontal>
-				<PeakHoldSize>5</PeakHoldSize>
-				<PeakHoldTime>500</PeakHoldTime>
-				<PeakFallTime>50</PeakFallTime>
-				<PeakFallStep>1</PeakFallStep>
-				<Connection>
-					<ConfigKey>[Channel2],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>
-				<PathStatusLight>btn_clipping_master_over.png</PathStatusLight>
-				<PathBack>btn_clipping_master.png</PathBack>
-				<Pos>440,10</Pos>
-				<Connection>
-					<ConfigKey>[Channel2],PeakIndicator</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>454,27</Pos>
-				<Horizontal>false</Horizontal>
-				<PeakHoldSize>5</PeakHoldSize>
-				<PeakHoldTime>500</PeakHoldTime>
-				<PeakFallTime>50</PeakFallTime>
-				<PeakFallStep>1</PeakFallStep>
-				<Connection>
-					<ConfigKey>[Channel2],VuMeter</ConfigKey>
-				</Connection>
-			</VuMeter>
+		   
     </Children>
     </WidgetGroup>
 
@@ -779,6 +695,112 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<ConfigKey>[Master],PeakIndicatorR</ConfigKey>
 				</Connection>
 			</StatusLight>
+			
+			
+			<!--Channel 1: VU-Meter Players-->
+			
+			<VuMeter>
+				<Tooltip>Channel volume meter&#10;Shows the left channel of player 1 volume&#10;</Tooltip>
+				<Style></Style>
+				<PathVu>Volume_long_over_player.png</PathVu>
+				<PathBack>Volume_long_player.png</PathBack>
+				<Pos>455,68</Pos>
+				<Horizontal>false</Horizontal>
+				<PeakHoldSize>5</PeakHoldSize>
+				<PeakHoldTime>500</PeakHoldTime>
+				<PeakFallTime>50</PeakFallTime>
+				<PeakFallStep>1</PeakFallStep>
+				<Connection>
+					<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>
+				<PathStatusLight>clipping_long_over_player.png</PathStatusLight>
+				<PathBack>clipping_long_player.png</PathBack>
+				<Pos>455,38</Pos>
+				<Connection>
+					<ConfigKey>[Channel1],PeakIndicator</ConfigKey>
+				</Connection>
+			</StatusLight>
+			
+			<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>
+				<PathStatusLight>clipping_long_over_player.png</PathStatusLight>
+				<PathBack>clipping_long_player.png</PathBack>
+				<Pos>475,38</Pos>
+				<Connection>
+					<ConfigKey>[Channel1],PeakIndicator</ConfigKey>
+				</Connection>
+			</StatusLight>
+			
+			
+			<VuMeter>
+				<Tooltip>Channel volume meter&#10;Shows the right channel (1) volume&#10;</Tooltip>
+				<Style></Style>
+				<PathVu>Volume_long_over_player.png</PathVu>
+				<PathBack>Volume_long_player.png</PathBack>
+				<Pos>475,68</Pos>
+				<Horizontal>false</Horizontal>
+				<PeakHoldSize>5</PeakHoldSize>
+				<PeakHoldTime>500</PeakHoldTime>
+				<PeakFallTime>50</PeakFallTime>
+				<PeakFallStep>1</PeakFallStep>
+				<Connection>
+					<ConfigKey>[Channel1],VuMeterR</ConfigKey>
+				</Connection>
+			</VuMeter>
+			
+			
+			
+			 <!--Channel 2: VU-Meter
+			
+			<VuMeter>
+				<Tooltip>Channel volume meter&#10;Shows the left channel of player 1 volume&#10;</Tooltip>
+				<Style></Style>
+				<PathVu>btn_volume_display_small_over.png</PathVu>
+				<PathBack>btn_volume_display_small.png</PathBack>
+				<Pos>440,27</Pos>
+				<Horizontal>true</Horizontal>
+				<PeakHoldSize>5</PeakHoldSize>
+				<PeakHoldTime>500</PeakHoldTime>
+				<PeakFallTime>50</PeakFallTime>
+				<PeakFallStep>1</PeakFallStep>
+				<Connection>
+					<ConfigKey>[Channel2],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>
+				<PathStatusLight>btn_clipping_master_over.png</PathStatusLight>
+				<PathBack>btn_clipping_master.png</PathBack>
+				<Pos>440,10</Pos>
+				<Connection>
+					<ConfigKey>[Channel2],PeakIndicator</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>454,27</Pos>
+				<Horizontal>false</Horizontal>
+				<PeakHoldSize>5</PeakHoldSize>
+				<PeakHoldTime>500</PeakHoldTime>
+				<PeakFallTime>50</PeakFallTime>
+				<PeakFallStep>1</PeakFallStep>
+				<Connection>
+					<ConfigKey>[Channel2],VuMeter</ConfigKey>
+				</Connection>
+			</VuMeter>-->
 		</Children>
 	</WidgetGroup>
 
@@ -790,7 +812,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 	<Time>
 	    <TooltipId>time</TooltipId>
 	    <Style>QLabel { font: bold 53px/50px Arial; color: #00000; }</Style>
-	    <Pos>508,100</Pos>
+	    <Pos>473,100</Pos>
 	    <Size>150,50</Size>
 	    <ShowSeconds>true</ShowSeconds>
 	    <ClockFormat>24</ClockFormat>
-- 
cgit v0.10.2