diff options
| author | Florian Jung <flo@windfisch.org> | 2011-06-03 14:24:08 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-06-03 14:24:08 +0000 |
| commit | db164b62e3892bd17d1a2eabca76bde3b67072df (patch) | |
| tree | ab71ac4b4f05ab94c008d75ef7052bef5af6cc74 /muse2/muse/liste | |
| parent | def4fdb391f5207ebbe61881416f39f3d896cc5d (diff) | |
| parent | 9187899632c14d64b3fae6477b7f941240f912a6 (diff) | |
merged with trunk and adapted new functions
Diffstat (limited to 'muse2/muse/liste')
| -rw-r--r-- | muse2/muse/liste/editevent.cpp | 32 | ||||
| -rw-r--r-- | muse2/muse/liste/listedit.h | 4 |
2 files changed, 25 insertions, 11 deletions
diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp index b162a3e6..fd74d5d3 100644 --- a/muse2/muse/liste/editevent.cpp +++ b/muse2/muse/liste/editevent.cpp @@ -12,7 +12,7 @@ #include <QGridLayout> #include <QLabel> #include <QListWidget> -#include <QMenu> +//#include <QMenu> #include <QMessageBox> #include <QPushButton> #include <QRadioButton> @@ -36,6 +36,7 @@ #include "midiedit/drummap.h" #include "instruments/minstrument.h" #include "midi.h" +#include "popupmenu.h" //--------------------------------------------------------- // string2qhex @@ -679,7 +680,8 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event, void EditCtrlDialog::newController() { - QMenu* pup = new QMenu(this); + //QMenu* pup = new QMenu(this); + PopupMenu* pup = new PopupMenu(this); //pup->setCheckable(this);//not necessary in Qt4 // // populate popup with all controllers available for @@ -715,7 +717,9 @@ void EditCtrlDialog::newController() cll->add(channel, vl); //song->update(SC_MIDI_CONTROLLER_ADD); } - for (int idx = 0; ;++idx) { + //for (int idx = 0; ;++idx) { + int idx = 0; + for (; idx < ctrlList->count() ;++idx) { // p4.0.25 Fix segfault QString str = ctrlList->item(idx)->text(); if (s == str) { @@ -723,13 +727,20 @@ void EditCtrlDialog::newController() ctrlListClicked(ctrlList->item(idx)); break; } - if (str.isNull()) { - ctrlList->addItem(s); - ctrlList->item(idx)->setSelected(true); - ctrlListClicked(ctrlList->item(idx)); - break; - } + //if (str.isNull()) { + // ctrlList->addItem(s); + // ctrlList->item(idx)->setSelected(true); + // ctrlListClicked(ctrlList->item(idx)); + // break; + // } } + if (idx >= ctrlList->count()) { // p4.0.25 Fix segfault + ctrlList->addItem(s); + ctrlList->item(idx)->setSelected(true); + ctrlListClicked(ctrlList->item(idx)); + break; + } + break; } @@ -844,7 +855,8 @@ void EditCtrlDialog::instrPopup() MidiInstrument* instr = midiPorts[port].instrument(); ///instr->populatePatchPopup(pop, channel, song->mtype(), track->type() == Track::DRUM); - QMenu* pup = new QMenu(this); + //QMenu* pup = new QMenu(this); + PopupMenu* pup = new PopupMenu(this); instr->populatePatchPopup(pup, channel, song->mtype(), track->type() == Track::DRUM); ///if(pop->actions().count() == 0) diff --git a/muse2/muse/liste/listedit.h b/muse2/muse/liste/listedit.h index 5cf60a59..397a5e08 100644 --- a/muse2/muse/liste/listedit.h +++ b/muse2/muse/liste/listedit.h @@ -32,6 +32,8 @@ class Xml; //--------------------------------------------------------- class ListEdit : public MidiEditor { + Q_OBJECT + QTreeWidget* liste; QMenu* menuEdit; QActionGroup* insertItems; @@ -43,7 +45,7 @@ class ListEdit : public MidiEditor { enum { CMD_DELETE }; - Q_OBJECT + virtual void closeEvent(QCloseEvent*); virtual void keyPressEvent(QKeyEvent*); void initShortcuts(); |