hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

* when used on instrumentTrack, also show instrument name on trackLabelButton

Browse Source 
* removed obsolete support for choosing custom track icons



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1630 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-09-18 21:36:27 +00:00
parent e282227c6a
commit af7e00091e
11 changed files with 129 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/instrument_track.h
View File

@@ -102,6 +102,11 @@ public:
// name-stuff
virtual void setName( const QString & _new_name );
inline virtual QString displayName( void ) const
{
return instrumentName() + ":" + track::displayName();
}
// translate given key of a note-event to absolute key (i.e.
// add global master-pitch and base-note of this instrument track)
int masterKey( int _midi_key ) const;
@@ -159,8 +164,6 @@ public:
return( m_arpeggiator.m_arpEnabledModel.value() );
}
virtual QString displayName( void ) const;
// simple helper for removing midiport-XML-node when loading presets
static void removeMidiPortNode( multimediaProject & _mmp );

7
include/track.h
View File

@@ -43,7 +43,6 @@ class QPushButton;
class bbTrack;
class pixmapButton;
class pixmapLoader;
class textFloat;
class track;
class trackContentObjectView;
@@ -426,11 +425,6 @@ public:
return( name() );
}
inline const pixmapLoader * icon( void ) const
{
return( m_pixmapLoader );
}
using model::dataChanged;
@@ -448,7 +442,6 @@ private:
trackContainer * m_trackContainer;
TrackTypes m_type;
QString m_name;
pixmapLoader * m_pixmapLoader;
boolModel m_mutedModel;
boolModel m_soloModel;

21
include/track_label_button.h
View File

@@ -39,27 +39,9 @@ public:
trackLabelButton( trackView * _tv, QWidget * _parent );
virtual ~trackLabelButton();
const QPixmap & pixmap( void ) const
{
return( m_pixmap );
}
const QString & pixmapFile( void ) const
{
return( m_pixmapFile );
}
public slots:
void setPixmap( const QPixmap & _pixmap );
void setPixmapFile( const QString & _file );
void selectPixmap( void );
void rename( void );
void updateName( void );
signals:
void pixmapChanged( void );
protected:
@@ -67,12 +49,11 @@ protected:
virtual void dropEvent( QDropEvent * _de );
virtual void mousePressEvent( QMouseEvent * _me );
virtual void mouseDoubleClickEvent( QMouseEvent * _me );
virtual void paintEvent( QPaintEvent * _pe );
private:
trackView * m_trackView;
QPixmap m_pixmap;
QString m_pixmapFile;
} ;