Merge remote-tracking branch 'origin/stable-1.1'

Conflicts:
	data/locale/zh.ts
	src/tracks/Pattern.cpp

include/Pattern.h

@@ -1,5 +1,5 @@
 /*
- * pattern.h - declaration of class pattern, which contains all informations
+ * Pattern.h - declaration of class Pattern, which contains all information
  *             about a pattern
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -46,7 +46,7 @@ class SampleBuffer;
 
 
 
-class EXPORT pattern : public trackContentObject
+class EXPORT Pattern : public trackContentObject
 {
 	Q_OBJECT
 public:
@@ -56,9 +56,9 @@ public:
 		MelodyPattern
 	} ;
 
-	pattern( InstrumentTrack * _instrument_track );
-	pattern( const pattern & _pat_to_copy );
-	virtual ~pattern();
+	Pattern( InstrumentTrack* instrumentTrack );
+	Pattern( const Pattern& other );
+	virtual ~Pattern();
 
 	void init();
 
@@ -137,14 +137,18 @@ private:
 	NoteVector m_notes;
 	int m_steps;
 
-	friend class patternView;
+	friend class PatternView;
 	friend class bbEditor;
 
+
+signals:
+	void destroyedPattern( Pattern* );
+
 } ;
 
 
 
-class patternView : public trackContentObjectView
+class PatternView : public trackContentObjectView
 {
 	Q_OBJECT
 
@@ -152,8 +156,8 @@ class patternView : public trackContentObjectView
 	Q_PROPERTY( QColor fgColor READ fgColor WRITE setFgColor )
 	Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )
 public:
-	patternView( pattern * _pattern, trackView * _parent );
-	virtual ~patternView();
+	PatternView( Pattern* pattern, trackView* parent );
+	virtual ~PatternView();
 
 
 public slots:
@@ -186,7 +190,7 @@ private:
 	static QPixmap * s_stepBtnOff;
 	static QPixmap * s_stepBtnOffLight;
 
-	pattern * m_pat;
+	Pattern* m_pat;
 	QPixmap m_paintPixmap;
 	bool m_needsUpdate;
 } ;

include/PianoRoll.h

@@ -46,7 +46,7 @@ class QSignalMapper;
 
 class comboBox;
 class NotePlayHandle;
-class pattern;
+class Pattern;
 class timeLine;
 class toolButton;
 
@@ -61,7 +61,7 @@ public:
 	/*! \brief Resets settings to default when e.g. creating a new project */
 	void reset();
 
-	void setCurrentPattern( pattern * _new_pattern );
+	void setCurrentPattern( Pattern* newPattern );
 
 	inline void stopRecording()
 	{
@@ -73,12 +73,12 @@ public:
 		return m_recording;
 	}
 
-	inline const pattern * currentPattern() const
+	const Pattern* currentPattern() const
 	{
 		return m_pattern;
 	}
 
-	inline bool validPattern() const
+	bool hasValidPattern() const
 	{
 		return m_pattern != NULL;
 	}
@@ -164,6 +164,9 @@ protected slots:
 	void changeNoteEditMode( int i );
 	void markSemiTone( int i );
 
+	void hidePattern( Pattern* pattern );
+
+
 signals:
 	void currentPatternChanged();
 	void semiToneMarkerMenuScaleSetEnabled(bool);
@@ -291,7 +294,7 @@ private:
 
 
 
-	pattern * m_pattern;
+	Pattern* m_pattern;
 	QScrollBar * m_leftRightScroll;
 	QScrollBar * m_topBottomScroll;
 

include/SampleRecordHandle.h

@@ -33,7 +33,6 @@
 #include "SampleBuffer.h"
 
 class bbTrack;
-class pattern;
 class SampleTCO;
 class track;
 

include/song.h

@@ -35,7 +35,7 @@
 #include "VstSyncController.h"
 
 class AutomationTrack;
-class pattern;
+class Pattern;
 class timeLine;
 
 
@@ -263,7 +263,7 @@ public slots:
 	void playAndRecord();
 	void playTrack( track * _trackToPlay );
 	void playBB();
-	void playPattern( pattern * _patternToPlay, bool _loop = true );
+	void playPattern( Pattern* patternToPlay, bool _loop = true );
 	void togglePause();
 	void stop();
 
@@ -354,7 +354,7 @@ private:
 	tact_t m_length;
 
 	track * m_trackToPlay;
-	pattern * m_patternToPlay;
+	Pattern* m_patternToPlay;
 	bool m_loopPattern;
 
 	double m_elapsedMilliSeconds;