--- qsampler/trunk/src/qsamplerInstrumentListForm.h 2007/11/21 11:46:40 1504 +++ qsampler/trunk/src/qsamplerInstrumentListForm.h 2007/11/26 18:24:38 1528 @@ -37,31 +37,38 @@ Q_OBJECT public: - MidiInstrumentsModel model; - MidiInstrumentsDelegate delegate; - InstrumentListForm(QWidget* pParent = NULL, Qt::WindowFlags wflags = 0); - ~InstrumentListForm(); + InstrumentListForm(QWidget* pParent = NULL, Qt::WindowFlags wflags = 0); + ~InstrumentListForm(); public slots: - void refreshInstruments(); - void activateMap(int); + + void editInstrument(); + void editInstrument(const QModelIndex& index); + void newInstrument(); + void deleteInstrument(); + void refreshInstruments(); + void activateMap(int); + + void stabilizeForm(); + + // Handle custom context menu here... + void contextMenu(const QPoint& pos); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); - void closeEvent(QCloseEvent *); - -protected slots: - void editInstrument(); - void editInstrument(const QModelIndex& index); - void newInstrument(); - void deleteInstrument(); + + void showEvent(QShowEvent *); + void hideEvent(QHideEvent *); + void closeEvent(QCloseEvent *); private: - Ui::qsamplerInstrumentListForm ui; - QComboBox* m_pMapComboBox; + Ui::qsamplerInstrumentListForm m_ui; + + MidiInstrumentsModel m_model; + MidiInstrumentsDelegate m_delegate; + + QComboBox* m_pMapComboBox; }; } // namespace QSampler