sampler one single button play-stop - not finished yet

2 files changed, 35 insertions, 377 deletions

diff --git a/skins/RHMixxx1280x800/btn_play_over_sampler.png b/skins/RHMixxx1280x800/btn_play_over_sampler.png
index 7845b39..ee9f3d6 100644
--- a/skins/RHMixxx1280x800/btn_play_over_sampler.png
+++ b/skins/RHMixxx1280x800/btn_play_over_sampler.png
diff --git a/skins/RHMixxx1280x800/skin.xml b/skins/RHMixxx1280x800/skin.xml
index 9725944..7210146 100644
--- a/skins/RHMixxx1280x800/skin.xml
+++ b/skins/RHMixxx1280x800/skin.xml
@@ -908,7 +908,7 @@ Sampler
 							<WidgetGroup>
 								<Pos>0,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>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler1.png); } </Style>
 								<Children>
 							
 							<!--
@@ -945,7 +945,6 @@ Sampler
 							</TrackProperty>
 
 
-							Alternative "TITLE ONLY" display
 							<TrackProperty>
 								<TooltipId>track_title</TooltipId>
 								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
@@ -959,7 +958,6 @@ Sampler
 							
 
 
-
                             <!--
 							**********************************************
 							Sampler1: Visual- Waveform overview
@@ -992,7 +990,7 @@ Sampler
 
 							<!--
 							****************************************
-							Sampler1: Button- Play
+							Sampler1: Button- Play/Stop
 							****************************************
 							-->
 							<PushButton>
@@ -1011,7 +1009,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler1],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -1025,35 +1023,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler1: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler1],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler1],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
-
-
 						</Children>
 					</WidgetGroup>
 				
@@ -1065,7 +1034,7 @@ Sampler
 							<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>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler2.png); } </Style>
 								<Children>
 							
 							<!--
@@ -1102,7 +1071,6 @@ Sampler
 							</TrackProperty>
 
 
-							Alternative "TITLE ONLY" display
 							<TrackProperty>
 								<TooltipId>track_title</TooltipId>
 								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
@@ -1149,7 +1117,7 @@ Sampler
 
 							<!--
 							****************************************
-							Sampler2: Button- Play
+							Sampler2: Button- Play/Stop
 							****************************************
 							-->
 							<PushButton>
@@ -1168,7 +1136,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler2],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -1182,35 +1150,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler2: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler2],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler2],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
-
-
 						</Children>
 					</WidgetGroup>
 					<!--
@@ -1221,7 +1160,7 @@ Sampler
 							<WidgetGroup>
 								<Pos>574,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>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler3.png); } </Style>
 								<Children>
 							
 							<!--
@@ -1258,7 +1197,6 @@ Sampler
 							</TrackProperty>
 
 
-							Alternative "TITLE ONLY" display
 							<TrackProperty>
 								<TooltipId>track_title</TooltipId>
 								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
@@ -1305,7 +1243,7 @@ Sampler
 
 							<!--
 							****************************************
-							Sampler3: Button- Play
+							Sampler3: Button- Play/Stop
 							****************************************
 							-->
 							<PushButton>
@@ -1324,7 +1262,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler3],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -1338,35 +1276,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler3: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler3],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler3],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
-
-
 						</Children>
 					</WidgetGroup>
 					
@@ -1378,7 +1287,7 @@ Sampler
 							<WidgetGroup>
 								<Pos>861,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>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler4.png); } </Style>
 								<Children>
 							
 							<!--
@@ -1415,7 +1324,6 @@ Sampler
 							</TrackProperty>
 
 
-							Alternative "TITLE ONLY" display
 							<TrackProperty>
 								<TooltipId>track_title</TooltipId>
 								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
@@ -1462,7 +1370,7 @@ Sampler
 
 							<!--
 							****************************************
-							Sampler4: Button- Play
+							Sampler4: Button- Play/Stop
 							****************************************
 							-->
 							<PushButton>
@@ -1481,7 +1389,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler4],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -1495,33 +1403,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler4: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler4],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler4],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
 						</Children>
 					</WidgetGroup>
 					
@@ -1534,7 +1415,7 @@ Sampler
 							<WidgetGroup>
 								<Pos>0,115</Pos>
 								<Size>276,103</Size> 
-								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler5.png); } </Style>
 								<Children>
 							
 							<!--
@@ -1571,7 +1452,6 @@ Sampler
 							</TrackProperty>
 
 
-							Alternative "TITLE ONLY" display
 							<TrackProperty>
 								<TooltipId>track_title</TooltipId>
 								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
@@ -1618,7 +1498,7 @@ Sampler
 
 							<!--
 							****************************************
-							Sampler5: Button- Play
+							Sampler5: Button- Play/Stop
 							****************************************
 							-->
 							<PushButton>
@@ -1637,7 +1517,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler5],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -1651,33 +1531,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler5: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler5],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler5],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
 						</Children>
 					</WidgetGroup>
 					
@@ -1690,7 +1543,7 @@ Sampler
 							<WidgetGroup>
 								<Pos>287,115</Pos>
 								<Size>276,103</Size> 
-								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler6.png); } </Style>
 								<Children>
 							
 							<!--
@@ -1727,7 +1580,6 @@ Sampler
 							</TrackProperty>
 
 
-							Alternative "TITLE ONLY" display
 							<TrackProperty>
 								<TooltipId>track_title</TooltipId>
 								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
@@ -1774,7 +1626,7 @@ Sampler
 
 							<!--
 							****************************************
-							Sampler6: Button- Play
+							Sampler6: Button- Play/Stop
 							****************************************
 							-->
 							<PushButton>
