From e3b3aa2a74cf6079bf5a00b93cda13563df3ff08 Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Mon, 16 Sep 2024 14:18:59 +0200 Subject: [PATCH] Disable Feedback and Check for updates as neither works or is provided by this fork --- mscore/musescore.cpp | 14 +++++++++++++- mscore/musescore.h | 2 ++ mscore/musescoredialogs.cpp | 2 +- mscore/preferences.cpp | 2 +- mscore/prefsdialog.cpp | 2 +- mscore/shortcut.cpp | 2 ++ 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp index e8d9b42bba6e1..9ccff72637a76 100644 --- a/mscore/musescore.cpp +++ b/mscore/musescore.cpp @@ -1310,6 +1310,7 @@ MuseScore::MuseScore() fotoTools->setObjectName("foto-tools"); fotoTools->addWidget(new AccessibleToolButton(fotoTools, getAction("fotomode"))); +#if 0 //------------------------------- // Feedback Tool Bar //------------------------------- @@ -1329,6 +1330,7 @@ MuseScore::MuseScore() feedbackButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); feedbackTools->addWidget(feedbackButton); } +#endif addToolBarBreak(); @@ -1556,11 +1558,13 @@ MuseScore::MuseScore() connect(entryTools, SIGNAL(visibilityChanged(bool)), a, SLOT(setChecked(bool))); menuToolbars->addAction(a); +#if 0 a = getAction("toggle-feedback"); a->setCheckable(true); a->setChecked(feedbackTools->isVisible()); connect(feedbackTools, SIGNAL(visibilityChanged(bool)), a, SLOT(setChecked(bool))); menuToolbars->addAction(a); +#endif a = getAction("toggle-workspaces-toolbar"); a->setCheckable(true); @@ -1900,7 +1904,7 @@ MuseScore::MuseScore() Workspace::addActionAndString(aboutMusicXMLAction, "about-musicxml"); #if defined(Q_OS_MAC) || defined(Q_OS_WIN) -#if (!defined(FOR_WINSTORE)) && (!defined(WIN_PORTABLE)) +#if (!defined(FOR_WINSTORE)) && (!defined(WIN_PORTABLE) && 0) checkForUpdateAction = new QAction("", 0); connect(checkForUpdateAction, SIGNAL(triggered()), this, SLOT(checkForUpdatesUI())); checkForUpdateAction->setMenuRole(QAction::NoRole); @@ -1922,11 +1926,13 @@ MuseScore::MuseScore() menuHelp->addAction(reportBugAction); Workspace::addActionAndString(reportBugAction, "report-bug"); +#if 0 leaveFeedbackAction = new QAction("", 0); connect(leaveFeedbackAction, &QAction::triggered, this, [this]{ leaveFeedback("menu"); }); leaveFeedbackAction->setMenuRole(QAction::NoRole); menuHelp->addAction(leaveFeedbackAction); Workspace::addActionAndString(leaveFeedbackAction, "leave-feedback"); +#endif menuHelp->addSeparator(); menuHelp->addAction(getAction("resource-manager")); @@ -2122,7 +2128,9 @@ void MuseScore::retranslate() checkForUpdateAction->setText(tr("Check for &Update")); askForHelpAction->setText(tr("Ask for Help")); reportBugAction->setText(tr("Report a Bug")); +#if 0 leaveFeedbackAction->setText(tr("Feedback")); +#endif revertToFactoryAction->setText(tr("Revert to Factory Settings")); fileTools->setWindowTitle(tr("File Operations")); @@ -2130,7 +2138,9 @@ void MuseScore::retranslate() cpitchTools->setWindowTitle(tr("Concert Pitch")); fotoTools->setWindowTitle(tr("Image Capture")); entryTools->setWindowTitle(tr("Note Input")); +#if 0 feedbackTools->setWindowTitle(tr("Feedback")); +#endif workspacesTools->setWindowTitle(tr("Workspaces")); // keep translatable (con)texts in sync with those from zoombox.cpp @@ -6379,8 +6389,10 @@ void MuseScore::cmd(QAction* a, const QString& cmd) fotoTools->setVisible(!fotoTools->isVisible()); else if (cmd == "toggle-noteinput") entryTools->setVisible(!entryTools->isVisible()); +#if 0 else if (cmd == "toggle-feedback") feedbackTools->setVisible(!feedbackTools->isVisible()); +#endif else if (cmd == "toggle-workspaces-toolbar") workspacesTools->setVisible(!workspacesTools->isVisible()); else if (cmd == "create-new-workspace") { diff --git a/mscore/musescore.h b/mscore/musescore.h index d67db976f7f3c..777c14cd3740e 100644 --- a/mscore/musescore.h +++ b/mscore/musescore.h @@ -254,7 +254,9 @@ class MuseScore : public QMainWindow, public MuseScoreCore { QToolBar* fileTools; QToolBar* transportTools; QToolBar* entryTools; +#if 0 QToolBar* feedbackTools; +#endif QToolBar* workspacesTools; TextTools* _textTools { 0 }; PianoTools* _pianoTools { 0 }; diff --git a/mscore/musescoredialogs.cpp b/mscore/musescoredialogs.cpp index 0f27b6c534db4..c846ad35827c5 100644 --- a/mscore/musescoredialogs.cpp +++ b/mscore/musescoredialogs.cpp @@ -159,7 +159,7 @@ AboutBoxDialog::AboutBoxDialog() setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); QString visitAndDonateString; -#if !defined(FOR_WINSTORE) +#if !defined(FOR_WINSTORE) && 0 visitAndDonateString = tr("Visit %1 for new versions and more information.\nGet %2help%3 with the program or %4contribute%5 to its development.") .arg("www.musescore.org", "", "", diff --git a/mscore/preferences.cpp b/mscore/preferences.cpp index 1faf4d5b5c5e1..2087d4d04b2ca 100644 --- a/mscore/preferences.cpp +++ b/mscore/preferences.cpp @@ -82,7 +82,7 @@ void Preferences::init(bool storeInMemoryOnly) _storeInMemoryOnly = storeInMemoryOnly; -#if defined(Q_OS_MAC) || (defined(Q_OS_WIN) && !defined(FOR_WINSTORE)) +#if defined(Q_OS_MAC) || (defined(Q_OS_WIN) && !defined(FOR_WINSTORE) && 0) bool checkUpdateStartup = true; bool checkExtensionsUpdateStartup = true; #else diff --git a/mscore/prefsdialog.cpp b/mscore/prefsdialog.cpp index 6ec6478ce9245..9dd7ef8a5ed9b 100644 --- a/mscore/prefsdialog.cpp +++ b/mscore/prefsdialog.cpp @@ -265,7 +265,7 @@ PreferenceDialog::PreferenceDialog(QWidget* parent) connect(resetPreference, &QPushButton::clicked, this, &PreferenceDialog::resetAdvancedPreferenceToDefault); connect(this, &PreferenceDialog::preferencesChanged, mscore->timeline(), &Timeline::updateTimelineTheme); // this should probably be moved to updateUiStyleAndTheme MuseScore::restoreGeometry(this); -#if !defined(Q_OS_MAC) && (!defined(Q_OS_WIN) || defined(FOR_WINSTORE)) +#if !defined(Q_OS_MAC) && (!defined(Q_OS_WIN) || defined(FOR_WINSTORE)) || !0 General->removeTab(General->indexOf(tabUpdate)); // updateTab not needed on Linux and not wanted in Windows Store #endif } diff --git a/mscore/shortcut.cpp b/mscore/shortcut.cpp index 466781aa1c2f1..fa6efb398ae64 100644 --- a/mscore/shortcut.cpp +++ b/mscore/shortcut.cpp @@ -2168,6 +2168,7 @@ Shortcut Shortcut::_sc[] = { QT_TRANSLATE_NOOP("action","Note Input"), QT_TRANSLATE_NOOP("action","Toggle 'Note Input' toolbar") }, +#if 0 { MsWidget::MAIN_WINDOW, STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT , @@ -2175,6 +2176,7 @@ Shortcut Shortcut::_sc[] = { QT_TRANSLATE_NOOP("action","Feedback"), QT_TRANSLATE_NOOP("action","Toggle 'Feedback' toolbar"), }, +#endif { MsWidget::MAIN_WINDOW, STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT ,