Merge pull request #5922 from SKefalidis/prefs

fix #293203 + preference rework: improved responsiveness, ease of adding preferences, UI
musescore · Jun 10, 2020 · bbacdf0 · bbacdf0
1 parent 136467c
commit bbacdf0
Show file tree

Hide file tree

Showing 8 changed files with 1,491 additions and 558 deletions.
diff --git a/global/settings/types/preferencekeys.h b/global/settings/types/preferencekeys.h
@@ -24,6 +24,7 @@
 // Defines for all preferences
 // Every preference should have a define to ease the usage of the preference
 // Make sure the string key has a sensible grouping - use / for grouping
+// If the preference has to do with the UI/STYLE/THEME, add it under ui (so that the view is updated when apply is pressed)
 //
 #define PREF_APP_AUTOSAVE_AUTOSAVETIME                      "application/autosave/autosaveTime"
 #define PREF_APP_AUTOSAVE_USEAUTOSAVE                       "application/autosave/useAutosave"

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -448,7 +448,7 @@ void updateExternalValuesFromPreferences() {
 //   preferencesChanged
 //---------------------------------------------------------
 
-void MuseScore::preferencesChanged(bool fromWorkspace)
+void MuseScore::preferencesChanged(bool fromWorkspace, bool changeUI)
       {
       updateExternalValuesFromPreferences();
 
@@ -460,7 +460,8 @@ void MuseScore::preferencesChanged(bool fromWorkspace)
       getAction("show-tours")->setChecked(preferences.getBool(PREF_UI_APP_STARTUP_SHOWTOURS));
       _statusBar->setVisible(preferences.getBool(PREF_UI_APP_SHOWSTATUSBAR));
 
-      MuseScore::updateUiStyleAndTheme();
+      if (changeUI)
+            MuseScore::updateUiStyleAndTheme(); // this is a slow operation
       updateIcons();
 
       QString fgWallpaper = preferences.getString(PREF_UI_CANVAS_FG_WALLPAPER);

diff --git a/mscore/musescore.h b/mscore/musescore.h
@@ -494,7 +494,7 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
       void openRecentMenu();
       void selectScore(QAction*);
       void startPreferenceDialog();
-      void preferencesChanged(bool fromWorkspace = false);
+      void preferencesChanged(bool fromWorkspace = false, bool changeUI = true);
       void seqStarted();
       void seqStopped();
       void cmdAppendMeasures();