From 922411e1c6c93ba82603949bf465b82f986272e2 Mon Sep 17 00:00:00 2001
From: Josef Schauer <schauher@mur.at>
Date: Thu, 6 Mar 2014 15:59:11 +0000
Subject: Sampler works, stop button


diff --git a/RHMixxx1280x800/btn_stop.png b/RHMixxx1280x800/btn_stop.png
new file mode 100644
index 0000000..9f91227
Binary files /dev/null and b/RHMixxx1280x800/btn_stop.png differ
diff --git a/RHMixxx1280x800/btn_stop.xcf b/RHMixxx1280x800/btn_stop.xcf
new file mode 100644
index 0000000..7d53e43
Binary files /dev/null and b/RHMixxx1280x800/btn_stop.xcf differ
diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml
index de3ff08..5a47a57 100755
--- a/RHMixxx1280x800/skin.xml
+++ b/RHMixxx1280x800/skin.xml
@@ -56,7 +56,7 @@
 		<license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
 		<attributes>
 			<attribute config_key="[Master],num_decks"></attribute>
-			<attribute config_key="[Master],num_samplers">0</attribute>
+			<attribute config_key="[Master],num_samplers">2</attribute>
 			<attribute config_key="[Master],num_preview_decks">1</attribute>
 			<attribute config_key="[PreviewDeck],show_previewdeck">0</attribute>
                         <attribute config_key="[Samplers],show_samplers">1</attribute>
@@ -997,11 +997,11 @@
 		</Children>
 	</WidgetGroup>
 
-	<!--
+	
 	**********************************************
 	Visual - Clock
 	**********************************************
-	-->
+	
 	<Time>
 	    <TooltipId>time</TooltipId>
 	    <Style>QLabel { font-size: 15px/17px Arial; color: #acacac; }</Style>
@@ -1010,24 +1010,172 @@
 	    <ShowSeconds>true</ShowSeconds>
 	    <ClockFormat>24</ClockFormat>
 	</Time>
-<!-- 
+	
+<!--
 ***********************************************************
 Sampler
 ***********************************************************
 -->
+<!--
 	<WidgetGroup>
-		<Pos>20,267</Pos>
-		<Size>1240,400</Size>
+		<Pos>20,660</Pos>
+		<Size>1240,100</Size>
 		<Layout>horizontal</Layout>
+		<Style>QGroupBox { border: 0px solid red; }</Style>
 		<Children>
-			<Style>
-			  QGroupBox { 
-			    border: 0px solid green;
-			    margin: -200px 200px 0px 0px; 
-			    background: url(skin:/Sampler.png); 
-			  }
-			</Style>
+-->
 
-		</Children>
-	</WidgetGroup>
+			<!-- Sampler Bank sub-widget -->
+			<WidgetGroup>
+                                <Pos>20,680</Pos>
+				<Size>100,222</Size>
+				<Layout>vertikal</Layout>
+				<Style>QGroupBox { border: 0px solid yellow; margin: 0px 0px 4px 0px;} </Style>
+				<Children>
+					<!-- all sub-widgets for the sampler decks -->
+					<WidgetGroup>
+						<Pos>0,0</Pos>
+						<Size>200f,110</Size>
+						<Style>QGroupBox { border: 0px solid green;  margin: -0px 0px 0px 0px; background: url(skin:/style/style_bg_sampler.png); } </Style>
+						<Children>
+							<!--
+							**********************************************
+Text- Track Title
+							**********************************************
+							-->
+							<Text>
+								<TooltipId>text</TooltipId>
+								<Style>QLabel { font: bold 13px/15px 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>200,21</Size>
+							</Text>
+						</Children>
+					</WidgetGroup>
+
+
+
+<!--
+							**********************************************
+							Visual- Waveform overview
+							**********************************************
+							-->
+							<Overview>
+								<TooltipId>waveform_overview</TooltipId>
+								<Style></Style>
+								<Group>[Sampler1]</Group>
+								<Pos>20,30</Pos>
+								<Size>125,35</Size>
+								<BgColor></BgColor>
+								<SignalHighColor></SignalHighColor>
+								<SignalMidColor></SignalMidColor>
+								<SignalLowColor></SignalLowColor>
+								<SignalColor>#3087BF</SignalColor>
+								<PlayPosColor>#00FF00</PlayPosColor>
+								<DefaultMark>
+									<Align>bottom</Align>
+									<Color>#00FF00</Color>
+									<TextColor>#FFFFFF</TextColor>
+									<Text> %1 </Text>
+								</DefaultMark>
+								<Connection>
+									<ConfigKey>[Sampler1],playposition</ConfigKey>
+									<EmitOnDownPress>false</EmitOnDownPress>
+								</Connection>
+							</Overview>
+
+
+							<!--
+							****************************************
+							 Button- Play
+							****************************************
+							-->
+							<PushButton>
+								<TooltipId>play_start</TooltipId>
+                                                               
+								<Style></Style>
+								<NumberStates>2</NumberStates>
+								<RightClickIsPushButton>true</RightClickIsPushButton>
+								<State>
+									<Number>0</Number>
+									<Pressed>btn_play_sampler_down.png</Pressed>
+									<Unpressed>btn_play_sampler.png</Unpressed>
+								</State>
+								<State>
+									<Number>1</Number>
+									<Pressed>btn_play_sampler_overdown.png</Pressed>
+									<Unpressed>btn_play_sampler_over.png</Unpressed>
+								</State>
+								<Pos>175,60</Pos>
+								<Connection>
+									<ConfigKey>[Sampler1],play</ConfigKey>
+									<EmitOnDownPress>true</EmitOnDownPress>
+									<ButtonState>LeftButton</ButtonState>
+								</Connection>
+								<Connection>
+									<ConfigKey>[Sampler1],start</ConfigKey>
+									<EmitOnDownPress>true</EmitOnDownPress>
+									<ButtonState>RightButton</ButtonState>
+									<ConnectValueToWidget>false</ConnectValueToWidget>
+
+							
+								</Connection>
+							</PushButton>
+
+
+		<!--
+							**********************************************
+							Button- Cue
+							**********************************************
+							-->
+							<PushButton>
+								<TooltipId>cue_default_cue_gotoandstop</TooltipId>
+								<Style></Style>
+								<NumberStates>1</NumberStates>
+								<State>
+									<Number>0</Number>
+									<Pressed>btn_cue1_overdown.png</Pressed>
+									<Unpressed>btn_cue1.png</Unpressed>
+								</State>
+								<Pos>115,60</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>
+					
+
+							<!--
+							**********************************************
+							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>
 </skin>
-- 
cgit v0.10.2