From 83d25a41dfc356d2249d8cbed2f08416013eb07c Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Mon, 22 Aug 2011 17:17:23 +0000 Subject: renamed and rearranged "settings" menus fixed empty title problem for list editor shared menu is also resetted when closing/hiding arranger, marker, cliplist --- muse2/muse/app.cpp | 16 +++++++- muse2/muse/arranger/arrangerview.cpp | 2 +- muse2/muse/cliplist/cliplist.cpp | 2 +- muse2/muse/liste/listedit.cpp | 5 ++- muse2/muse/marker/markerview.cpp | 2 +- muse2/muse/master/lmaster.cpp | 2 +- muse2/muse/master/masteredit.cpp | 2 +- muse2/muse/midiedit/drumedit.cpp | 2 +- muse2/muse/midiedit/pianoroll.cpp | 77 ++++++++++++++++++++---------------- muse2/muse/midiedit/scoreedit.cpp | 58 ++++++++++++++------------- muse2/muse/waveedit/waveedit.cpp | 2 +- 11 files changed, 98 insertions(+), 72 deletions(-) diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index 69e4525a..b30358b1 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -840,7 +840,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow() // popup Settings //------------------------------------------------------------- - menuSettings = new QMenu(tr("Se&ttings"), this); + menuSettings = new QMenu(tr("MusE Se&ttings"), this); menuBar()->addMenu(menuSettings); trailingMenus.push_back(menuSettings); @@ -886,6 +886,8 @@ MusE::MusE(int argc, char** argv) : QMainWindow() mdiArea=new QMdiArea(this); mdiArea->setOption(QMdiArea::DontMaximizeSubWindowOnActivation); + mdiArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + mdiArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setCentralWidget(mdiArea); connect(windowsTileAction, SIGNAL(activated()), mdiArea, SLOT(tileSubWindows())); connect(windowsCascadeAction, SIGNAL(activated()), mdiArea, SLOT(cascadeSubWindows())); @@ -1595,6 +1597,10 @@ void MusE::showMarker(bool flag) } markerView->setVisible(flag); viewMarkerAction->setChecked(flag); + if (!flag) + if (currentMenuSharingTopwin == markerView) + setCurrentMenuSharingTopwin(NULL); + updateWindowMenu(); } @@ -1605,6 +1611,9 @@ void MusE::showMarker(bool flag) void MusE::markerClosed() { viewMarkerAction->setChecked(false); + if (currentMenuSharingTopwin == markerView) + setCurrentMenuSharingTopwin(NULL); + updateWindowMenu(); } @@ -1625,6 +1634,9 @@ void MusE::showArranger(bool flag) { arrangerView->setVisible(flag); viewArrangerAction->setChecked(flag); + if (!flag) + if (currentMenuSharingTopwin == arrangerView) + setCurrentMenuSharingTopwin(NULL); updateWindowMenu(); } @@ -2055,6 +2067,8 @@ void MusE::toplevelDeleted(TopWin* tl) // ORCAN: This needs to be verified. aid2 used to correspond to Cliplist: //menu_audio->setItemChecked(aid2, false); viewCliplistAction->setChecked(false); + if (currentMenuSharingTopwin == clipListEdit) + setCurrentMenuSharingTopwin(NULL); updateWindowMenu(); return; //break; diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp index 6ec47375..cd0f53a9 100644 --- a/muse2/muse/arranger/arrangerview.cpp +++ b/muse2/muse/arranger/arrangerview.cpp @@ -487,7 +487,7 @@ ArrangerView::ArrangerView(QWidget* parent) menuStructure->addSeparator(); menuStructure->addAction(strCutEventsAction); - QMenu* menuSettings = menuBar()->addMenu(tr("&Settings")); + QMenu* menuSettings = menuBar()->addMenu(tr("Window &Config")); menuSettings->addAction(subwinAction); menuSettings->addAction(shareAction); diff --git a/muse2/muse/cliplist/cliplist.cpp b/muse2/muse/cliplist/cliplist.cpp index 6ee9c7fe..58bacdd0 100644 --- a/muse2/muse/cliplist/cliplist.cpp +++ b/muse2/muse/cliplist/cliplist.cpp @@ -124,7 +124,7 @@ ClipListEdit::ClipListEdit(QWidget* parent) transport_toolbar->setObjectName("transport"); transport_toolbar->addActions(transportAction->actions()); - QMenu* settingsMenu = menuBar()->addMenu(tr("&Settings")); + QMenu* settingsMenu = menuBar()->addMenu(tr("Window &Config")); settingsMenu->addAction(subwinAction); settingsMenu->addAction(shareAction); diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp index c0580e3b..8d4588eb 100644 --- a/muse2/muse/liste/listedit.cpp +++ b/muse2/muse/liste/listedit.cpp @@ -496,7 +496,7 @@ ListEdit::ListEdit(PartList* pl) connect(editSignalMapper, SIGNAL(mapped(int)), SLOT(cmd(int))); - QMenu* settingsMenu = menuBar()->addMenu(tr("&Settings")); + QMenu* settingsMenu = menuBar()->addMenu(tr("Window &Config")); settingsMenu->addAction(subwinAction); settingsMenu->addAction(shareAction); @@ -588,6 +588,9 @@ ListEdit::ListEdit(PartList* pl) } initShortcuts(); + + setWindowTitle("MusE: List Editor"); + initalizing=false; } diff --git a/muse2/muse/marker/markerview.cpp b/muse2/muse/marker/markerview.cpp index 89011b2b..7889761c 100644 --- a/muse2/muse/marker/markerview.cpp +++ b/muse2/muse/marker/markerview.cpp @@ -174,7 +174,7 @@ MarkerView::MarkerView(QWidget* parent) editMenu->addAction(markerDelete); - QMenu* settingsMenu = menuBar()->addMenu(tr("&Settings")); + QMenu* settingsMenu = menuBar()->addMenu(tr("Window &Config")); settingsMenu->addAction(subwinAction); settingsMenu->addAction(shareAction); diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp index d1aad157..83f303ee 100644 --- a/muse2/muse/master/lmaster.cpp +++ b/muse2/muse/master/lmaster.cpp @@ -143,7 +143,7 @@ LMaster::LMaster() delAction = menuEdit->addAction(tr("Delete Event")); delAction->setShortcut(Qt::Key_Delete); - QMenu* settingsMenu = menuBar()->addMenu(tr("&Settings")); + QMenu* settingsMenu = menuBar()->addMenu(tr("Window &Config")); settingsMenu->addAction(subwinAction); settingsMenu->addAction(shareAction); diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp index 777e6066..d8432ad0 100644 --- a/muse2/muse/master/masteredit.cpp +++ b/muse2/muse/master/masteredit.cpp @@ -90,7 +90,7 @@ MasterEdit::MasterEdit() // QPopupMenu* file = new QPopupMenu(this); // menuBar()->insertItem("&File", file); - QMenu* settingsMenu = menuBar()->addMenu(tr("&Settings")); + QMenu* settingsMenu = menuBar()->addMenu(tr("Window &Config")); settingsMenu->addAction(subwinAction); settingsMenu->addAction(shareAction); diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index f8061c06..d9202a5b 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -263,7 +263,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini QMenu* menuScriptPlugins = menuBar()->addMenu(tr("&Plugins")); song->populateScriptMenu(menuScriptPlugins, this); - QMenu* settingsMenu = menuBar()->addMenu(tr("&Settings")); + QMenu* settingsMenu = menuBar()->addMenu(tr("Window &Config")); settingsMenu->addAction(subwinAction); settingsMenu->addAction(shareAction); diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp index c98657ea..ed58fec7 100644 --- a/muse2/muse/midiedit/pianoroll.cpp +++ b/muse2/muse/midiedit/pianoroll.cpp @@ -142,42 +142,10 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i mapper->setMapping(selectNextPartAction, PianoCanvas::CMD_SELECT_NEXT_PART); connect(selectNextPartAction, SIGNAL(triggered()), mapper, SLOT(map())); - menuConfig = menuBar()->addMenu(tr("&Config")); - - eventColor = menuConfig->addMenu(tr("&Event Color")); - - QActionGroup* actgrp = new QActionGroup(this); - actgrp->setExclusive(true); - - //evColorBlueAction = eventColor->addAction(tr("&Blue")); - evColorBlueAction = actgrp->addAction(tr("&Blue")); - evColorBlueAction->setCheckable(true); - colorMapper->setMapping(evColorBlueAction, 0); - - //evColorPitchAction = eventColor->addAction(tr("&Pitch colors")); - evColorPitchAction = actgrp->addAction(tr("&Pitch colors")); - evColorPitchAction->setCheckable(true); - colorMapper->setMapping(evColorPitchAction, 1); - - //evColorVelAction = eventColor->addAction(tr("&Velocity colors")); - evColorVelAction = actgrp->addAction(tr("&Velocity colors")); - evColorVelAction->setCheckable(true); - colorMapper->setMapping(evColorVelAction, 2); - - connect(evColorBlueAction, SIGNAL(triggered()), colorMapper, SLOT(map())); - connect(evColorPitchAction, SIGNAL(triggered()), colorMapper, SLOT(map())); - connect(evColorVelAction, SIGNAL(triggered()), colorMapper, SLOT(map())); - - eventColor->addActions(actgrp->actions()); - - connect(colorMapper, SIGNAL(mapped(int)), this, SLOT(eventColorModeChanged(int))); - - menuConfig->addSeparator(); - menuConfig->addAction(subwinAction); - menuConfig->addAction(shareAction); - - + + + menuFunctions = menuBar()->addMenu(tr("Fu&nctions")); menuFunctions->setTearOffEnabled(true); @@ -228,6 +196,45 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i connect(mapper, SIGNAL(mapped(int)), this, SLOT(cmd(int))); + + + + + menuConfig = menuBar()->addMenu(tr("Window &Config")); + + eventColor = menuConfig->addMenu(tr("&Event Color")); + + QActionGroup* actgrp = new QActionGroup(this); + actgrp->setExclusive(true); + + //evColorBlueAction = eventColor->addAction(tr("&Blue")); + evColorBlueAction = actgrp->addAction(tr("&Blue")); + evColorBlueAction->setCheckable(true); + colorMapper->setMapping(evColorBlueAction, 0); + + //evColorPitchAction = eventColor->addAction(tr("&Pitch colors")); + evColorPitchAction = actgrp->addAction(tr("&Pitch colors")); + evColorPitchAction->setCheckable(true); + colorMapper->setMapping(evColorPitchAction, 1); + + //evColorVelAction = eventColor->addAction(tr("&Velocity colors")); + evColorVelAction = actgrp->addAction(tr("&Velocity colors")); + evColorVelAction->setCheckable(true); + colorMapper->setMapping(evColorVelAction, 2); + + connect(evColorBlueAction, SIGNAL(triggered()), colorMapper, SLOT(map())); + connect(evColorPitchAction, SIGNAL(triggered()), colorMapper, SLOT(map())); + connect(evColorVelAction, SIGNAL(triggered()), colorMapper, SLOT(map())); + + eventColor->addActions(actgrp->actions()); + + connect(colorMapper, SIGNAL(mapped(int)), this, SLOT(eventColorModeChanged(int))); + + menuConfig->addSeparator(); + menuConfig->addAction(subwinAction); + menuConfig->addAction(shareAction); + + //---------ToolBar---------------------------------- tools = addToolBar(tr("Pianoroll tools")); tools->setObjectName("Pianoroll tools"); diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp index 73d796fa..e2f87b33 100644 --- a/muse2/muse/midiedit/scoreedit.cpp +++ b/muse2/muse/midiedit/scoreedit.cpp @@ -381,7 +381,31 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos) connect(select_oloop_action, SIGNAL(triggered()), menu_mapper, SLOT(map())); - QMenu* settings_menu = menuBar()->addMenu(tr("&Settings")); + QMenu* functions_menu = menuBar()->addMenu(tr("Fu&nctions")); + + func_quantize_action = functions_menu->addAction(tr("&Quantize"), menu_mapper, SLOT(map())); + func_notelen_action = functions_menu->addAction(tr("Change note &length"), menu_mapper, SLOT(map())); + func_velocity_action = functions_menu->addAction(tr("Change note &velocity"), menu_mapper, SLOT(map())); + func_cresc_action = functions_menu->addAction(tr("Crescendo/Decrescendo"), menu_mapper, SLOT(map())); + func_transpose_action = functions_menu->addAction(tr("Transpose"), menu_mapper, SLOT(map())); + func_erase_action = functions_menu->addAction(tr("Erase Events"), menu_mapper, SLOT(map())); + func_move_action = functions_menu->addAction(tr("Move Notes"), menu_mapper, SLOT(map())); + func_fixed_len_action = functions_menu->addAction(tr("Set Fixed Length"), menu_mapper, SLOT(map())); + func_del_overlaps_action = functions_menu->addAction(tr("Delete Overlaps"), menu_mapper, SLOT(map())); + func_legato_action = functions_menu->addAction(tr("Legato"), menu_mapper, SLOT(map())); + menu_mapper->setMapping(func_quantize_action, CMD_QUANTIZE); + menu_mapper->setMapping(func_notelen_action, CMD_NOTELEN); + menu_mapper->setMapping(func_velocity_action, CMD_VELOCITY); + menu_mapper->setMapping(func_cresc_action, CMD_CRESCENDO); + menu_mapper->setMapping(func_transpose_action, CMD_TRANSPOSE); + menu_mapper->setMapping(func_erase_action, CMD_ERASE); + menu_mapper->setMapping(func_move_action, CMD_MOVE); + menu_mapper->setMapping(func_fixed_len_action, CMD_FIXED_LEN); + menu_mapper->setMapping(func_del_overlaps_action, CMD_DELETE_OVERLAPS); + menu_mapper->setMapping(func_legato_action, CMD_LEGATO); + + + QMenu* settings_menu = menuBar()->addMenu(tr("Window &Config")); color_menu = settings_menu->addMenu(tr("Note head &colors")); color_actions = new QActionGroup(this); @@ -419,32 +443,8 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos) settings_menu->addSeparator(); settings_menu->addAction(subwinAction); settings_menu->addAction(shareAction); - - QMenu* functions_menu = menuBar()->addMenu(tr("Fu&nctions")); - - func_quantize_action = functions_menu->addAction(tr("&Quantize"), menu_mapper, SLOT(map())); - func_notelen_action = functions_menu->addAction(tr("Change note &length"), menu_mapper, SLOT(map())); - func_velocity_action = functions_menu->addAction(tr("Change note &velocity"), menu_mapper, SLOT(map())); - func_cresc_action = functions_menu->addAction(tr("Crescendo/Decrescendo"), menu_mapper, SLOT(map())); - func_transpose_action = functions_menu->addAction(tr("Transpose"), menu_mapper, SLOT(map())); - func_erase_action = functions_menu->addAction(tr("Erase Events"), menu_mapper, SLOT(map())); - func_move_action = functions_menu->addAction(tr("Move Notes"), menu_mapper, SLOT(map())); - func_fixed_len_action = functions_menu->addAction(tr("Set Fixed Length"), menu_mapper, SLOT(map())); - func_del_overlaps_action = functions_menu->addAction(tr("Delete Overlaps"), menu_mapper, SLOT(map())); - func_legato_action = functions_menu->addAction(tr("Legato"), menu_mapper, SLOT(map())); - menu_mapper->setMapping(func_quantize_action, CMD_QUANTIZE); - menu_mapper->setMapping(func_notelen_action, CMD_NOTELEN); - menu_mapper->setMapping(func_velocity_action, CMD_VELOCITY); - menu_mapper->setMapping(func_cresc_action, CMD_CRESCENDO); - menu_mapper->setMapping(func_transpose_action, CMD_TRANSPOSE); - menu_mapper->setMapping(func_erase_action, CMD_ERASE); - menu_mapper->setMapping(func_move_action, CMD_MOVE); - menu_mapper->setMapping(func_fixed_len_action, CMD_FIXED_LEN); - menu_mapper->setMapping(func_del_overlaps_action, CMD_DELETE_OVERLAPS); - menu_mapper->setMapping(func_legato_action, CMD_LEGATO); - init_shortcuts(); connect(muse, SIGNAL(configChanged()), SLOT(init_shortcuts())); @@ -4450,10 +4450,12 @@ void staff_t::update_part_indices() * changing "share" status, the changed state isn't stored * * CURRENT TODO - * o fullscreen mode for muse - * o clear menu/toolbars when hiding a window + * M o fullscreen mode for muse + * m o arranger's size hint sucks oO + * maybe related: windows -> tile doesn't work, overrides scrollbarpolicy + * m o rename "borland" to "mac" style??? + * o fix saving muse main win settings in global config dialog * o strange sizes of toolbars oO? - * o restore arranger's maximized state when loading * o remove that ugly "bool initalizing" stuff. it's probably unneeded (watch out for the FINDMICH message) * o mirror most menus to an additional right-click context menu to avoid the long mouse pointer * journey to the menu bar. try to find a way which does not involve duplicate code! diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp index f54e23c3..380731df 100644 --- a/muse2/muse/waveedit/waveedit.cpp +++ b/muse2/muse/waveedit/waveedit.cpp @@ -151,7 +151,7 @@ WaveEdit::WaveEdit(PartList* pl) connect(selectNoneAction, SIGNAL(triggered()), mapper, SLOT(map())); - QMenu* settingsMenu = menuBar()->addMenu(tr("&Settings")); + QMenu* settingsMenu = menuBar()->addMenu(tr("Window &Config")); settingsMenu->addAction(subwinAction); settingsMenu->addAction(shareAction); -- cgit v1.2.3