add palette context menu to enable single palette mode

musescore · Mar 31, 2015 · ed6ce92 · ed6ce92
1 parent 772c691
commit ed6ce92
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/mscore/palettebox.cpp b/mscore/palettebox.cpp
@@ -27,10 +27,19 @@ namespace Ms {
 PaletteBox::PaletteBox(QWidget* parent)
    : QDockWidget(tr("Palettes"), parent)
       {
+      setContextMenuPolicy(Qt::ActionsContextMenu);
       setObjectName("palette-box");
       setAllowedAreas(Qt::DockWidgetAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea));
 
+      QAction* a = new QAction(this);
+      a->setText(tr("single Palette"));
+      a->setCheckable(true);
+      a->setChecked(preferences.singlePalette);
+      addAction(a);
+      connect(a, SIGNAL(toggled(bool)), SLOT(setSinglePalette(bool)));
+
       QWidget* w = new QWidget(this);
+      w->setContextMenuPolicy(Qt::NoContextMenu);
       QVBoxLayout* vl = new QVBoxLayout(w);
       QHBoxLayout* hl = new QHBoxLayout;
       hl->setContentsMargins(5,5,5,0);
@@ -40,7 +49,7 @@ PaletteBox::PaletteBox(QWidget* parent)
       updateWorkspaces();
       hl->addWidget(workspaceList);
       QToolButton* nb = new QToolButton;
-      
+
       nb->setMinimumHeight(27);
       nb->setText(tr("+"));
       nb->setToolTip(tr("Add new workspace"));
@@ -58,7 +67,6 @@ PaletteBox::PaletteBox(QWidget* parent)
       sa->setFrameShape(QFrame::NoFrame);
       vl->addWidget(sa);
       vl->addLayout(hl);
-      // setWidget(sa);
 
       QWidget* paletteList = new QWidget;
       sa->setWidget(paletteList);
@@ -348,5 +356,14 @@ QSize PaletteBoxScrollArea::sizeHint() const
       return QSize(170 * guiScaling, 170 * guiScaling);
       }
 
+//---------------------------------------------------------
+//   setSinglePalette
+//---------------------------------------------------------
+
+void PaletteBox::setSinglePalette(bool val)
+      {
+      preferences.singlePalette = val;
+      preferences.dirty = true;
+      }
 }
 
diff --git a/mscore/palettebox.h b/mscore/palettebox.h
@@ -40,6 +40,7 @@ class PaletteBox : public QDockWidget {
       void displayMore(const QString& paletteName);
       void workspaceSelected(int idx);
       void newWorkspaceClicked();
+      void setSinglePalette(bool);
 
    signals:
       void changed();
@@ -54,6 +55,10 @@ class PaletteBox : public QDockWidget {
       void updateWorkspaces();
       };
 
+//---------------------------------------------------------
+//   PaletteBoxScrollArea
+//---------------------------------------------------------
+
 class PaletteBoxScrollArea : public QScrollArea {
        Q_OBJECT