Merge pull request #4079 from Jojo-Schmitz/workspace-expansion-4

Expand workspace functionality, fix #272441

Author: anatoly-os

mscore/CMakeLists.txt

@@ -52,7 +52,7 @@ QT5_WRAP_UI (ui_headers
       note_groups.ui resourceManager.ui stafftypetemplates.ui
       startcenter.ui scorePreview.ui scoreBrowser.ui
       logindialog.ui uploadscoredialog.ui breaksdialog.ui
-      toolbarEditor.ui
+      toolbarEditor.ui workspacedialog.ui
 
       importmidi/importmidi_panel.ui
 
@@ -330,7 +330,7 @@ add_executable ( ${ExecutableName}
       fotomode.cpp drumtools.cpp
       selinstrument.cpp editstafftype.cpp texttools.cpp
       editpitch.cpp editstringdata.cpp editraster.cpp pianotools.cpp mediadialog.cpp
-      workspace.cpp chordview.cpp
+      workspace.cpp workspacedialog.cpp chordview.cpp
       albummanager.cpp
       stafftextproperties.cpp splitstaff.cpp
       tupletdialog.cpp

mscore/keyedit.cpp

@@ -275,7 +275,7 @@ KeyEditor::KeyEditor(QWidget* parent)
       l->setContentsMargins(0, 0, 0, 0);
       frame->setLayout(l);
 
-      sp = MuseScore::newKeySigPalette(PaletteType::MASTER);
+      sp = MuseScore::newKeySigPalette();
       sp->setReadOnly(false);
 
       _keyPalette = new PaletteScrollArea(sp);
@@ -290,7 +290,7 @@ KeyEditor::KeyEditor(QWidget* parent)
       l = new QVBoxLayout();
       l->setContentsMargins(0, 0, 0, 0);
       frame_3->setLayout(l);
-      sp1 = MuseScore::newAccidentalsPalette(PaletteType::MASTER);
+      sp1 = MuseScore::newAccidentalsPalette();
       PaletteScrollArea* accPalette = new PaletteScrollArea(sp1);
       QSizePolicy policy1(QSizePolicy::Expanding, QSizePolicy::Expanding);
       accPalette->setSizePolicy(policy1);

mscore/masterpalette.cpp

@@ -160,7 +160,7 @@ MasterPalette::MasterPalette(QWidget* parent)
 
       treeWidget->clear();
 
-      addPalette(MuseScore::newClefsPalette(PaletteType::MASTER));
+      addPalette(MuseScore::newClefsPalette());
       keyEditor = new KeyEditor;
 
       keyItem = new QTreeWidgetItem();
@@ -175,26 +175,26 @@ MasterPalette::MasterPalette(QWidget* parent)
       treeWidget->addTopLevelItem(timeItem);
 
       addPalette(MuseScore::newBracketsPalette());
-      addPalette(MuseScore::newAccidentalsPalette(PaletteType::MASTER));
-      addPalette(MuseScore::newArticulationsPalette(PaletteType::MASTER));
+      addPalette(MuseScore::newAccidentalsPalette());
+      addPalette(MuseScore::newArticulationsPalette());
       addPalette(MuseScore::newOrnamentsPalette());
       addPalette(MuseScore::newBreathPalette());
-      addPalette(MuseScore::newGraceNotePalette(PaletteType::MASTER));
+      addPalette(MuseScore::newGraceNotePalette());
       addPalette(MuseScore::newNoteHeadsPalette());
-      addPalette(MuseScore::newLinesPalette(PaletteType::MASTER));
-      addPalette(MuseScore::newBarLinePalette(PaletteType::MASTER));
+      addPalette(MuseScore::newLinesPalette());
+      addPalette(MuseScore::newBarLinePalette());
       addPalette(MuseScore::newArpeggioPalette());
       addPalette(MuseScore::newTremoloPalette());
       addPalette(MuseScore::newTextPalette());
-      addPalette(MuseScore::newTempoPalette(PaletteType::MASTER));
-      addPalette(MuseScore::newDynamicsPalette(PaletteType::MASTER));
+      addPalette(MuseScore::newTempoPalette());
+      addPalette(MuseScore::newDynamicsPalette());
       addPalette(MuseScore::newFingeringPalette());
       addPalette(MuseScore::newRepeatsPalette());
       addPalette(MuseScore::newFretboardDiagramPalette());
       addPalette(MuseScore::newBagpipeEmbellishmentPalette());
       addPalette(MuseScore::newBreaksPalette());
       addPalette(MuseScore::newFramePalette());
-      addPalette(MuseScore::newBeamPalette(PaletteType::MASTER));
+      addPalette(MuseScore::newBeamPalette());
 
       symbolItem = new QTreeWidgetItem();
       symbolItem->setData(0, Qt::UserRole, -1);