Merge branch 'master' into groove

data/projects/templates/CR8000.mpt

@@ -20,7 +20,7 @@
           <fxchain numofeffects="0" enabled="0"/>
         </instrumenttrack>
       </track>
-      <track type="1" muted="0" name="Beat/Bassline 0" solo="0">
+      <track type="1" muted="0" name="Pattern 0" solo="0">
         <bbtrack>
           <trackcontainer visible="1" width="580" height="300" type="bbtrackcontainer" x="610" y="5" maximized="0" minimized="0">
             <track type="0" muted="0" name="Clap.ds" solo="0">

data/projects/templates/TR808.mpt

@@ -20,7 +20,7 @@
           <fxchain numofeffects="0" enabled="0"/>
         </instrumenttrack>
       </track>
-      <track type="1" muted="0" name="Beat/Bassline 0" solo="0">
+      <track type="1" muted="0" name="Pattern 0" solo="0">
         <bbtrack>
           <trackcontainer visible="1" width="580" height="300" type="bbtrackcontainer" x="610" y="5" maximized="0" minimized="0">
             <track type="0" muted="0" name="Clave.ds" solo="0">

data/projects/templates/default.mpt

@@ -25,7 +25,7 @@
           <fxchain numofeffects="0" enabled="0"/>
         </sampletrack>
       </track>
-      <track muted="0" type="1" name="Beat/Bassline 0" solo="0">
+      <track muted="0" type="1" name="Pattern 0" solo="0">
         <bbtrack>
           <trackcontainer width="640" x="610" y="5" maximized="0" height="400" visible="0" type="bbtrackcontainer" minimized="0">
             <track muted="0" type="0" name="Kicker" solo="0">

data/themes/classic/style.css

@@ -333,7 +333,7 @@ QScrollBar::right-arrow:horizontal:disabled { background-image: url(resources:sb
 QScrollBar::up-arrow:vertical:disabled { background-image: url(resources:sbarrow_up_d.png);}
 QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarrow_down_d.png);}
 
-/* background for song editor and bb-editor */
+/* background for song editor and pattern editor */
 
 TrackContainerView QFrame{
 	background-color: #49515b;
@@ -670,7 +670,7 @@ ClipView   {
 	qproperty-mutedColor: rgb( 128, 128, 128 );
 	qproperty-mutedBackgroundColor: rgb( 80, 80, 80 );
 	qproperty-selectedColor: rgb( 0, 125, 255 );
-	qproperty-BBClipBackground: rgb( 80, 80, 80 );
+	qproperty-patternClipBackground: rgb( 80, 80, 80 );
 	qproperty-textColor: rgb( 255, 255, 255 );
 	qproperty-textBackgroundColor: rgba(0, 0, 0, 75);
 	qproperty-textShadowColor: rgb( 0, 0, 0 );
@@ -705,9 +705,9 @@ AutomationClipView {
 	color: rgb( 204, 215, 255 );
 }
 
-/* bb-clip */
-BBClipView {
-	background-color: rgb( 128, 182, 175 ); /* default colour for bb-tracks */
+/* pattern clip */
+PatternClipView {
+	background-color: rgb( 128, 182, 175 ); /* default colour for pattern tracks */
 }
 
 /* Subwindows in MDI-Area */

data/themes/default/style.css

@@ -369,7 +369,7 @@ QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarr
 EffectRackView QScrollBar::up-arrow:vertical:disabled { background-image: url(resources:sbarrow_up.png);}
 EffectRackView QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarrow_down.png);}
 
-/* background for song editor and bb-editor */
+/* background for song editor and pattern editor */
 
 TrackContainerView QFrame {
 	background-color: #262b30;
@@ -716,7 +716,7 @@ ClipView   {
 	qproperty-mutedColor: rgba(255,255,255,100);
 	qproperty-mutedBackgroundColor: #373d48;
 	qproperty-selectedColor: #006B65;
-	qproperty-BBClipBackground: #373d48;
+	qproperty-patternClipBackground: #373d48;
 	qproperty-textColor: #fff;
 	qproperty-textBackgroundColor: rgba(0, 0, 0, 75);
 	qproperty-textShadowColor: rgba(0,0,0,200);
@@ -751,9 +751,9 @@ AutomationClipView {
 	color: rgba(255,255,255,90);
 }
 
-/* bb-clip */
-BBClipView {
-	background-color: #20BDB2; /* default colour for bb-tracks */
+/* pattern clip */
+PatternClipView {
+	background-color: #20BDB2; /* default colour for pattern tracks */
 }
 
 /* Subwindows in MDI-Area */