diff options
| -rw-r--r-- | muse2/ChangeLog | 5 | ||||
| -rw-r--r-- | muse2/muse/app.cpp | 17 | ||||
| -rw-r--r-- | muse2/muse/midiedit/pianoroll.cpp | 9 | ||||
| -rw-r--r-- | muse2/muse/midiedit/pianoroll.h | 5 |
4 files changed, 27 insertions, 9 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 0e25838e..081a6a1a 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,4 +1,9 @@ 26.10.2010 + - Fixed non-opening view menu windows (mixers, marker, bigtime etc). (Tim) + Found all the isItemChecked() returning opposite of before (for example in toggleBigTime()). + And yet the setItemChecked() remains unmodified and it works (for example in showBigtime()). + Not understood why - yet. +26.10.2010 - Applied large patch by Orcan to (start) converting to native QMainWindow and QToolBar. (Tim) - Completed piano roll, drum edit, MusE app, and arranger toolbars. 24.10.2010 diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index f806be90..f23a3283 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -1967,7 +1967,8 @@ void MusE::closeEvent(QCloseEvent*) void MusE::toggleMarker() { - showMarker(!menuView->isItemChecked(mr_id)); + //showMarker(!menuView->isItemChecked(mr_id)); + showMarker(menuView->isItemChecked(mr_id)); // Tim - QT4 } //--------------------------------------------------------- @@ -2008,7 +2009,8 @@ void MusE::markerClosed() void MusE::toggleTransport() { - showTransport(!menuView->isItemChecked(tr_id)); + //showTransport(!menuView->isItemChecked(tr_id)); + showTransport(menuView->isItemChecked(tr_id)); // Tim - QT4 } //--------------------------------------------------------- @@ -4478,7 +4480,7 @@ void MusE::switchMixerAutomation() // Clear all pressed and touched and rec event lists. song->clearRecAutomation(true); -printf("automation = %d\n", automation); +// printf("automation = %d\n", automation); menuAutomation->setItemChecked(autoId, automation); } @@ -4635,7 +4637,8 @@ void MusE::showBigtime(bool on) void MusE::toggleBigTime() { - showBigtime(!menuView->isItemChecked(bt_id)); + //showBigtime(!menuView->isItemChecked(bt_id)); + showBigtime(menuView->isItemChecked(bt_id)); // Tim - QT4 } //--------------------------------------------------------- @@ -4717,9 +4720,8 @@ void MusE::toggleMixer() void MusE::toggleMixer1() { - printf("toggle mixer1\n"); //showMixer1(!menuView->isItemChecked(aid1a)); - showMixer1(true); + showMixer1(menuView->isItemChecked(aid1a)); // Tim - QT4 } //--------------------------------------------------------- @@ -4728,7 +4730,8 @@ void MusE::toggleMixer1() void MusE::toggleMixer2() { - showMixer2(!menuView->isItemChecked(aid1b)); + //showMixer2(!menuView->isItemChecked(aid1b)); + showMixer2(menuView->isItemChecked(aid1b)); // Tim - QT4 } //--------------------------------------------------------- diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp index c9c4ec3f..2a757f01 100644 --- a/muse2/muse/midiedit/pianoroll.cpp +++ b/muse2/muse/midiedit/pianoroll.cpp @@ -83,16 +83,23 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i _quantLen = _quantLenInit; _to = _toInit; colorMode = colorModeInit; - //---------Men---------------------------------- + + //---------Menu---------------------------------- + menuEdit = new Q3PopupMenu(this); + //menuEdit = new QMenu(this); menuBar()->insertItem(tr("&Edit"), menuEdit); + //menuEdit = menuBar()->addMenu(tr("&Edit")); undoRedo->addTo(menuEdit); + //menuEdit->addActions(undoRedo->actions()); + 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->addSeparator(); menuEdit->insertItem(tr("Cut"), PianoCanvas::CMD_CUT); menuEdit->setAccel(Qt::CTRL+Qt::Key_X, PianoCanvas::CMD_CUT); menuEdit->insertItem(tr("Copy"), PianoCanvas::CMD_COPY); diff --git a/muse2/muse/midiedit/pianoroll.h b/muse2/muse/midiedit/pianoroll.h index 10818b94..b24f1c1c 100644 --- a/muse2/muse/midiedit/pianoroll.h +++ b/muse2/muse/midiedit/pianoroll.h @@ -10,6 +10,7 @@ #include <qwidget.h> #include <q3mainwindow.h> +//#include <QMenu> //Added by qt3to4: #include <QCloseEvent> #include <QResizeEvent> @@ -43,6 +44,7 @@ class QuantConfig; class ScrollScale; class Part; class SNode; +class QMenu; //--------------------------------------------------------- // PianoRoll @@ -56,6 +58,7 @@ class PianoRoll : public MidiEditor { enum { CMD_EVENT_COLOR, CMD_CONFIG_QUANT, CMD_LAST }; int menu_ids[CMD_LAST]; Q3PopupMenu *menuEdit, *menuFunctions, *menuSelect, *menuConfig, *menuPlugins; + //QMenu *menuEdit, *menuFunctions, *menuSelect, *menuConfig, *menuPlugins; int tickOffset; int lenOffset; @@ -75,7 +78,7 @@ class PianoRoll : public MidiEditor { QToolBar* tools; EditToolBar* tools2; - Q3PopupMenu* eventColor; + QMenu* eventColor; int colorMode; static int _quantInit, _rasterInit; |