Enable track-wide color coding

include/AutomationPatternView.h

@@ -27,10 +27,11 @@
 
 #include <QStaticText>
 
+#include "AutomationPattern.h"
+#include "Song.h"
+#include "SongEditor.h"
 #include "Track.h"
 
-class AutomationPattern;
-
 
 class AutomationPatternView : public TrackContentObjectView
 {

include/BBTrack.h

@@ -50,33 +50,11 @@ class BBTCO : public TrackContentObject
 		return( "bbtco" );
 	}
 
-	unsigned int color() const
-	{
-		return( m_color.rgb() );
-	}
-
-	QColor colorObj() const
-	{
-		return m_color;
-	}
-
-	void setColor( const QColor & c )
-	{
-		m_color = QColor( c );
-	}
-
-	void setUseStyleColor( bool b )
-	{
-		m_useStyleColor = b;
-	}
-
 	int bbTrackIndex();
 
 	TrackContentObjectView * createView( TrackView * _tv ) override;
 
 private:
-	QColor m_color;
-	bool m_useStyleColor;
 
 
 	friend class BBTCOView;
@@ -92,11 +70,6 @@ class BBTCOView : public TrackContentObjectView
 	BBTCOView( TrackContentObject * _tco, TrackView * _tv );
 	virtual ~BBTCOView() = default;
 
-	QColor color() const
-	{
-		return( m_bbTCO->m_color );
-	}
-	void setColor( QColor _new_color );
 
 public slots:
 	void update() override;
@@ -105,8 +78,6 @@ protected slots:
 	void openInBBEditor();
 	void resetName();
 	void changeName();
-	void changeColor();
-	void resetColor();
 
 
 protected:

include/Pattern.h

@@ -111,7 +111,6 @@ class LMMS_EXPORT Pattern : public TrackContentObject
 
 	TrackContentObjectView * createView( TrackView * _tv ) override;
 
-
 	using Model::dataChanged;
 
 
@@ -188,7 +187,6 @@ public slots:
 protected slots:
 	void openInPianoRoll();
 	void setGhostInPianoRoll();
-
 	void resetName();
 	void changeName();
 

include/Track.h

@@ -133,6 +133,43 @@ class LMMS_EXPORT TrackContentObject : public Model, public JournallingObject
 	{
 		return m_autoResize;
 	}
+
+	unsigned int colorRgb() const
+	{
+		return( m_color.rgb() );
+	}
+
+	QColor color() const
+	{
+		return m_color;
+	}
+
+	void setColor( const QColor & c )
+	{
+		m_color = QColor( c );
+	}
+
+	void setColorRgb( const unsigned int & c )
+	{
+		m_color.setRgb( c );
+	}
+
+	void useStyleColor( bool b )
+	{
+		m_useStyleColor = b;
+	}
+
+	bool usesStyleColor()
+	{
+		return m_useStyleColor;
+	}
+
+	void useCustomClipColor( bool b );
+
+	bool usesCustomClipColor()
+	{
+		return m_useCustomClipColor;
+	}
 
 	virtual void movePosition( const MidiTime & pos );
 	virtual void changeLength( const MidiTime & length );
@@ -154,6 +191,10 @@ class LMMS_EXPORT TrackContentObject : public Model, public JournallingObject
 
 	MidiTime startTimeOffset() const;
 	void setStartTimeOffset( const MidiTime &startTimeOffset );
+
+	void setBGColor( QColor & c );
+	QColor BGColor();
+	void resetColor();
 
 public slots:
 	void copy();
@@ -165,6 +206,10 @@ public slots:
 	void lengthChanged();
 	void positionChanged();
 	void destroyedTCO();
+	void trackColorChanged( QColor & );
+	void clipColorChanged( QColor & );
+	void trackColorReset();
+	void clipColorReset();
 
 
 private:
@@ -188,6 +233,10 @@ public slots:
 
 	bool m_selectViewOnCreate;
 
+	QColor m_color;
+	bool m_useStyleColor;
+	bool m_useCustomClipColor;
+
 	friend class TrackContentObjectView;
 
 } ;
@@ -245,6 +294,11 @@ class TrackContentObjectView : public selectableObject, public ModelView
 	void setBBPatternBackground( const QColor & c );
 	void setGradient( const bool & b );
 	void setMouseHotspotHand(const QSize & s);
+
+	QColor color() const
+	{
+		return m_tco->color();
+	};
 
 	// access needsUpdate member variable
 	bool needsUpdate();
@@ -269,6 +323,14 @@ public slots:
 	void cut();
 	void remove();
 	void update() override;
+	void changeSelectedColor( QColor & );
+	void disableSelectedColor();
+	void disableClipSelectedColor();
+
+	void changeClipColor();
+	void useTrackColor();
+	void trackColorReset();
+	void setColor( QColor & );
 
 protected:
 	enum ContextMenuAction
@@ -340,6 +402,7 @@ protected slots:
 	QColor m_mutedColor;
 	QColor m_mutedBackgroundColor;
 	QColor m_selectedColor;
