From 1db5477d4192d89b25e2402d3e4b0a8d8c589879 Mon Sep 17 00:00:00 2001
From: Josef Schauer <schauher@mur.at>
Date: Thu, 27 Mar 2014 16:44:23 +0000
Subject: skin player


diff --git a/RHMixxx1280x800/background1280x1024.png b/RHMixxx1280x800/background1280x1024.png
index db311b3..0690529 100644
Binary files a/RHMixxx1280x800/background1280x1024.png and b/RHMixxx1280x800/background1280x1024.png differ
diff --git a/RHMixxx1280x800/background1280x1024.xcf b/RHMixxx1280x800/background1280x1024.xcf
index 0fa7658..5ba13b4 100644
Binary files a/RHMixxx1280x800/background1280x1024.xcf and b/RHMixxx1280x800/background1280x1024.xcf differ
diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml
index 1a7ab87..cf7ff52 100755
--- a/RHMixxx1280x800/skin.xml
+++ b/RHMixxx1280x800/skin.xml
@@ -137,6 +137,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 		<Pos>25,18</Pos>
 		<Style>QGroupBox { border: 0px solid red; }</Style>
 		<Children>
+			
 			<!-- CHANNEL 1 -->
 			<Text>	
 				<Style>QLabel { font: bold 20px;
@@ -159,7 +160,8 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<ConfigKey>[Channel1],playposition</ConfigKey>
 				</Connection>
 			</NumberPos>
-			<!-- Album Year -->
+			
+			<!--Channel 1: Album Year -->
 			<TrackProperty>
 				<TooltipId>track_year</TooltipId>
 				<Style>QLabel { font-size: 14px;
@@ -170,7 +172,8 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<Pos>145,42</Pos>
 				<Size>40,28</Size>
 			</TrackProperty>
-			<!-- Album Title -->
+			
+			<!--Channel 1: Album Title -->
 			<TrackProperty>
 				<TooltipId>track_album</TooltipId>
 				<Style>QLabel { font-size: 14px;
@@ -214,7 +217,8 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<ConfigKey>[Channel2],playposition</ConfigKey>
 				</Connection>
 			</NumberPos>
-			<!-- Album Year -->
+			
+			<!--Channel 2: Album Year-->
 			<TrackProperty>
 				<TooltipId>track_year</TooltipId>
 				<Style>QLabel { font-size: 14px;
@@ -225,7 +229,8 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<Pos>145,42</Pos>
 				<Size>40,28</Size>
 			</TrackProperty>
-			<!-- Album Title -->
+			
+			<!--Channel 2: Album Title -->
 			<TrackProperty>
 				<TooltipId>track_album</TooltipId>
 				<Style>QLabel { font-size: 14px;
@@ -256,7 +261,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 	**********************************************
 	-->
 	<WidgetGroup>
-		<Pos>29,99</Pos>
+		<Pos>20,99</Pos>
 		<Style>QGroupBox { border: 0px solid red; }</Style>
 		<Children>
 			<Visual>
@@ -311,11 +316,11 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				</Mark>		
 			</Visual>
 			
-			<!-- Channel 1: Waveform Overview -->
+			<!--Channel 1: Waveform Overview -->
 			<Overview>
 				<TooltipId>waveform_overview</TooltipId>
 				<Channel>1</Channel>
-				<Pos>0,60</Pos>
+				<Pos>10,100</Pos>
 				<Size>260,40</Size>
 				<BgColor>#061319</BgColor>
 				<BgPixmap></BgPixmap>
@@ -344,7 +349,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<Pressed>btn_play_over.png</Pressed>
 					<Unpressed>btn_play_over.png</Unpressed>
 				</State>
-				<Pos>338,0</Pos>
+				<Pos>339,37</Pos>
 				<Connection>
 					<ConfigKey>[Channel1],play</ConfigKey>
 					<EmitOnDownPress>true</EmitOnDownPress>
@@ -410,7 +415,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<Style></Style>
 				<PathVu>btn_volume_display_small_over.png</PathVu>
 				<PathBack>btn_volume_display_small.png</PathBack>
-				<Pos>440,27</Pos>
+				<Pos>444,27</Pos>
 				<Horizontal>false</Horizontal>
 				<PeakHoldSize>5</PeakHoldSize>
 				<PeakHoldTime>500</PeakHoldTime>
@@ -426,7 +431,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<Style></Style>
 				<PathStatusLight>btn_clipping_master_over.png</PathStatusLight>
 				<PathBack>btn_clipping_master.png</PathBack>
-				<Pos>440,10</Pos>
+				<Pos>444,10</Pos>
 				<Connection>
 					<ConfigKey>[Channel1],PeakIndicator</ConfigKey>
 				</Connection>
@@ -438,7 +443,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<Style></Style>
 				<PathVu>btn_volume_display_small_over.png</PathVu>
 				<PathBack>btn_volume_display_small.png</PathBack>
-				<Pos>454,27</Pos>
+				<Pos>458,27</Pos>
 				<Horizontal>false</Horizontal>
 				<PeakHoldSize>5</PeakHoldSize>
 				<PeakHoldTime>500</PeakHoldTime>
@@ -464,9 +469,9 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<TooltipId>waveform_display</TooltipId>
 				<Style>
 				</Style>
-				<Channel>1</Channel>
+				<Channel>2</Channel>
 				<Pos>0,1</Pos>
-				<Size>331,50</Size>
+				<Size>330,50</Size>
 				<BgColor>#ffffff</BgColor>
 				<HfcColor>#000000</HfcColor>
 				<SignalColor>#CC0000</SignalColor>
@@ -515,7 +520,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 			<!-- Channel 2: Waveform Overview -->
 			<Overview>
 				<TooltipId>waveform_overview</TooltipId>
-				<Channel>1</Channel>
+				<Channel>2</Channel>
 				<Pos>0,60</Pos>
 				<Size>260,40</Size>
 				<BgColor>#061319</BgColor>
@@ -524,12 +529,12 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<PlayPosColor>#00FF00</PlayPosColor>
 				<EndOfTrackColor>#000000</EndOfTrackColor>
 				<Connection>
-					<ConfigKey>[Channel1],playposition</ConfigKey>
+					<ConfigKey>[Channel2],playposition</ConfigKey>
 					<EmitOnDownPress>false</EmitOnDownPress>
 				</Connection>
 			</Overview>			
 			
-			<!-- Channel 1: Button play -->
+			<!--Channel 2: Button play -->
 			<PushButton>
 				<Tooltip>Play/Pause&#10;Left-click: Toggles playing or pausing the track.&#10;Right-click: Places a Cue-point at the current point in the track.&#10;</Tooltip>
 				<Style></Style>
@@ -547,12 +552,12 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				</State>
 				<Pos>338,0</Pos>
 				<Connection>
-					<ConfigKey>[Channel1],play</ConfigKey>
+					<ConfigKey>[Channel2],play</ConfigKey>
 					<EmitOnDownPress>true</EmitOnDownPress>
 					<ButtonState>LeftButton</ButtonState>
 				</Connection>
 				<Connection>
-					<ConfigKey>[Channel1],cue_set</ConfigKey>
+					<ConfigKey>[Channel2],cue_set</ConfigKey>
 					<EmitOnDownPress>true</EmitOnDownPress>
 					<ButtonState>RightButton</ButtonState>
 					<ConnectValueToWidget>false</ConnectValueToWidget>
@@ -560,7 +565,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 			</PushButton>
 			
 			
-			<!--Channel 1: Button- Repeat (End of track mode)-->
+			<!--Channel 2: Button- Repeat (End of track mode)-->
 			<PushButton>
 				<TooltipId>repeat</TooltipId>
 				<Style></Style>
@@ -577,11 +582,11 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				</State>
 				<Pos>210,60</Pos>
 				<Connection>
-					<ConfigKey>[Channel1],repeat</ConfigKey>
+					<ConfigKey>[Channel2],repeat</ConfigKey>
 				</Connection>
 			</PushButton>
                                                         
-			<!--Button- Stop-->
+			<!--Channel 2: Button- Stop-->
 			<PushButton>
 				<TooltipId>cue_default_cue_gotoandstop</TooltipId>
 				<Style></Style>
@@ -593,18 +598,18 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				</State>
 				<Pos>295,60</Pos>
 				<Connection>
-					<ConfigKey>[Channel1],start_stop</ConfigKey>
+					<ConfigKey>[Channel2],start_stop</ConfigKey>
 					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 					<ButtonState>LeftButton</ButtonState>
 				</Connection>
 				<Connection>
-					<ConfigKey>[Channel1],start_stop</ConfigKey>
+					<ConfigKey>[Channel2],start_stop</ConfigKey>
 					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 					<ButtonState>RightButton</ButtonState>
 				</Connection>
 			</PushButton>
 			
-		    <!--VU-Meter Players-->
+		    <!--Channel 2: VU-Meter-->
 			
 			<VuMeter>
 				<Tooltip>Channel volume meter&#10;Shows the left channel of player 1 volume&#10;</Tooltip>
@@ -612,13 +617,13 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<PathVu>btn_volume_display_small_over.png</PathVu>
 				<PathBack>btn_volume_display_small.png</PathBack>
 				<Pos>440,27</Pos>
-				<Horizontal>false</Horizontal>
+				<Horizontal>true</Horizontal>
 				<PeakHoldSize>5</PeakHoldSize>
 				<PeakHoldTime>500</PeakHoldTime>
 				<PeakFallTime>50</PeakFallTime>
 				<PeakFallStep>1</PeakFallStep>
 				<Connection>
-					<ConfigKey>[Channel1],VuMeterL</ConfigKey>
+					<ConfigKey>[Channel2],VuMeterL</ConfigKey>
 				</Connection>
 			</VuMeter>
 			
@@ -629,7 +634,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<PathBack>btn_clipping_master.png</PathBack>
 				<Pos>440,10</Pos>
 				<Connection>
-					<ConfigKey>[Channel1],PeakIndicator</ConfigKey>
+					<ConfigKey>[Channel2],PeakIndicator</ConfigKey>
 				</Connection>
 			</StatusLight>
 			
@@ -646,7 +651,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<PeakFallTime>50</PeakFallTime>
 				<PeakFallStep>1</PeakFallStep>
 				<Connection>
-					<ConfigKey>[Channel1],VuMeterR</ConfigKey>
+					<ConfigKey>[Channel2],VuMeter</ConfigKey>
 				</Connection>
 			</VuMeter>
     </Children>
@@ -701,9 +706,6 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<ConfigKey>[Master],PeakIndicator</ConfigKey>
 				</Connection>
 			</StatusLight>
-
-
-
 		</Children>
 	</WidgetGroup>
 
@@ -714,8 +716,8 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 	
 	<Time>
 	    <TooltipId>time</TooltipId>
-	    <Style>QLabel { font-size: 28px/20px Arial; color: #acacac; }</Style>
-	    <Pos>576,150</Pos>
+	    <Style>QLabel { font-size: 60px/70px Arial; color: #acacac; }</Style>
+	    <Pos>505,150</Pos>
 	    <Size>150,50</Size>
 	    <ShowSeconds>true</ShowSeconds>
 	    <ClockFormat>24</ClockFormat>
@@ -746,6 +748,7 @@ Sampler
 						<Size>250,100</Size> 
 						<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
 						<Children>
+							
 							<!--
 							**********************************************
 Text- Track Title
-- 
cgit v0.10.2