Merge pull request #1563 from DanWin/resize-cursor

Don't display resize cursor for non-resizable TCOs

include/Track.h

@@ -121,6 +121,16 @@ public:
 		return m_length;
 	}
 
+	inline void setAutoResize( const bool _r )
+	{
+		m_autoResize = _r;
+	}
+
+	inline const bool getAutoResize() const
+	{
+		return m_autoResize;
+	}
+
 	virtual void movePosition( const MidiTime & _pos );
 	virtual void changeLength( const MidiTime & _length );
 
@@ -165,6 +175,7 @@ private:
 
 	BoolModel m_mutedModel;
 	BoolModel m_soloModel;
+	bool m_autoResize;
 
 	bool m_selectViewOnCreate;
 
@@ -216,7 +227,6 @@ protected:
 	virtual void mouseMoveEvent( QMouseEvent * _me );
 	virtual void mouseReleaseEvent( QMouseEvent * _me );
 
-	void setAutoResizeEnabled( bool _e = false );
 	float pixelsPerTact();
 
 	inline TrackView * getTrackView()
@@ -248,7 +258,6 @@ private:
 	TrackContentObject * m_tco;
 	TrackView * m_trackView;
 	Actions m_action;
-	bool m_autoResize;
 	QPoint m_initialMousePos;
 	QPoint m_initialMouseGlobalPos;
 

include/TrackContainer.h

@@ -42,6 +42,11 @@ class EXPORT TrackContainer : public Model, public JournallingObject
 	Q_OBJECT
 public:
 	typedef QVector<Track *> TrackList;
+	enum TrackContainerTypes
+	{
+		BBContainer,
+		SongContainer
+	} ;
 
 	TrackContainer();
 	virtual ~TrackContainer();
@@ -78,6 +83,16 @@ public:
 		return "trackcontainer";
 	}
 
+	inline void setType( TrackContainerTypes newType )
+	{
+		m_TrackContainerType = newType;
+	}
+
+	inline TrackContainerTypes type() const
+	{
+		return m_TrackContainerType;
+	}
+
 
 signals:
 	void trackAdded( Track * _track );
@@ -88,6 +103,8 @@ protected:
 private:
 	TrackList m_tracks;
 
+	TrackContainerTypes m_TrackContainerType;
+
 
 	friend class TrackContainerView;
 	friend class Track;