@@ -1793,7 +1645,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler6],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -1807,33 +1659,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler6: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler6],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler6],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
 						</Children>
 					</WidgetGroup>
 					
@@ -1845,7 +1670,7 @@ Sampler
 							<WidgetGroup>
 								<Pos>574,115</Pos>
 								<Size>276,103</Size> 
-								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler7.png); } </Style>
 								<Children>
 							
 							<!--
@@ -1882,7 +1707,6 @@ Sampler
 							</TrackProperty>
 
 
-							Alternative "TITLE ONLY" display
 							<TrackProperty>
 								<TooltipId>track_title</TooltipId>
 								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
@@ -1929,7 +1753,7 @@ Sampler
 
 							<!--
 							****************************************
-							Sampler7: Button- Play
+							Sampler7: Button- Play/Stop
 							****************************************
 							-->
 							<PushButton>
@@ -1948,7 +1772,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler7],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -1962,33 +1786,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler7: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler7],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler7],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
 						</Children>
 					</WidgetGroup>
 					
@@ -2000,7 +1797,7 @@ Sampler
 							<WidgetGroup>
 								<Pos>861,115</Pos>
 								<Size>276,103</Size> 
-								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler8.png); } </Style>
 								<Children>
 							
 							<!--
@@ -2037,7 +1834,6 @@ Sampler
 							</TrackProperty>
 
 
-							Alternative "TITLE ONLY" display
 							<TrackProperty>
 								<TooltipId>track_title</TooltipId>
 								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
@@ -2084,7 +1880,7 @@ Sampler
 
 							<!--
 							****************************************
-							Sampler8: Button- Play
+							Sampler8: Button- Play/Stop
 							****************************************
 							-->
 							<PushButton>
@@ -2103,7 +1899,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler8],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -2117,33 +1913,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler8: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler8],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler8],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
 						</Children>
 					</WidgetGroup>
 					
@@ -2155,7 +1924,7 @@ Sampler
 							<WidgetGroup>
 								<Pos>0,230</Pos>
 								<Size>276,103</Size> 
-								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler9.png); } </Style>
 								<Children>
 							
 							<!--
@@ -2192,7 +1961,6 @@ Sampler
 							</TrackProperty>
 
 
-							Alternative "TITLE ONLY" display
 							<TrackProperty>
 								<TooltipId>track_title</TooltipId>
 								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
@@ -2239,7 +2007,7 @@ Sampler
 
 							<!--
 							****************************************
-							Sampler9: Button- Play
+							Sampler9: Button- Play/Stop
 							****************************************
 							-->
 							<PushButton>
@@ -2258,7 +2026,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler9],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -2272,33 +2040,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler9: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler9],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler9],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
 						</Children>
 					</WidgetGroup>
 					
@@ -2310,7 +2051,7 @@ Sampler
 							<WidgetGroup>
 								<Pos>287,230</Pos>
 								<Size>276,103</Size> 
-								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler10.png); } </Style>
 								<Children>
 							
 							<!--
@@ -2347,7 +2088,6 @@ Sampler
 							</TrackProperty>
 
 
-							Alternative "TITLE ONLY" display
 							<TrackProperty>
 								<TooltipId>track_title</TooltipId>
 								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
@@ -2394,7 +2134,7 @@ Sampler
 
 							<!--
 							****************************************
-							Sampler10: Button- Play
+							Sampler10: Button- Play/Stop
 							****************************************
 							-->
 							<PushButton>
@@ -2413,7 +2153,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler10],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -2427,33 +2167,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler10: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler10],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler10],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
 						</Children>
 					</WidgetGroup>
 					
@@ -2465,7 +2178,7 @@ Sampler
 							<WidgetGroup>
 								<Pos>574,230</Pos>
 								<Size>276,103</Size> 
-								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler11.png); } </Style>
 								<Children>
 							
 							<!--
@@ -2502,7 +2215,6 @@ Sampler
 							</TrackProperty>
 
 
-							Alternative "TITLE ONLY" display
 							<TrackProperty>
 								<TooltipId>track_title</TooltipId>
 								<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
@@ -2549,7 +2261,7 @@ Sampler
 
 							<!--
 							****************************************
-							Sampler11: Button- Play
+							Sampler11: Button- Play/Stop
 							****************************************
 							-->
 							<PushButton>
@@ -2568,7 +2280,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler11],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -2582,33 +2294,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler11: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler11],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler11],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
 						</Children>
 					</WidgetGroup>
 					
@@ -2620,7 +2305,7 @@ Sampler
 							<WidgetGroup>
 								<Pos>861,230</Pos>
 								<Size>276,103</Size> 
-								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler.png); } </Style>
+								<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_sampler12.png); } </Style>
 								<Children>
 							
 							<!--
@@ -2723,7 +2408,7 @@ Sampler
 									<Pressed>btn_play_sampler.png</Pressed>
 									<Unpressed>btn_play_over_sampler.png</Unpressed>
 								</State>
-								<Pos>212,55</Pos>
+								<Pos>162,55</Pos>
 								<Connection>
 									<ConfigKey>[Sampler12],play</ConfigKey>
 									<EmitOnDownPress>true</EmitOnDownPress>
@@ -2737,33 +2422,6 @@ Sampler
 								</Connection>
 							</PushButton>
 
-
-		<!--
-							**********************************************
-							Sampler12: 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>162,55</Pos>
-								<Connection>
-									<ConfigKey>[Sampler12],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Sampler12],start_stop</ConfigKey>
-									<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-									<ButtonState>RightButton</ButtonState>
-								</Connection>
-							</PushButton>
 						</Children>
 					</WidgetGroup>