diff options
| author | Tim E. Real <termtech@rogers.com> | 2011-09-13 23:59:23 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2011-09-13 23:59:23 +0000 |
| commit | a8c8fa89d916bded2905e0a5a8c05ac30e159902 (patch) | |
| tree | a921aa8311d8542a77f6cbfc952561691cb7bd8d /muse2/muse/mixer | |
| parent | 56d4a94c40bbcae6a2862fba3e2923542511779f (diff) | |
Added: You can now insert new tracks instead of always at the track list end.
If main menu 'Add track': Inserts before currently selected track, else adds at end.
If Track List right-click existing Track Name: New 'Insert track' menu inserts before clicked track.
If Track List right-click on empty space, or Mixer 'Create': Adds at end, as usual.
Fixed track selection bug: Track info panel not clearing when clicking empty area.
Diffstat (limited to 'muse2/muse/mixer')
| -rw-r--r-- | muse2/muse/mixer/amixer.cpp | 7 | ||||
| -rw-r--r-- | muse2/muse/mixer/amixer.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp index 35173731..e30524ae 100644 --- a/muse2/muse/mixer/amixer.cpp +++ b/muse2/muse/mixer/amixer.cpp @@ -169,6 +169,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MusEConfig::MixerConfig* c) QMenu* menuConfig = menuBar()->addMenu(tr("&Create")); MusEUtil::populateAddTrack(menuConfig); + connect(menuConfig, SIGNAL(triggered(QAction *)), song, SLOT(addNewTrack(QAction *))); QMenu* menuView = menuBar()->addMenu(tr("&View")); routingId = menuView->addAction(tr("Routing"), this, SLOT(toggleRouteDialog())); @@ -252,6 +253,12 @@ bool AudioMixerApp::event(QEvent* event) } */ +//void AudioMixerApp::addNewTrack(QAction* action) +//{ + //song->addNewTrack(action, MusEGlobal::muse->arranger()->curTrack()); // Insert at current selected track. +// song->addNewTrack(action); // Add at end. +//} + void AudioMixerApp::setSizing() { int w = 0; diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h index 1726ba7b..41f1e5e1 100644 --- a/muse2/muse/mixer/amixer.h +++ b/muse2/muse/mixer/amixer.h @@ -122,6 +122,7 @@ class AudioMixerApp : public QMainWindow { void songChanged(int); //void configChanged() { songChanged(-1); } void configChanged(); + //void addNewTrack(QAction*); void setSizing(); void toggleRouteDialog(); void routingDialogClosed(); |