funkt, vor sampler implementierung

5 files changed, 46 insertions, 8 deletions

diff --git a/RHMixxx1280x800/Sampler.png b/RHMixxx1280x800/Sampler.png
new file mode 100644
index 0000000..928ca34
--- /dev/null
+++ b/RHMixxx1280x800/Sampler.png
diff --git a/RHMixxx1280x800/background1280x800.png b/RHMixxx1280x800/background1280x800.png
index 01144df..94e83fb 100644
--- a/RHMixxx1280x800/background1280x800.png
+++ b/RHMixxx1280x800/background1280x800.png
diff --git a/RHMixxx1280x800/background1280x800.xcf b/RHMixxx1280x800/background1280x800.xcf
new file mode 100644
index 0000000..45d4e19
--- /dev/null
+++ b/RHMixxx1280x800/background1280x800.xcf
diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml
index 6dc9d94..de3ff08 100755
--- a/RHMixxx1280x800/skin.xml
+++ b/RHMixxx1280x800/skin.xml
@@ -55,10 +55,11 @@
 		<language>en</language>
 		<license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
 		<attributes>
-			<attribute config_key="[Master],num_decks">2</attribute>
+			<attribute config_key="[Master],num_decks"></attribute>
 			<attribute config_key="[Master],num_samplers">0</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>
 		</attributes>
 	</manifest>
 
@@ -90,15 +91,26 @@
 	General- Search and Library display
 	**********************************************
 	-->
+
+
+<!--
+<Style>
+  QGroupBox { 
+    border: 0px solid green;
+    margin: -200px 200px 0px 0px; 
+    background: url(skin:/Sampler.png); 
+  }
+</Style>
+-->
 	<WidgetGroup>
 		<Pos>20,267</Pos>
-		<Size>1240,525</Size>
+		<Size>1240,400</Size>
 		<Layout>horizontal</Layout>
 		<Children>
 			<TableView>
 				<Style>
 				QTableView, QTextBrowser, QTreeView, QLabel, QHeaderView {
-					font: 11px/13px Geneva, 'Trebuchet MS',Trebuchet,Verdana,Sans-serif;
+					font: 20px/50px Geneva, 'Trebuchet MS',Trebuchet,Verdana,Sans-serif;
 				}
 				QLabel { background-color: transparent; color: #000000; padding-left: 1%; }
 				QTableView { background: #ebebeb; alternate-background-color: #cfdee7; color: #000000; }
@@ -142,6 +154,13 @@
 				</Style>
 				<Layout>horizontal</Layout>
 				<Children>
+
+
+
+
+
+
+
 					<!--
 					**********************************************
 					Text- Track Title
@@ -394,7 +413,7 @@
 				</Style>
 				<Channel>1</Channel>
 				<Pos>0,1</Pos>
-				<Size>381,101</Size>
+				<Size>381,60</Size>
 				<BgColor>#ffffff</BgColor>
 				<HfcColor>#000000</HfcColor>
 				<SignalColor>#CC0000</SignalColor>
@@ -483,8 +502,8 @@
 			<Overview>
 				<TooltipId>waveform_overview</TooltipId>
 				<Channel>1</Channel>
-				<Pos>0,109</Pos>
-				<Size>329,40</Size>
+				<Pos>0,65</Pos>
+				<Size>290,30</Size>
 				<BgColor>#061319</BgColor>
 				<BgPixmap></BgPixmap>
 				<SignalColor>#CC0000</SignalColor>
@@ -525,7 +544,7 @@
 				</Connection>
 			</PushButton>
 			<!-- Channel 1: Button cue -->
-			<PushButton>
+			<!--<PushButton>
 				<Tooltip>Cue&#10;Left-click (while playing): The track will seek to the cue-point and play.&#10;Left-click (while stopped): Places a cue-point at the current position in the track.&#10;Right-click: Will seek to the cue-point and stop.&#10;</Tooltip>
 				<Style></Style>
 				<NumberStates>1</NumberStates>
@@ -555,7 +574,7 @@
 					<EmitOnDownPress>false</EmitOnDownPress>
 					<ButtonState>RightButton</ButtonState>
 				</Connection>
-			</PushButton>
+			</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>
@@ -991,5 +1010,24 @@
 	    <ShowSeconds>true</ShowSeconds>
 	    <ClockFormat>24</ClockFormat>
 	</Time>
+<!-- 
+***********************************************************
+Sampler
+***********************************************************
+-->
+	<WidgetGroup>
+		<Pos>20,267</Pos>
+		<Size>1240,400</Size>
+		<Layout>horizontal</Layout>
+		<Children>
+			<Style>
+			  QGroupBox { 
+			    border: 0px solid green;
+			    margin: -200px 200px 0px 0px; 
+			    background: url(skin:/Sampler.png); 
+			  }
+			</Style>
 
+		</Children>
+	</WidgetGroup>
 </skin>
diff --git a/RHMixxx1280x800/style/style_bg_sampler.png b/RHMixxx1280x800/style/style_bg_sampler.png
new file mode 100644
index 0000000..0a0a8c6
--- /dev/null
+++ b/RHMixxx1280x800/style/style_bg_sampler.png