Merge branch 'master' into audiveris_import

musescore · Mar 12, 2020 · 11d3950 · 11d3950
2 parents 959fad1 + dafff7c
commit 11d3950
Showing 1 changed file with 6 additions and 18 deletions.
diff --git a/mscore/prefsdialog.cpp b/mscore/prefsdialog.cpp
@@ -437,24 +437,6 @@ void PreferenceDialog::updateValues(bool useDefaultValues)
       else // "Ask" or unset (or anything else)
             resetElementPositionsAlwaysAsk->setChecked(true);
 
-<<<<<<< HEAD
-=======
-#ifdef AVSOMR
-      useLocalAvsOmr->setChecked(preferences.getBool(PREF_IMPORT_AVSOMR_USELOCAL));
-      Avs::AvsOmrLocal::instance()->isInstalledAsync([this](bool isInstalled) {
-            QString text = QObject::tr("Use local OMR engine");
-            if (isInstalled)
-                  text += " (" + QObject::tr("Installed") + ")";
-            else
-                  text += " (" + QObject::tr("Not installed, need internet connection for installing") + ")";
-
-            useLocalAvsOmr->setText(text);
-            });
-#else
-      groupBox_omr->setVisible(false);
-#endif
-
->>>>>>> 6872158d8... audiveris import
       if (preferences.getBool(PREF_EXPORT_MUSICXML_EXPORTLAYOUT)) {
             exportAllLayouts->setChecked(true);
             }
@@ -995,24 +977,30 @@ void PreferenceDialog::apply()
       preferences.setPreference(PREF_IMPORT_MUSICXML_IMPORTBREAKS, importBreaks->isChecked());
       preferences.setPreference(PREF_IMPORT_MUSICXML_IMPORTLAYOUT, importLayout->isChecked());
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       preferences.setPreference(PREF_IMPORT_AVSOMR_USELOCAL, useLocalAvsOmr->isChecked());
 =======
 =======
 >>>>>>> 6872158d8... audiveris import
+=======
+>>>>>>> master
       if (resetElementPositionsAlwaysAsk->isChecked())
             preferences.setPreference(PREF_IMPORT_COMPATIBILITY_RESET_ELEMENT_POSITIONS, "Ask");
       else if (resetElementPositionsYes->isChecked())
             preferences.setPreference(PREF_IMPORT_COMPATIBILITY_RESET_ELEMENT_POSITIONS, "Yes");
       else if (resetElementPositionsNo->isChecked())
             preferences.setPreference(PREF_IMPORT_COMPATIBILITY_RESET_ELEMENT_POSITIONS, "No");
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8cb60db1c... fix #301600: Option to disable the pop-up "Reset the positions of all elements?"
 =======
 =======
       preferences.setPreference(PREF_IMPORT_AVSOMR_USELOCAL, useLocalAvsOmr->isChecked());
 >>>>>>> 9d19cd476... audiveris import
 >>>>>>> 6872158d8... audiveris import
+=======
+>>>>>>> master
       preferences.setPreference(PREF_IO_MIDI_ADVANCEONRELEASE, advanceOnRelease->isChecked());
       preferences.setPreference(PREF_IO_MIDI_ENABLEINPUT, enableMidiInput->isChecked());
       preferences.setPreference(PREF_IO_MIDI_EXPANDREPEATS, expandRepeats->isChecked());