From 3fd6fd02e5db63da6558abb2856575df6bb4e76c Mon Sep 17 00:00:00 2001
From: Josef Schauer <schauher@mur.at>
Date: Thu, 6 Mar 2014 17:00:26 +0000
Subject: sampler stop etc


diff --git a/RHMixxx1280x800/btn_stop.png b/RHMixxx1280x800/btn_stop.png
index 9f91227..2f3f945 100644
Binary files a/RHMixxx1280x800/btn_stop.png and b/RHMixxx1280x800/btn_stop.png differ
diff --git a/RHMixxx1280x800/btn_stop.xcf b/RHMixxx1280x800/btn_stop.xcf
index 7d53e43..4b4d1a9 100644
Binary files a/RHMixxx1280x800/btn_stop.xcf and b/RHMixxx1280x800/btn_stop.xcf differ
diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml
index 5a47a57..f5b18b3 100755
--- a/RHMixxx1280x800/skin.xml
+++ b/RHMixxx1280x800/skin.xml
@@ -413,7 +413,7 @@
 				</Style>
 				<Channel>1</Channel>
 				<Pos>0,1</Pos>
-				<Size>381,60</Size>
+				<Size>381,50</Size>
 				<BgColor>#ffffff</BgColor>
 				<HfcColor>#000000</HfcColor>
 				<SignalColor>#CC0000</SignalColor>
@@ -502,8 +502,8 @@
 			<Overview>
 				<TooltipId>waveform_overview</TooltipId>
 				<Channel>1</Channel>
-				<Pos>0,65</Pos>
-				<Size>290,30</Size>
+				<Pos>0,60</Pos>
+				<Size>350,30</Size>
 				<BgColor>#061319</BgColor>
 				<BgPixmap></BgPixmap>
 				<SignalColor>#CC0000</SignalColor>
@@ -575,70 +575,36 @@
 					<ButtonState>RightButton</ButtonState>
 				</Connection>
 			</PushButton> -->
-			<!-- Channel 1: 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>385,109</Pos>
-		        <Connection>
-		            <ConfigKey>[Channel1],fwd</ConfigKey>
-		            <EmitOnDownPress>true</EmitOnDownPress>
-		            <ButtonState>LeftButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel1],fwd</ConfigKey>
-		            <EmitOnDownPress>false</EmitOnDownPress>
-		            <ButtonState>LeftButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel1],end</ConfigKey>
-		            <EmitOnDownPress>true</EmitOnDownPress>
-		            <ButtonState>RightButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel1],end</ConfigKey>
-		            <EmitOnDownPress>false</EmitOnDownPress>
-		            <ButtonState>RightButton</ButtonState>
-		        </Connection>
-		    </PushButton>
-		    <!-- Channel 1: 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>335,109</Pos>
-		        <Connection>
-		            <ConfigKey>[Channel1],back</ConfigKey>
-		            <EmitOnDownPress>true</EmitOnDownPress>
-		            <ButtonState>LeftButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel1],back</ConfigKey>
-		            <EmitOnDownPress>false</EmitOnDownPress>
-		            <ButtonState>LeftButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel1],start</ConfigKey>
-		            <EmitOnDownPress>true</EmitOnDownPress>
-		            <ButtonState>RightButton</ButtonState>
-		        </Connection>
-		        <Connection>
-		            <ConfigKey>[Channel1],start</ConfigKey>
-		            <EmitOnDownPress>false</EmitOnDownPress>
-		            <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>
 
@@ -820,6 +786,7 @@
 				</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>
@@ -1127,7 +1094,7 @@ Text- Track Title
 
 		<!--
 							**********************************************
-							Button- Cue
+							Button- STOP
 							**********************************************
 							-->
 							<PushButton>
@@ -1136,8 +1103,8 @@ Text- Track Title
 								<NumberStates>1</NumberStates>
 								<State>
 									<Number>0</Number>
-									<Pressed>btn_cue1_overdown.png</Pressed>
-									<Unpressed>btn_cue1.png</Unpressed>
+									<Pressed>btn_stop_red.png</Pressed>
+									<Unpressed>btn_stop.png</Unpressed>
 								</State>
 								<Pos>115,60</Pos>
 								<Connection>
@@ -1173,8 +1140,8 @@ Text- Track Title
 								<Connection>
 									<ConfigKey>[Sampler1],VuMeter</ConfigKey>
 								</Connection>
-							</VuMeter>-->
-
+							</VuMeter>
+-->
 
 				</Children>
 			</WidgetGroup>
-- 
cgit v0.10.2