skin

5 files changed, 153 insertions, 112 deletions

diff --git a/RHMixxx1280x800/Volume_long_over_player.png b/RHMixxx1280x800/Volume_long_over_player.png
index 8f0c385..8fca120 100644
--- a/RHMixxx1280x800/Volume_long_over_player.png
+++ b/RHMixxx1280x800/Volume_long_over_player.png
diff --git a/RHMixxx1280x800/Volume_long_over_player.xcf b/RHMixxx1280x800/Volume_long_over_player.xcf
index b70e98d..10ecb61 100644
--- a/RHMixxx1280x800/Volume_long_over_player.xcf
+++ b/RHMixxx1280x800/Volume_long_over_player.xcf
diff --git a/RHMixxx1280x800/Volume_long_player.png b/RHMixxx1280x800/Volume_long_player.png
index 340ed7f..9b9ac19 100644
--- a/RHMixxx1280x800/Volume_long_player.png
+++ b/RHMixxx1280x800/Volume_long_player.png
diff --git a/RHMixxx1280x800/Volume_long_player.xcf b/RHMixxx1280x800/Volume_long_player.xcf
index 693f8dc..3050377 100644
--- a/RHMixxx1280x800/Volume_long_player.xcf
+++ b/RHMixxx1280x800/Volume_long_player.xcf
diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml
index 65b15eb..457b9bc 100755
--- a/RHMixxx1280x800/skin.xml
+++ b/RHMixxx1280x800/skin.xml
@@ -223,7 +223,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 	**********************************************
 	-->
 	<WidgetGroup>
-		<Pos>783,18</Pos>
+		<Pos>785,18</Pos>
 		<Style>QGroupBox { border: 0px solid red; }</Style>
 		<Children>
 				<!--
@@ -239,7 +239,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<Property>title</Property>
 				<Channel>2</Channel>
 				<Pos>0,1</Pos>
-				<Size>420,30</Size>
+				<Size>460,30</Size>
 			</TrackProperty>
 
 			<!--
@@ -253,9 +253,9 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				background-color: transparent; color: #000000; text-align: left; padding-left: 1px; }
 				</Style>
 				<Property>artist</Property>
-				<Channel>1</Channel>
+				<Channel>2</Channel>
 				<Pos>3,40</Pos>
-				<Size>400,23</Size>
+				<Size>245,23</Size>
 			</TrackProperty>
 			
 			<!-- CHANNEL 1 
