Skip to content

Commit a25a40b

Browse files
committed
fix #40781: Visibility status of toolbar items not reflected in menu
1 parent 3d89d77 commit a25a40b

File tree

2 files changed

+31
-30
lines changed

2 files changed

+31
-30
lines changed

mscore/musescore.cpp

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -741,15 +741,16 @@ MuseScore::MuseScore()
741741
menuView->addAction(getAction("zoomout"));
742742
menuView->addSeparator();
743743

744-
a = getAction("toggle-transport");
745-
a->setCheckable(true);
746-
a->setChecked(transportTools->isVisible());
747-
menuView->addAction(a);
744+
// a = getAction("toggle-transport");
745+
// a->setCheckable(true);
746+
// a->setChecked(transportTools->isVisible());
747+
// connect(transportTools, SIGNAL(visibilityChanged(bool)), a, SLOT(setChecked(bool)));
748+
// menuView->addAction(a);
748749

749-
a = getAction("toggle-noteinput");
750-
a->setCheckable(true);
751-
a->setChecked(true);
752-
menuView->addAction(a);
750+
// a = getAction("toggle-noteinput");
751+
// a->setCheckable(true);
752+
// a->setChecked(true);
753+
// menuView->addAction(a);
753754

754755
a = getAction("toggle-statusbar");
755756
a->setCheckable(true);
@@ -2680,10 +2681,10 @@ void MuseScore::readSettings()
26802681
splitter->restoreState(settings.value("splitter").toByteArray());
26812682
settings.endGroup();
26822683

2683-
QAction* a = getAction("toggle-transport");
2684-
a->setChecked(!transportTools->isHidden());
2685-
a = getAction("toggle-noteinput");
2686-
a->setChecked(!entryTools->isHidden());
2684+
// QAction* a = getAction("toggle-transport");
2685+
// a->setChecked(!transportTools->isHidden());
2686+
// a = getAction("toggle-noteinput");
2687+
// a->setChecked(!entryTools->isHidden());
26872688
}
26882689

26892690
//---------------------------------------------------------
@@ -4015,10 +4016,10 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
40154016
showSelectionWindow(a->isChecked());
40164017
else if (cmd == "show-keys")
40174018
;
4018-
else if (cmd == "toggle-transport")
4019-
transportTools->setVisible(!transportTools->isVisible());
4020-
else if (cmd == "toggle-noteinput")
4021-
entryTools->setVisible(!entryTools->isVisible());
4019+
// else if (cmd == "toggle-transport")
4020+
// transportTools->setVisible(!transportTools->isVisible());
4021+
// else if (cmd == "toggle-noteinput")
4022+
// entryTools->setVisible(!entryTools->isVisible());
40224023
else if (cmd == "local-help")
40234024
helpBrowser();
40244025
else if (cmd == "follow")

mscore/shortcut.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,20 +1658,20 @@ Shortcut Shortcut::_sc[] = {
16581658
Icons::Invalid_ICON,
16591659
Qt::ApplicationShortcut
16601660
},
1661-
{
1662-
MsWidget::MAIN_WINDOW,
1663-
STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT | STATE_LYRICS_EDIT,
1664-
"toggle-transport",
1665-
QT_TRANSLATE_NOOP("action","Transport"),
1666-
QT_TRANSLATE_NOOP("action","Transport toolbar")
1667-
},
1668-
{
1669-
MsWidget::MAIN_WINDOW,
1670-
STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT | STATE_LYRICS_EDIT,
1671-
"toggle-noteinput",
1672-
QT_TRANSLATE_NOOP("action","Note Input"),
1673-
QT_TRANSLATE_NOOP("action","Note input toolbar")
1674-
},
1661+
// {
1662+
// MsWidget::MAIN_WINDOW,
1663+
// STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT | STATE_LYRICS_EDIT,
1664+
// "toggle-transport",
1665+
// QT_TRANSLATE_NOOP("action","Transport"),
1666+
// QT_TRANSLATE_NOOP("action","Transport toolbar")
1667+
// },
1668+
// {
1669+
// MsWidget::MAIN_WINDOW,
1670+
// STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT | STATE_LYRICS_EDIT,
1671+
// "toggle-noteinput",
1672+
// QT_TRANSLATE_NOOP("action","Note Input"),
1673+
// QT_TRANSLATE_NOOP("action","Note input toolbar")
1674+
// },
16751675
{
16761676
MsWidget::MAIN_WINDOW,
16771677
STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT | STATE_LYRICS_EDIT,

0 commit comments

Comments
 (0)