Color submenu, undoable colors, renaming signals (#6165)
* TCO coloring: submenu, randomize, undoable, renaming signals/slots * Track coloring: submenu, undoable, renaming signals/slots * FX color submenu * Set modified on color change * Use lambda to update TCOView after track color change * More renaming, fix memory leak Co-authored by DomClark
This commit is contained in:
@@ -104,8 +104,8 @@ private:
|
||||
public slots:
|
||||
void renameChannel();
|
||||
void resetColor();
|
||||
void changeColor();
|
||||
void randomColor();
|
||||
void selectColor();
|
||||
void randomizeColor();
|
||||
|
||||
private slots:
|
||||
void renameFinished();
|
||||
|
||||
@@ -45,7 +45,7 @@ public slots:
|
||||
|
||||
|
||||
protected:
|
||||
void contextMenuEvent( QContextMenuEvent * _cme ) override;
|
||||
void constructContextMenu(QMenu* cm) override;
|
||||
void mousePressEvent( QMouseEvent * _me ) override;
|
||||
void mouseReleaseEvent( QMouseEvent * _me ) override;
|
||||
void dragEnterEvent( QDragEnterEvent * _dee ) override;
|
||||
|
||||
@@ -198,8 +198,8 @@ public slots:
|
||||
|
||||
void toggleSolo();
|
||||
|
||||
void trackColorChanged( QColor & c );
|
||||
void trackColorReset();
|
||||
void setColor(const QColor& c);
|
||||
void resetColor();
|
||||
|
||||
private:
|
||||
TrackContainer* m_trackContainer;
|
||||
@@ -229,6 +229,7 @@ signals:
|
||||
void destroyedTrack();
|
||||
void nameChanged();
|
||||
void trackContentObjectAdded( TrackContentObject * );
|
||||
void colorChanged();
|
||||
|
||||
} ;
|
||||
|
||||
|
||||
@@ -135,8 +135,6 @@ public:
|
||||
TimePos startTimeOffset() const;
|
||||
void setStartTimeOffset( const TimePos &startTimeOffset );
|
||||
|
||||
void updateColor();
|
||||
|
||||
// Will copy the state of a TCO to another TCO
|
||||
static void copyStateTo( TrackContentObject *src, TrackContentObject *dst );
|
||||
|
||||
@@ -148,7 +146,7 @@ signals:
|
||||
void lengthChanged();
|
||||
void positionChanged();
|
||||
void destroyedTCO();
|
||||
void trackColorChanged();
|
||||
void colorChanged();
|
||||
|
||||
|
||||
private:
|
||||
|
||||
@@ -126,8 +126,9 @@ public slots:
|
||||
void remove();
|
||||
void update() override;
|
||||
|
||||
void changeClipColor();
|
||||
void useTrackColor();
|
||||
void selectColor();
|
||||
void randomizeColor();
|
||||
void resetColor();
|
||||
|
||||
protected:
|
||||
enum ContextMenuAction
|
||||
@@ -231,6 +232,7 @@ private:
|
||||
bool mouseMovedDistance( QMouseEvent * me, int distance );
|
||||
TimePos draggedTCOPos( QMouseEvent * me );
|
||||
int knifeMarkerPos( QMouseEvent * me );
|
||||
void setColor(const QColor* color);
|
||||
//! Return true iff TCO could be split. Currently only implemented for samples
|
||||
virtual bool splitTCO( const TimePos pos ){ return false; };
|
||||
void updateCursor(QMouseEvent * me);
|
||||
|
||||
@@ -50,10 +50,10 @@ private slots:
|
||||
void cloneTrack();
|
||||
void removeTrack();
|
||||
void updateMenu();
|
||||
void changeTrackColor();
|
||||
void randomTrackColor();
|
||||
void selectTrackColor();
|
||||
void randomizeTrackColor();
|
||||
void resetTrackColor();
|
||||
void useTrackColor();
|
||||
void resetTCOColors();
|
||||
void toggleRecording(bool on);
|
||||
void recordingOn();
|
||||
void recordingOff();
|
||||
@@ -71,9 +71,6 @@ private:
|
||||
|
||||
signals:
|
||||
void trackRemovalScheduled( TrackView * t );
|
||||
void colorChanged( QColor & c );
|
||||
void colorParented();
|
||||
void colorReset();
|
||||
|
||||
} ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user