@@ -270,11 +270,11 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 
 			<NumberPos>
 				<Style>QLabel { font: bold 30px;
-				background-color: transparent; color: #0000FF; }
+				background-color: transparent; color: #FF0000; }
 				</Style>
-				<Channel>1</Channel>
-				<Pos>315,38</Pos>
-		        <Size>105,32</Size>
+				<Channel>2</Channel>
+				<Pos>270,38</Pos>
+		        <Size>150,32</Size>
 				<NumberOfDigits>6</NumberOfDigits>
 				<Connection>
 					<ConfigKey>[Channel2],playposition</ConfigKey>
@@ -427,7 +427,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 			</PushButton>
 			
 			
-			<!--Channel 1: Button- Repeat (End of track mode)-->
+			<!--Channel 1: Button- Repeat (End of track mode)
 			<PushButton>
 				<TooltipId>repeat</TooltipId>
 				<Style></Style>
@@ -446,7 +446,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<Connection>
 					<ConfigKey>[Channel1],repeat</ConfigKey>
 				</Connection>
-			</PushButton>
+			</PushButton>-->
                                                         
 			<!--Channel 1: Button- Stop-->
 			<PushButton>
@@ -475,21 +475,21 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 	    </Children>
     </WidgetGroup>
 
-	<!-- #############################################################
-				Channel 2
-		########################################################## -->
-
-    <WidgetGroup>
-		<Pos>769,99</Pos>
+<!--
+	**********************************************
+	CHANNEL 2
+	**********************************************
+	-->
+	<WidgetGroup>
+		<Pos>20,99</Pos>
 		<Style>QGroupBox { border: 0px solid red; }</Style>
 		<Children>
-		    <!-- Channel 2: Waveform Display -->
 			<Visual>
 				<TooltipId>waveform_display</TooltipId>
 				<Style>
 				</Style>
 				<Channel>2</Channel>
-				<Pos>0,1</Pos>
+				<Pos>10,1</Pos>
 				<Size>310,50</Size>
 				<BgColor>#ffffff</BgColor>
 				<HfcColor>#000000</HfcColor>
@@ -536,11 +536,11 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				</Mark>		
 			</Visual>
 			
-			<!-- Channel 2: Waveform Overview -->
+			<!--Channel 2: Waveform Overview -->
 			<Overview>
 				<TooltipId>waveform_overview</TooltipId>
 				<Channel>2</Channel>
-				<Pos>0,60</Pos>
+				<Pos>10,60</Pos>
 				<Size>254,40</Size>
 				<BgColor>#061319</BgColor>
 				<BgPixmap></BgPixmap>
@@ -553,7 +553,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				</Connection>
 			</Overview>			
 			
-			<!--Channel 2: 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>
@@ -569,7 +569,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<Pressed>btn_play_over.png</Pressed>
 					<Unpressed>btn_play_over.png</Unpressed>
 				</State>
-				<Pos>320,0</Pos>
+				<Pos>330,0</Pos>
 				<Connection>
 					<ConfigKey>[Channel2],play</ConfigKey>
 					<EmitOnDownPress>true</EmitOnDownPress>
@@ -584,7 +584,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 			</PushButton>
 			
 			
-			<!--Channel 2: Button- Repeat (End of track mode)-->
+			<!--Channel 2: Button- Repeat (End of track mode)
 			<PushButton>
 				<TooltipId>repeat</TooltipId>
 				<Style></Style>
@@ -603,7 +603,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<Connection>
 					<ConfigKey>[Channel2],repeat</ConfigKey>
 				</Connection>
-			</PushButton>
+			</PushButton>-->
                                                         
 			<!--Channel 2: Button- Stop-->
 			<PushButton>
@@ -615,21 +615,21 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 					<Pressed>btn_stop_red.png</Pressed>
 					<Unpressed>btn_stop.png</Unpressed>
 				</State>
-				<Pos>264,60</Pos>
+				<Pos>274,60</Pos>
 				<Connection>
 					<ConfigKey>[Channel2],start_stop</ConfigKey>
 					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 					<ButtonState>LeftButton</ButtonState>
 				</Connection>
-				<Connection>i,m
+				<Connection>
 					<ConfigKey>[Channel2],start_stop</ConfigKey>
 					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 					<ButtonState>RightButton</ButtonState>
 				</Connection>
 			</PushButton>
 			
-		   
-    </Children>
+		    
+	    </Children>
     </WidgetGroup>
 
 	<!--
@@ -649,8 +649,8 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<PathVu>Volume_long_over.png</PathVu>
 				<PathBack>Volume_long.png</PathBack>
 				<Pos>0,40</Pos>
-				<PeakHoldSize>5</PeakHoldSize>
-				<PeakHoldTime>500</PeakHoldTime>
+				<PeakHoldSize>10</PeakHoldSize>
+				<PeakHoldTime>50</PeakHoldTime>
 				<PeakFallTime>50</PeakFallTime>
 				<PeakFallStep>1im</PeakFallStep>
 				<Connection>
@@ -663,8 +663,8 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 				<PathVu>Volume_long_over.png</PathVu>
 				<PathBack>Volume_long.png</PathBack>
 				<Pos>30,40</Pos>
-				<PeakHoldSize>5</PeakHoldSize>
-				<PeakHoldTime>500</PeakHoldTime>
+				<PeakHoldSize>10</PeakHoldSize>
+				<PeakHoldTime>50</PeakHoldTime>
 				<PeakFallTime>50</PeakFallTime>
 				<PeakFallStep>1</PeakFallStep>
 				<Connection>
@@ -698,7 +698,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 			
 			<!--Channel 1: VU-Meter Players-->
 	<WidgetGroup>
-		<Pos>455,56</Pos>
+		<Pos>455,61</Pos>
 		<Style>QGroupBox { border: 0px solid red; }</Style>			
         <Children>			
 			<VuMeter>
@@ -759,6 +759,69 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
 	</WidgetGroup>
 			
 			
+			
+						<!--Channel 2: VU-Meter Players-->
+	<WidgetGroup>
+		<Pos>1215,61</Pos>
+		<Style>QGroupBox { border: 0px solid red; }</Style>			
+        <Children>			
+			<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>0,30</Pos>
+				<Horizontal>false</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>clipping_long_over_player.png</PathStatusLight>
+				<PathBack>clipping_long_player.png</PathBack>
+				<Pos>0,0</Pos>
+				<Connection>
+					<ConfigKey>[Channel2],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>20,0</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>Volume_long_over_player.png</PathVu>
+				<PathBack>Volume_long_player.png</PathBack>
+				<Pos>20,30</Pos>
+				<Horizontal>false</Horizontal>
+				<PeakHoldSize>5</PeakHoldSize>
+				<PeakHoldTime>500</PeakHoldTime>
+				<PeakFallTime>50</PeakFallTime>
+				<PeakFallStep>1</PeakFallStep>
+				<Connection>
+					<ConfigKey>[Channel2],VuMeterR</ConfigKey>
+				</Connection>
+			</VuMeter>
+		</Children>
+	</WidgetGroup>
+			
 			 <!--Channel 2: VU-Meter
 			
 			<VuMeter>
@@ -840,7 +903,7 @@ Sampler
 				<Style>QGroupBox { border: 0px solid yellow; margin: 0px 0px 4px 0px;} </Style>
 				<Children>-->
 					<!-- all sub-widgets for the sampler decks -->
-												<!--
+<!--
 							**********************************************
                             Sampler 1
 							**********************************************
@@ -850,10 +913,26 @@ Sampler
 								<Size>276,103</Size> 
 								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
 								<Children>
+							
+							<!--
+							**********************************************
+                            Sampler1: Text- Track Title
+							**********************************************
+							
+							<Text>
+								<TooltipId>text</TooltipId>
+								<Style>QLabel { font: bold 13px/17px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+								background-color: transparent; color: #3087BF; text-align: left; padding-left: 1px; }
+								</Style>
+								<Group>[Sampler1]</Group>
+								<Pos>5,5</Pos>
+								<Size>250,21</Size>
+							</Text>-->
+
 
 							<!--
 							**********************************************
-Text- Artist
+                            Sampler1: Text- Artist
 							**********************************************
 							-->
 
@@ -880,10 +959,13 @@ Text- Artist
 								<Pos>4,25</Pos>
 								<Size>258f,20</Size>
 							</TrackProperty>
+							
 
-<!--
+
+
+                            <!--
 							**********************************************
-							Visual- Waveform overview
+							Sampler1: Visual- Waveform overview
 							**********************************************
 							-->
 							<Overview>
@@ -910,9 +992,10 @@ Text- Artist
 								</Connection>
 							</Overview>
 
+
 							<!--
 							****************************************
-							 Button- Play
+							Sampler1: Button- Play
 							****************************************
 							-->
 							<PushButton>
@@ -944,9 +1027,11 @@ Text- Artist
 									<ConnectValueToWidget>false</ConnectValueToWidget>							
 								</Connection>
 							</PushButton>
+
+
 		<!--
 							**********************************************
-							Button- STOP
+							Sampler1: Button- STOP
 							**********************************************
 							-->
 							<PushButton>
@@ -969,46 +1054,26 @@ Text- Artist
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 									<ButtonState>RightButton</ButtonState>
 								</Connection>
-							</PushButton>					
-							
-							<!--
-							**********************************************
-							Visual - Volume level display
-							**********************************************
-							-->
-<!--
-							<VuMeter>
-								<TooltipId>channel_VuMeter</TooltipId>
-								<Style></Style>
-								<PathVu>btn_volume_display_sampler_over.png</PathVu>
-								<PathBack>btn_volume_display_sampler.png</PathBack>
-								<Pos>100,24</Pos>
-								<Horizontal>false</Horizontal>
-								<PeakHoldSize>5</PeakHoldSize>
-								<PeakHoldTime>500</PeakHoldTime>
-								<PeakFallTime>50</PeakFallTime>
-								<PeakFallStep>2</PeakFallStep>
-								<Connection>
-									<ConfigKey>[Sampler1],VuMeter</ConfigKey>
-								</Connection>
-							</VuMeter>
--->
+							</PushButton>
+
+
 						</Children>
 					</WidgetGroup>
 				
 				<!--
-				***********************************************************
-				Sampler 2
-				***********************************************************
-				-->				
-					<WidgetGroup>
-						<Pos>287,0</Pos>
-						<Size>276,103</Size> 
-						<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
-						<Children>
+							**********************************************
+                            Sampler 2
+							**********************************************
+							-->
+							<WidgetGroup>
+								<Pos>287,0</Pos>
+								<Size>276,103</Size> 
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
+								<Children>
+							
 							<!--
 							**********************************************
-Text- Track Title
+                            Sampler2: Text- Track Title
 							**********************************************
 							
 							<Text>
@@ -1016,7 +1081,7 @@ Text- Track Title
 								<Style>QLabel { font: bold 13px/17px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
 								background-color: transparent; color: #3087BF; text-align: left; padding-left: 1px; }
 								</Style>
-								<Group>[Sampler1]</Group>
+								<Group>[Sampler2]</Group>
 								<Pos>5,5</Pos>
 								<Size>250,21</Size>
 							</Text>-->
@@ -1024,7 +1089,7 @@ Text- Track Title
 
 							<!--
 							**********************************************
-Text- Artist
+                            Sampler2: Text- Artist
 							**********************************************
 							-->
 
@@ -1055,23 +1120,23 @@ Text- Artist
 
 
 
-<!--
+                            <!--
 							**********************************************
-							Visual- Waveform overview
+							Sampler2: Visual- Waveform overview
 							**********************************************
 							-->
 							<Overview>
 								<TooltipId>waveform_overview</TooltipId>
 								<Style></Style>
 								<Group>[Sampler2]</Group>
-								<Pos>5,55</Pos>
-								<Size>140,25</Size>
+								<Pos>6,55</Pos>
+								<Size>150,42</Size>
 								<BgColor></BgColor>
 								<SignalHighColor></SignalHighColor>
 								<SignalMidColor></SignalMidColor>
 								<SignalLowColor></SignalLowColor>
 								<SignalColor>##CC0000</SignalColor>
-								<PlayPosColor>#00FF00</PlayPosColor>
+								<PlayPosColor>#000000</PlayPosColor>
 								<DefaultMark>
 									<Align>bottom</Align>
 									<Color>#00FF00</Color>
@@ -1087,7 +1152,7 @@ Text- Artist
 
 							<!--
 							****************************************
-							 Button- Play
+							Sampler2: Button- Play
 							****************************************
 							-->
 							<PushButton>
@@ -1106,7 +1171,7 @@ Text- Artist
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,58</Pos>
+								<Pos>212,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler2],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -1116,16 +1181,14 @@ Text- Artist
 									<ConfigKey>[Sampler2],start</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
 									<ButtonState>RightButton</ButtonState>
-									<ConnectValueToWidget>false</ConnectValueToWidget>
-
-							
+									<ConnectValueToWidget>false</ConnectValueToWidget>							
 								</Connection>
 							</PushButton>
 
 
 		<!--
 							**********************************************
-							Button- STOP
+							Sampler2: Button- STOP
 							**********************************************
 							-->
 							<PushButton>
@@ -1137,7 +1200,7 @@ Text- Artist
 									<Pressed>btn_stop_red.png</Pressed>
 									<Unpressed>btn_stop.png</Unpressed>
 								</State>
-								<Pos>168,58</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler2],start_stop</ConfigKey>
 									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
@@ -1149,32 +1212,10 @@ Text- Artist
 									<ButtonState>RightButton</ButtonState>
 								</Connection>
 							</PushButton>
-				
-							<!--
-							**********************************************
-							Visual - Volume level display
-							**********************************************
-							-->
-<!--
-							<VuMeter>
-								<TooltipId>channel_VuMeter</TooltipId>
-								<Style></Style>
-								<PathVu>btn_volume_display_sampler_over.png</PathVu>
-								<PathBack>btn_volume_display_sampler.png</PathBack>
-								<Pos>100,24</Pos>
-								<Horizontal>false</Horizontal>
-								<PeakHoldSize>5</PeakHoldSize>
-								<PeakHoldTime>500</PeakHoldTime>
-								<PeakFallTime>50</PeakFallTime>
-								<PeakFallStep>2</PeakFallStep>
-								<Connection>
-									<ConfigKey>[Sampler1],VuMeter</ConfigKey>
-								</Connection>
-							</VuMeter>
--->
-		                </Children>
-	                </WidgetGroup>
 
+
+						</Children>
+					</WidgetGroup>
 					<!--
 							**********************************************
                             Sampler 3