volumes geordnet

1 files changed, 78 insertions, 139 deletions

diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml
index c60db42..97258ee 100755
--- a/RHMixxx1280x800/skin.xml
+++ b/RHMixxx1280x800/skin.xml
@@ -319,17 +319,9 @@
 					<Align>bottom</Align>
 					<Color>#00FF00</Color>
 					<TextColor>#FFFFFF</TextColor>
-				</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)
-				These "special" hotcues share the color #AE5CFF to make them distinguishable (and maintainable) from the hotcues
-				represented by a button in the current skin. Mixxx 1.8 supports up to 32 hotcue. Current skins uses up to 6 buttons per channel.
-				-->
-
-				
+				</Mark>		
 			</Visual>
+			
 			<!-- Channel 1: Waveform Overview -->
 			<Overview>
 				<TooltipId>waveform_overview</TooltipId>
@@ -345,8 +337,7 @@
 					<ConfigKey>[Channel1],playposition</ConfigKey>
 					<EmitOnDownPress>false</EmitOnDownPress>
 				</Connection>
-			</Overview>
-			
+			</Overview>			
 			
 			<!-- Channel 1: Button play -->
 			<PushButton>
@@ -379,59 +370,49 @@
 			</PushButton>
 			
 			
-							<!--
-							**********************************************
-							Button- Repeat (End of track mode)
-							**********************************************
-							-->
-							<PushButton>
-								<TooltipId>repeat</TooltipId>
-								<Style></Style>
-								<NumberStates>2</NumberStates>
-								<State>
-									<Number>0</Number>
-									<Pressed>btn_repeat1.png</Pressed>
-									<Unpressed>btn_repeat1.png</Unpressed>
-								</State>
-								<State>
-									<Number>1</Number>
-									<Pressed>btn_repeat1_over.png</Pressed>
-									<Unpressed>btn_repeat1_over.png</Unpressed>
-								</State>
-								<Pos>250,60</Pos>
-								<Connection>
-									<ConfigKey>[Channel1],repeat</ConfigKey>
-								</Connection>
-							</PushButton>
+			<!--Channel 1: Button- Repeat (End of track mode)-->
+			<PushButton>
+				<TooltipId>repeat</TooltipId>
+				<Style></Style>
+				<NumberStates>2</NumberStates>
+				<State>
+					<Number>0</Number>
+					<Pressed>btn_repeat1.png</Pressed>
+					<Unpressed>btn_repeat1.png</Unpressed>
+				</State>
+				<State>
+					<Number>1</Number>
+					<Pressed>btn_repeat1_over.png</Pressed>
+					<Unpressed>btn_repeat1_over.png</Unpressed>
+				</State>
+				<Pos>250,60</Pos>
+				<Connection>
+					<ConfigKey>[Channel1],repeat</ConfigKey>
+				</Connection>
+			</PushButton>
                                                         
-                                                        <!--
-							**********************************************
-							Button- Stop
-							**********************************************
-							-->
-
-							<PushButton>
-								<TooltipId>cue_default_cue_gotoandstop</TooltipId>
-								<Style></Style>
-								<NumberStates>1</NumberStates>
-								<State>
-									<Number>0</Number>
-									<Pressed>btn_stop_red.png</Pressed>
-									<Unpressed>btn_stop.png</Unpressed>
-								</State>
-								<Pos>335,60</Pos>
-								<Connection>
-									<ConfigKey>[Channel1],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Channel1],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
-		
+			<!--Button- Stop-->
+			<PushButton>
+				<TooltipId>cue_default_cue_gotoandstop</TooltipId>
+				<Style></Style>
+				<NumberStates>1</NumberStates>
+				<State>
+					<Number>0</Number>
+					<Pressed>btn_stop_red.png</Pressed>
+					<Unpressed>btn_stop.png</Unpressed>
+				</State>
+				<Pos>335,60</Pos>
+				<Connection>
+					<ConfigKey>[Channel1],start_stop</ConfigKey>
+					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+					<ButtonState>LeftButton</ButtonState>
+				</Connection>
+				<Connection>
+					<ConfigKey>[Channel1],start_stop</ConfigKey>
+					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+					<ButtonState>RightButton</ButtonState>
+				</Connection>
+			</PushButton>		
 	    </Children>
     </WidgetGroup>
 
@@ -491,47 +472,7 @@
 					<Align>bottom</Align>
 					<Color>#00FF00</Color>
 					<TextColor>#FFFFFF</TextColor>
-				</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)
-				These "special" hotcues share the color #AE5CFF to make them distinguishable (and maintainable) from the hotcues
-				represented by a button in the current skin. Mixxx 1.8 supports up to 32 hotcue. Current skins uses up to 6 buttons per channel.
-				-->
-				<Mark>
-					<Control>hotcue_1_position</Control>
-					<Pixmap>marker_hotcue_1.png</Pixmap>
-					<Text> HOTCUE 1 </Text>
-					<Align>bottom</Align>
-					<Color>#ffff00</Color>
-					<TextColor>#333333</TextColor>
-				</Mark>
-				<Mark>
-					<Control>hotcue_2_position</Control>
-					<Pixmap>marker_hotcue_2.png</Pixmap>
-					<Text> HOTCUE 2 </Text>
-					<Align>bottom</Align>
-					<Color>#ff00ff</Color>
-					<TextColor>#333333</TextColor>
-				</Mark>
-				<Mark>
-					<Control>hotcue_3_position</Control>
-					<Pixmap>marker_hotcue_3.png</Pixmap>
-					<Text> HOTCUE 3 </Text>
-					<Align>bottom</Align>
-					<Color>#00e1e1</Color>
-					<TextColor>#333333</TextColor>
-				</Mark>
-				<Mark>
-					<Control>hotcue_4_position</Control>
-					<Pixmap>marker_hotcue_4.png</Pixmap>
-					<Text> HOTCUE 4 </Text>
-					<Align>bottom</Align>
-					<Color>#00FF00</Color>
-					<TextColor>#333333</TextColor>
-				</Mark>
-				
+				</Mark>			
 		    </Visual>
 			
 			<!-- Channel 2: Waveform Overview -->
