Menu
▾
▴
[Lmuse-cvs-traffic] muse/muse/midiedit drumedit.cpp,1.41,1.42 piano.cpp,1.5,1.6 piano.h,1.5,1.6 pianoroll.cpp,1.42,1.43 pianoroll.h,1.18,1.19
|
From: werner s. <wsc...@us...> - 2005-09-23 14:29:47
|
Update of /cvsroot/lmuse/muse/muse/midiedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30615/muse/midiedit Modified Files: drumedit.cpp piano.cpp piano.h pianoroll.cpp pianoroll.h Log Message: more updates Index: drumedit.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/drumedit.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** drumedit.cpp 22 Sep 2005 20:13:00 -0000 1.41 --- drumedit.cpp 23 Sep 2005 14:29:36 -0000 1.42 *************** *** 186,198 **** tools->addSeparator(); - srec = new QToolButton(tools, "srec"); - QToolTip::add(srec, tr("Step Record")); - srec->setPixmap(*steprecIcon); - srec->setToggleButton(true); ! midiin = new QToolButton(tools, "midiin"); ! QToolTip::add(midiin, tr("Midi Input")); ! midiin->setPixmap(*midiinIcon); ! midiin->setToggleButton(true); tools2 = new EditToolBar(this, drumeditTools); --- 186,197 ---- tools->addSeparator(); ! srec = tools->addAction(QIcon(*steprecIcon), tr("Step Record")); ! srec->setToolTip(tr("Step Record")); ! srec->setCheckable(true); ! ! midiin = tools->addAction(QIcon(*midiinIcon), tr("Midi Input")); ! midiin->setToolTip(tr("Midi Input")); ! midiin->setCheckable(true); tools2 = new EditToolBar(this, drumeditTools); Index: pianoroll.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/pianoroll.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** pianoroll.h 22 Sep 2005 20:13:00 -0000 1.18 --- pianoroll.h 23 Sep 2005 14:29:36 -0000 1.19 *************** *** 42,46 **** enum { CMD_EVENT_COLOR, CMD_CONFIG_QUANT, CMD_LAST }; int menu_ids[CMD_LAST]; ! Q3PopupMenu *menuEdit, *menuFunctions, *menuSelect, *menuConfig; int tickOffset; --- 42,46 ---- enum { CMD_EVENT_COLOR, CMD_CONFIG_QUANT, CMD_LAST }; int menu_ids[CMD_LAST]; ! QMenu *menuEdit, *menuFunctions, *menuSelect, *menuConfig; int tickOffset; *************** *** 52,59 **** ! QToolButton* speaker; ! QToolButton* followSongButton; ! Q3PopupMenu* eventColor; int colorMode; --- 52,59 ---- ! QAction* speaker; ! QAction* followSongAction; ! QMenu* eventColor; int colorMode; Index: piano.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/piano.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** piano.cpp 22 Sep 2005 20:13:00 -0000 1.5 --- piano.cpp 23 Sep 2005 14:29:36 -0000 1.6 *************** *** 248,251 **** --- 248,252 ---- void Piano::draw(QPainter& p, const QRect& r) { + p.setRenderHint(QPainter::SmoothPixmapTransform); QPoint offset(0, KH*2); p.drawTiledPixmap(r, *octave, r.topLeft()+offset); Index: piano.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/piano.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** piano.h 22 Sep 2005 20:13:00 -0000 1.5 --- piano.h 23 Sep 2005 14:29:36 -0000 1.6 *************** *** 10,17 **** #include "widgets/view.h" - //Added by qt3to4: - #include <QPixmap> - #include <QMouseEvent> - #include <QEvent> #define KH 13 --- 10,13 ---- Index: pianoroll.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/pianoroll.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** pianoroll.cpp 22 Sep 2005 20:13:00 -0000 1.42 --- pianoroll.cpp 23 Sep 2005 14:29:36 -0000 1.43 *************** *** 21,31 **** #include "icons.h" #include "audio.h" - #include "cmd.h" #include "quantconfig.h" - //Added by qt3to4: - #include <QGridLayout> - #include <QKeyEvent> - #include <Q3PopupMenu> #include "shortcuts.h" #include "extmidieditor.h" --- 21,26 ---- *************** *** 44,47 **** --- 39,44 ---- : ExtMidiEditor(pl, parent) { + setIconSize(QSize(18, 18)); + editorType = ET_PIANO_ROLL; deltaMode = false; *************** *** 50,92 **** PianorollSettings* s = (PianorollSettings*) settings; ! selPart = 0; ! quantConfig = 0; ! _playEvents = false; //---------Menü---------------------------------- ! menuEdit = new Q3PopupMenu(this); ! menuBar()->insertItem(tr("&Edit"), menuEdit); ! //TD undoRedo->addTo(menuEdit); ! Q3Accel* ud = new Q3Accel(this); ! ud->connectItem(ud->insertItem(Qt::CTRL+Qt::Key_Z), song, SLOT(undo())); ! Q3Accel* rd = new Q3Accel(this); ! rd->connectItem(rd->insertItem(Qt::CTRL+Qt::Key_Y), song, SLOT(redo())); ! menuEdit->insertSeparator(); ! menuEdit->insertItem(tr("Cut"), PianoCanvas::CMD_CUT); ! menuEdit->setAccel(Qt::CTRL+Qt::Key_X, PianoCanvas::CMD_CUT); ! menuEdit->insertItem(tr("Copy"), PianoCanvas::CMD_COPY); ! menuEdit->setAccel(Qt::CTRL+Qt::Key_C, PianoCanvas::CMD_COPY); ! menuEdit->insertItem(tr("Paste"), PianoCanvas::CMD_PASTE); ! menuEdit->setAccel(Qt::CTRL+Qt::Key_V, PianoCanvas::CMD_PASTE); ! menuEdit->insertSeparator(); ! menuEdit->insertItem(tr("Delete Events"), PianoCanvas::CMD_DEL); ! menuEdit->setAccel(Qt::Key_Delete, PianoCanvas::CMD_DEL); ! menuEdit->insertSeparator(); ! menuSelect = new Q3PopupMenu(this); ! menuSelect->insertItem(QIcon(*select_allIcon), ! tr("Select &All"), PianoCanvas::CMD_SELECT_ALL); ! menuSelect->insertItem(QIcon(*select_deselect_allIcon), ! tr("&Deselect All"), PianoCanvas::CMD_SELECT_NONE); ! menuSelect->insertItem(QIcon(*select_invert_selectionIcon), ! tr("Invert &Selection"), PianoCanvas::CMD_SELECT_INVERT); ! menuSelect->insertItem(QIcon(*select_inside_loopIcon), ! tr("&Inside Loop"), PianoCanvas::CMD_SELECT_ILOOP); ! menuSelect->insertItem(QIcon(*select_outside_loopIcon), ! tr("&Outside Loop"), PianoCanvas::CMD_SELECT_OLOOP); ! menuEdit->insertItem(QIcon(*selectIcon), ! tr("&Select"), menuSelect); eventColor = new Q3PopupMenu(this); --- 47,106 ---- PianorollSettings* s = (PianorollSettings*) settings; ! selPart = 0; ! quantConfig = 0; ! _playEvents = false; ! ! QMenuBar* mb = menuBar(); //---------Menü---------------------------------- ! menuEdit = new QMenu(tr("&Edit")); ! mb->addMenu(menuEdit); ! menuEdit->addAction(undoAction); ! menuEdit->addAction(redoAction); ! // Q3Accel* ud = new Q3Accel(this); ! // ud->connectItem(ud->insertItem(Qt::CTRL+Qt::Key_Z), song, SLOT(undo())); ! // Q3Accel* rd = new Q3Accel(this); ! // rd->connectItem(rd->insertItem(Qt::CTRL+Qt::Key_Y), song, SLOT(redo())); ! QAction* a; ! menuEdit->addSeparator(); ! a = menuEdit->addAction(tr("Cut")); ! a->setData(PianoCanvas::CMD_CUT); ! a->setShortcut(Qt::CTRL+Qt::Key_X); ! ! a = menuEdit->addAction(tr("Copy")); ! a->setData(PianoCanvas::CMD_COPY); ! a->setShortcut(Qt::CTRL+Qt::Key_C); ! ! a = menuEdit->addAction(tr("Paste")); ! a->setData(PianoCanvas::CMD_PASTE); ! a->setShortcut(Qt::CTRL+Qt::Key_V); ! ! menuEdit->addSeparator(); ! ! a = menuEdit->addAction(tr("Delete Events")); ! a->setData(PianoCanvas::CMD_DEL); ! a->setShortcut(Qt::Key_Delete); ! ! menuEdit->addSeparator(); ! ! menuSelect = menuEdit->addMenu(QIcon(*selectIcon),tr("&Select")); ! ! a = menuSelect->addAction(QIcon(*select_allIcon), tr("Select &All")); ! a->setData(PianoCanvas::CMD_SELECT_ALL); ! ! a = menuSelect->addAction(QIcon(*select_deselect_allIcon), tr("&Deselect All")); ! a->setData(PianoCanvas::CMD_SELECT_NONE); ! ! a = menuSelect->addAction(QIcon(*select_invert_selectionIcon), tr("Invert &Selection")); ! a->setData(PianoCanvas::CMD_SELECT_INVERT); ! ! a = menuSelect->addAction(QIcon(*select_inside_loopIcon), tr("&Inside Loop")); ! a->setData(PianoCanvas::CMD_SELECT_ILOOP); ! ! a = menuSelect->addAction(QIcon(*select_outside_loopIcon), tr("&Outside Loop")); ! a->setData(PianoCanvas::CMD_SELECT_OLOOP); eventColor = new Q3PopupMenu(this); *************** *** 98,101 **** --- 112,116 ---- menuConfig = new Q3PopupMenu(this); menuBar()->insertItem(tr("&Config"), menuConfig); + menu_ids[CMD_EVENT_COLOR] = menuConfig->insertItem(tr("event color"), eventColor, 0); *************** *** 142,183 **** //---------ToolBar---------------------------------- ! tools = new QToolBar(tr("Pianoroll Tools"), this); ! //TD undoRedo->addTo(tools); tools->addSeparator(); ! srec = new QToolButton(tools, "srec"); ! QToolTip::add(srec, tr("Step Record")); ! srec->setPixmap(*steprecIcon); ! srec->setToggleButton(true); ! midiin = new QToolButton(tools, "midiin"); ! QToolTip::add(midiin, tr("Midi Input")); ! midiin->setPixmap(*midiinIcon); ! midiin->setToggleButton(true); ! speaker = new QToolButton(tools, "speaker"); ! QToolTip::add(speaker, tr("Play Events")); ! speaker->setPixmap(*speakerIcon); ! speaker->setToggleButton(true); ! followSongButton = new QToolButton(tools, "follow song"); ! QToolTip::add(followSongButton, tr("Follow Song")); ! followSongButton->setText("F"); ! followSongButton->setToggleButton(true); ! followSongButton->setOn(followSong()); ! connect(followSongButton, SIGNAL(toggled(bool)), SLOT(setFollowSong(bool))); tools2 = new EditToolBar(this, pianorollTools); ! QToolBar* panicToolbar = new QToolBar(tr("Panic"), this); ! panicAction->addTo(panicToolbar); //------------------------------------------------------------- // Transport Bar - QToolBar* transport = new QToolBar(tr("Transport"), this); - transportAction->addTo(transport); toolbar = new Toolbar1(this, s->raster(), s->quant()); ! info = new NoteInfo(this); //--------------------------------------------------- --- 157,210 ---- //---------ToolBar---------------------------------- ! tools = addToolBar(tr("Pianoroll Tools")); ! tools->addAction(undoAction); ! tools->addAction(redoAction); tools->addSeparator(); ! srec = tools->addAction(QIcon(*steprecIcon), tr("Step Record")); ! srec->setToolTip(tr("Step Record")); ! srec->setCheckable(true); ! midiin = tools->addAction(QIcon(*midiinIcon), tr("Midi Input")); ! midiin->setToolTip(tr("Midi Input")); ! midiin->setCheckable(true); ! speaker = tools->addAction(QIcon(*speakerIcon), tr("Play Events")); ! speaker->setToolTip(tr("Play Events")); ! speaker->setCheckable(true); ! followSongAction = tools->addAction(tr("F")); ! followSongAction->setToolTip(tr("Follow Song")); ! followSongAction->setCheckable(true); ! followSongAction->setChecked(followSong()); ! connect(followSongAction, SIGNAL(activated(bool)), SLOT(setFollowSong(bool))); tools2 = new EditToolBar(this, pianorollTools); + addToolBar(tools2); ! QToolBar* panicToolbar = addToolBar(tr("Panic")); ! panicToolbar->addAction(panicAction); //------------------------------------------------------------- // Transport Bar + QToolBar* transport = addToolBar(tr("Transport")); + transport->addAction(loopAction); + transport->addAction(punchinAction); + transport->addAction(punchoutAction); + transport->addAction(startAction); + transport->addAction(rewindAction); + transport->addAction(forwardAction); + transport->addAction(stopAction); + transport->addAction(playAction); + transport->addAction(recordAction); + + addToolBarBreak(); toolbar = new Toolbar1(this, s->raster(), s->quant()); ! addToolBar(toolbar); ! ! addToolBarBreak(); ! info = new NoteInfo(this); ! addToolBar(info); //--------------------------------------------------- |