+	QColor m_customSelectedColor;
 	QColor m_textColor;
 	QColor m_textBackgroundColor;
 	QColor m_textShadowColor;
@@ -348,6 +411,8 @@ protected slots:
 	QSize m_mouseHotspotHand; // QSize must be used because QPoint isn't supported by property system
 	bool m_cursorSetYet;
 
+	bool m_usesCustomSelectedColor;
+
 	bool m_needsUpdate;
 	inline void setInitialPos( QPoint pos )
 	{
@@ -476,6 +541,13 @@ class TrackOperationsWidget : public QWidget
 	TrackOperationsWidget( TrackView * parent );
 	~TrackOperationsWidget();
 
+	void setBackgroundColor( QColor & );
+
+	void setTrackHasColor( bool b )
+	{
+		hasColor = b;
+	}
+
 
 protected:
 	void mousePressEvent( QMouseEvent * me ) override;
@@ -486,10 +558,22 @@ private slots:
 	void cloneTrack();
 	void removeTrack();
 	void updateMenu();
+	void changeTrackColor();
+	void randomTrackColor();
+	void resetTrackColor();
+	void useTrackColor();
 	void toggleRecording(bool on);
 	void recordingOn();
 	void recordingOff();
 	void clearTrack();
+
+	void loadColorSettings( unsigned int );
+	void updateColorGradient();
+	QColor backgroundColor();
+	bool trackHasColor()
+	{
+		return hasColor;
+	}
 
 private:
 	TrackView * m_trackView;
@@ -498,11 +582,17 @@ private slots:
 	PixmapButton * m_muteBtn;
 	PixmapButton * m_soloBtn;
 
+	QColor m_backgroundColor;
+	bool hasColor;
+	bool colorBarNeedsUpdate;
 
 	friend class TrackView;
 
 signals:
 	void trackRemovalScheduled( TrackView * t );
+	void colorChanged( QColor & c );
+	void colorParented();
+	void colorReset();
 
 } ;
 
@@ -635,7 +725,16 @@ class LMMS_EXPORT Track : public Model, public JournallingObject
 	{
 		return m_processingLock.tryLock();
 	}
-
+
+	QColor backgroundColor()
+	{
+		return m_backgroundColor;
+	}
+	bool useColor()
+	{
+		return hasColor;
+	}
+
 	BoolModel* getMutedModel();
 
 public slots:
@@ -647,6 +746,8 @@ public slots:
 
 	void toggleSolo();
 
+	void trackColorChanged( QColor & c );
+	void trackColorReset();
 
 private:
 	TrackContainer* m_trackContainer;
@@ -665,6 +766,9 @@ public slots:
 	tcoVector m_trackContentObjects;
 
 	QMutex m_processingLock;
+
+	QColor m_backgroundColor;
+	bool hasColor;
 
 	friend class TrackView;
 
@@ -673,7 +777,10 @@ public slots:
 	void destroyedTrack();
 	void nameChanged();
 	void trackContentObjectAdded( TrackContentObject * );
+	void loadedColorSettings( unsigned int );
 
+	QColor requestTrackBGColor();
+	bool requestTrackHasColor();
 } ;
 
 
@@ -720,6 +827,8 @@ class TrackView : public QWidget, public ModelView, public JournallingObject
 	{
 		return m_action == MoveTrack;
 	}
+
+
 
 	virtual void update();
 
@@ -771,8 +880,8 @@ public slots:
 
 	Track * m_track;
 	TrackContainerView * m_trackContainerView;
-
 	TrackOperationsWidget m_trackOperationsWidget;
+
 	QWidget m_trackSettingsWidget;
 	TrackContentWidget m_trackContentWidget;
 

src/core/AutomationPattern.cpp

@@ -538,6 +538,12 @@ void AutomationPattern::saveSettings( QDomDocument & _doc, QDomElement & _this )
 	_this.setAttribute( "prog", QString::number( progressionType() ) );
 	_this.setAttribute( "tens", QString::number( getTension() ) );
 	_this.setAttribute( "mute", QString::number( isMuted() ) );
+
+	if( ! usesStyleColor() )
+	{
+		_this.setAttribute( "color", color().name() );
+		_this.setAttribute( "isclipcolor", usesCustomClipColor() );
+	}
 
 	for( timeMap::const_iterator it = m_timeMap.begin();
 						it != m_timeMap.end(); ++it )
@@ -593,6 +599,13 @@ void AutomationPattern::loadSettings( const QDomElement & _this )
 			m_idsToResolve << element.attribute( "id" ).toInt();
 		}
 	}
+
+	if( _this.hasAttribute( "color" ) )
+	{
+		useStyleColor( false );
+		useCustomClipColor( _this.attribute( "isclipcolor" ) == "1" );
+		setColor( _this.attribute( "color" ) );
+	}
 
 	int len = _this.attribute( "len" ).toInt();
 	if( len <= 0 )