@@ -581,29 +522,27 @@
 
 			<!--Button STOP-->
 
-							<PushButton>
-								<TooltipId>cue_default_cue_gotoandstop</TooltipId>
-								<Style></Style>
-								<NumberStates>1</NumberStates>
-								<State>
-									<Number>0</Number>
-									<Pressed>btn_stop_red.png</Pressed>
-									<Unpressed>btn_stop.png</Unpressed>
-								</State>
-								<Pos>335,60</Pos>
-								<Connection>
-									<ConfigKey>[Channel2],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Channel2],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
-
-
+			<PushButton>
+				<TooltipId>cue_default_cue_gotoandstop</TooltipId>
+				<Style></Style>
+				<NumberStates>1</NumberStates>
+				<State>
+					<Number>0</Number>
+					<Pressed>btn_stop_red.png</Pressed>
+					<Unpressed>btn_stop.png</Unpressed>
+				</State>
+				<Pos>335,60</Pos>
+				<Connection>
+					<ConfigKey>[Channel2],start_stop</ConfigKey>
+					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+					<ButtonState>LeftButton</ButtonState>
+				</Connection>
+				<Connection>
+					<ConfigKey>[Channel2],start_stop</ConfigKey>
+					<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+					<ButtonState>RightButton</ButtonState>
+				</Connection>
+			</PushButton>
     </Children>
     </WidgetGroup>
 
@@ -620,11 +559,11 @@
 
 			<!-- CHANNEL 1 -->
 			<VuMeter>
-				<Tooltip>Channel volume meter&#10;Shows the left channel (1) volume&#10;</Tooltip>
+				<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>24,34</Pos>
+				<Pos>24,24</Pos>
 				<Horizontal>false</Horizontal>
 				<PeakHoldSize>5</PeakHoldSize>
 				<PeakHoldTime>500</PeakHoldTime>
@@ -640,7 +579,7 @@
 				<Style></Style>
 				<PathStatusLight>btn_clipping_over.png</PathStatusLight>
 				<PathBack>btn_clipping.png</PathBack>
-				<Pos>24,34</Pos>
+				<Pos>24,24</Pos>
 				<Connection>
 					<ConfigKey>[Channel1],PeakIndicatorL</ConfigKey>
 				</Connection>
@@ -652,7 +591,7 @@
 				<Style></Style>
 				<PathVu>btn_volume_display_small_over.png</PathVu>
 				<PathBack>btn_volume_display_small.png</PathBack>
-				<Pos>34,34</Pos>
+				<Pos>50,24</Pos>
 				<Horizontal>false</Horizontal>
 				<PeakHoldSize>5</PeakHoldSize>
 				<PeakHoldTime>500</PeakHoldTime>
@@ -668,7 +607,7 @@
 				<Style></Style>
 				<PathStatusLight>btn_clipping_over.png</PathStatusLight>
 				<PathBack>btn_clipping.png</PathBack>
-				<Pos>24,34</Pos>
+				<Pos>50,24</Pos>
 				<Connection>
 					<ConfigKey>[Channel1],PeakIndicatorR</ConfigKey>
 				</Connection>
@@ -679,7 +618,7 @@
 				<Style></Style>
 				<PathVu>btn_volume_display_small_over.png</PathVu>
 				<PathBack>btn_volume_display_small.png</PathBack>
-				<Pos>204,34</Pos>
+				<Pos>204,24</Pos>
 				<Horizontal>false</Horizontal>
 				<PeakHoldSize>5</PeakHoldSize>
 				<PeakHoldTime>500</PeakHoldTime>
@@ -695,7 +634,7 @@
 				<Style></Style>
 				<PathStatusLight>btn_clipping_over.png</PathStatusLight>
 				<PathBack>btn_clipping.png</PathBack>
-				<Pos>204,34</Pos>
+				<Pos>204,24</Pos>
 				<Connection>
 					<ConfigKey>[Channel2],PeakIndicatorL</ConfigKey>
 				</Connection>
@@ -706,7 +645,7 @@
 				<Style></Style>
 				<PathVu>btn_volume_display_small_over.png</PathVu>
 				<PathBack>btn_volume_display_small.png</PathBack>
-				<Pos>214,34</Pos>
+				<Pos>240,24</Pos>
 				<Horizontal>false</Horizontal>
 				<PeakHoldSize>5</PeakHoldSize>
 				<PeakHoldTime>500</PeakHoldTime>
@@ -722,7 +661,7 @@
 				<Style></Style>
 				<PathStatusLight>btn_clipping_over.png</PathStatusLight>
 				<PathBack>btn_clipping.png</PathBack>
-				<Pos>204,34</Pos>
+				<Pos>240,24</Pos>
 				<Connection>
 					<ConfigKey>[Channel2],PeakIndicatorR</ConfigKey>
 				</Connection>
@@ -787,8 +726,8 @@
 	
 	<Time>
 	    <TooltipId>time</TooltipId>
-	    <Style>QLabel { font-size: 15px/17px Arial; color: #acacac; }</Style>
-	    <Pos>606,220</Pos>
+	    <Style>QLabel { font-size: 30px/22px Arial; color: #acacac; }</Style>
+	    <Pos>606,150</Pos>
 	    <Size>150,50</Size>
 	    <ShowSeconds>true</ShowSeconds>
 	    <ClockFormat>24</ClockFormat>