See ChangeLog

21 files changed, 168 insertions, 25 deletions

diff --git a/muse/ChangeLog b/muse/ChangeLog
index d9a69b91..23c01f91 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,3 +1,8 @@
+18.01.2010
+      * Added: Piano roll and drum editor edit menus: "Select prev/next part". With default hotkeys Alt+Left/Right. (T356) 
+        - This is an easy way to switch parts when multiple part editing in one window (via Ctrl-E or Ctrl-D).
+          And it was absolutely essential, for multiple dedicated controller track editing since there are no notes,
+           and no (other) way to select another part to edit.
 17.01.2010
       * Feature: MusE now has two mixers, with selectable track type display. (T356)
         - Changes to .med file were needed. Tested OK so far with old and new song files.
@@ -5,6 +10,9 @@
         - Broken since removal of musewidgetsplugin library months ago.
           Added PluginWidgetFactory class to handle local creation of controls.
           (Custom user GUIs must be done by hand since the removal of musewidgetsplugin library).
+      * Fixed: Appearance settings red colour adjustment larger than others. (T356)
+      * Changed: Default controller graph foreground colour from blue to medium orange. (T356)
+        - Avoid clash with blue colour used by left and right markers.
 12.01.2010
       * Release: 1.0.1 (rj)
 10.01.2010
diff --git a/muse/muse/arranger/arranger.cpp b/muse/muse/arranger/arranger.cpp
index f4752498..b2fd53f0 100644
--- a/muse/muse/arranger/arranger.cpp
+++ b/muse/muse/arranger/arranger.cpp
@@ -67,14 +67,14 @@ QString TWhatsThis::text(const QPoint& pos)
       if (section == -1)
             return QString::null;
       switch(section) {
-            case COL_RECORD:   return QHeader::tr("Enable Recording"); break;
-            case COL_MUTE:     return QHeader::tr("Mute Indicator"); break;
-            case COL_SOLO:     return QHeader::tr("Solo Indicator"); break;
-            case COL_CLASS:    return QHeader::tr("Track Type"); break;
-            case COL_NAME:     return QHeader::tr("Track Name"); break;
-            case COL_OCHANNEL: return QHeader::tr("Output Channel Number"); break;
-            case COL_OPORT:    return QHeader::tr("Output Port"); break;
-            case COL_TIMELOCK: return QHeader::tr("Time Lock"); break;
+            case COL_RECORD:   return QHeader::tr("Enable recording. Click to toggle."); break;
+            case COL_MUTE:     return QHeader::tr("Mute indicator. Click to toggle."); break;
+            case COL_SOLO:     return QHeader::tr("Solo indicator. Click to toggle.\nConnected tracks are also 'phantom' soloed,\n indicated by a dark square."); break;
+            case COL_CLASS:    return QHeader::tr("Track type. Right-click to change\n midi and drum track types."); break;
+            case COL_NAME:     return QHeader::tr("Track name. Double-click to edit.\nRight-click for more options."); break;
+            case COL_OCHANNEL: return QHeader::tr("Midi/drum track: Output channel number.\nAudio track: Channels.\nMid/right-click to change."); break;
+            case COL_OPORT:    return QHeader::tr("Midi/drum track: Output port.\nSynth track: Assigned midi port.\nLeft-click to change.\nRight-click to show GUI."); break;
+            case COL_TIMELOCK: return QHeader::tr("Time lock"); break;
             default: break;
             }
       return QString::null;
diff --git a/muse/muse/arranger/tlist.cpp b/muse/muse/arranger/tlist.cpp
index 602b9b8f..1c432711 100644
--- a/muse/muse/arranger/tlist.cpp
+++ b/muse/muse/arranger/tlist.cpp
@@ -59,12 +59,12 @@ void THeaderTip::maybeTip(const QPoint &pos)
       switch (section) {
             case COL_RECORD:   p = QHeader::tr("Enable Recording"); break;
             case COL_MUTE:     p = QHeader::tr("Mute Indicator"); break;
-            case COL_SOLO:     p = QHeader::tr("Solo/Pre Fader Listening"); break;
+            case COL_SOLO:     p = QHeader::tr("Solo Indicator"); break;
             case COL_CLASS:    p = QHeader::tr("Track Type"); break;
             case COL_NAME:     p = QHeader::tr("Track Name"); break;
-            case COL_OCHANNEL: p = QHeader::tr("Output Channel Number"); break;
+            case COL_OCHANNEL: p = QHeader::tr("Midi output channel number or audio channels"); break;
             //case COL_OPORT:    p = QHeader::tr("Output Port"); break;
-            case COL_OPORT:    p = QHeader::tr("Output midi port, or synth midi port"); break;
+            case COL_OPORT:    p = QHeader::tr("Midi output port or synth midi port"); break;
             case COL_TIMELOCK: p = QHeader::tr("Time Lock"); break;
             default: return;
             }
diff --git a/muse/muse/gconfig.cpp b/muse/muse/gconfig.cpp
index 828ad3a3..db019ff6 100644
--- a/muse/muse/gconfig.cpp
+++ b/muse/muse/gconfig.cpp
@@ -64,7 +64,7 @@ GlobalConfigValues config = {
       QColor(0x80, 0xff, 0x80),     // selected track Bg;
       QColor(0x00, 0x00, 0x00),     // selected track Fg;
       QColor(220, 220, 220),     // midiTrackBg;
-      QColor(0x00, 0x00, 0xff),     // ctrlGraphFg;
+      QColor(255, 170, 0),       // ctrlGraphFg;    Medium orange
       QColor(220, 220, 220),     // drumTrackBg;
       QColor(220, 220, 220),     // waveTrackBg;
       QColor(189, 220, 193),     // outputTrackBg;
diff --git a/muse/muse/midiedit/dcanvas.cpp b/muse/muse/midiedit/dcanvas.cpp
index b4b63721..57c120d0 100644
--- a/muse/muse/midiedit/dcanvas.cpp
+++ b/muse/muse/midiedit/dcanvas.cpp
@@ -667,6 +667,42 @@ void DrumCanvas::cmd(int cmd)
                               selectItem(k->second, false);
                         }
                   break;
+            case CMD_SELECT_PREV_PART:     // select previous part
+                  {
+                    Part* pt = editor->curCanvasPart();
+                    Part* newpt = pt;
+                    PartList* pl = editor->parts();
+                    for(iPart ip = pl->begin(); ip != pl->end(); ++ip)
+                      if(ip->second == pt) 
+                      {
+                        if(ip == pl->begin())
+                          ip = pl->end();
+                        --ip;
+                        newpt = ip->second;
+                        break;    
+                      }
+                    if(newpt != pt)
+                      editor->setCurCanvasPart(newpt);
+                  }
+                  break;
+            case CMD_SELECT_NEXT_PART:     // select next part
+                  {
+                    Part* pt = editor->curCanvasPart();
+                    Part* newpt = pt;
+                    PartList* pl = editor->parts();
+                    for(iPart ip = pl->begin(); ip != pl->end(); ++ip)
+                      if(ip->second == pt) 
+                      {
+                        ++ip;
+                        if(ip == pl->end())
+                          ip = pl->begin();
+                        newpt = ip->second;
+                        break;    
+                      }
+                    if(newpt != pt)
+                      editor->setCurCanvasPart(newpt);
+                  }
+                  break;
             case CMD_DEL:
                   if (selectionSize()) {
                         song->startUndo();
diff --git a/muse/muse/midiedit/dcanvas.h b/muse/muse/midiedit/dcanvas.h
index ea71d218..b90c2aa8 100644
--- a/muse/muse/midiedit/dcanvas.h
+++ b/muse/muse/midiedit/dcanvas.h
@@ -75,8 +75,8 @@ class DrumCanvas : public EventCanvas {
       enum {
          CMD_CUT, CMD_COPY, CMD_PASTE, CMD_SAVE, CMD_LOAD, CMD_RESET,
          CMD_SELECT_ALL, CMD_SELECT_NONE, CMD_SELECT_INVERT,
-         CMD_SELECT_ILOOP, CMD_SELECT_OLOOP, CMD_DEL,
-         CMD_FIXED_LEN, CMD_RIGHT, CMD_LEFT, CMD_MODIFY_VELOCITY
+         CMD_SELECT_ILOOP, CMD_SELECT_OLOOP, CMD_SELECT_PREV_PART, CMD_SELECT_NEXT_PART, 
+         CMD_DEL, CMD_FIXED_LEN, CMD_RIGHT, CMD_LEFT, CMD_MODIFY_VELOCITY
          };
       DrumCanvas(MidiEditor*, QWidget*, int, int,
          const char* name = 0);
diff --git a/muse/muse/midiedit/drumedit.cpp b/muse/muse/midiedit/drumedit.cpp
index 22a30f49..2544495b 100644
--- a/muse/muse/midiedit/drumedit.cpp
+++ b/muse/muse/midiedit/drumedit.cpp
@@ -181,6 +181,12 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       menuSelect->insertSeparator();
       menuSelect->insertItem(tr("Inside Loop"),  DrumCanvas::CMD_SELECT_ILOOP);
       menuSelect->insertItem(tr("Outside Loop"), DrumCanvas::CMD_SELECT_OLOOP);
+      
+      menuSelect->insertSeparator();
+
+      menuSelect->insertItem(tr("Previous Part"), DrumCanvas::CMD_SELECT_PREV_PART);
+      menuSelect->insertItem(tr("Next Part"), DrumCanvas::CMD_SELECT_NEXT_PART);
+      
       menuEdit->insertItem(tr("&Select"), menuSelect);
 
       QPopupMenu* menuScriptPlugins = new QPopupMenu(this);
@@ -240,7 +246,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       QPushButton* ctrl = new QPushButton(tr("ctrl"), mainw, "Ctrl");
       ctrl->setFont(config.fonts[3]);
       hscroll           = new ScrollScale(-25, -2, xscale, 20000, Horizontal, mainw);
-      ctrl->setFixedSize(50, hscroll->sizeHint().height());
+      ctrl->setFixedSize(40, hscroll->sizeHint().height());
       QToolTip::add(ctrl, tr("Add Controller View"));
 
       QSizeGrip* corner = new QSizeGrip(mainw);
@@ -1106,6 +1112,9 @@ void DrumEdit::initShortcuts()
       menuSelect->setAccel(shortcuts[SHRT_SELECT_INVERT].key, DrumCanvas::CMD_SELECT_INVERT);
       menuSelect->setAccel(shortcuts[SHRT_SELECT_ILOOP].key,  DrumCanvas::CMD_SELECT_ILOOP);
       menuSelect->setAccel(shortcuts[SHRT_SELECT_OLOOP].key,  DrumCanvas::CMD_SELECT_OLOOP);
+      
+      menuSelect->setAccel(shortcuts[SHRT_SELECT_PREV_PART].key, DrumCanvas::CMD_SELECT_PREV_PART);
+      menuSelect->setAccel(shortcuts[SHRT_SELECT_NEXT_PART].key, DrumCanvas::CMD_SELECT_NEXT_PART);
       }
 
 //---------------------------------------------------------
diff --git a/muse/muse/midiedit/pianoroll.cpp b/muse/muse/midiedit/pianoroll.cpp
index 75882ff4..0a5a3aea 100644
--- a/muse/muse/midiedit/pianoroll.cpp
+++ b/muse/muse/midiedit/pianoroll.cpp
@@ -107,7 +107,12 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       menuSelect->insertItem(tr("Inside Loop"),  PianoCanvas::CMD_SELECT_ILOOP);
 
       menuSelect->insertItem(tr("Outside Loop"), PianoCanvas::CMD_SELECT_OLOOP);
+      
+      menuSelect->insertSeparator();
 
+      menuSelect->insertItem(tr("Previous Part"), PianoCanvas::CMD_SELECT_PREV_PART);
+      menuSelect->insertItem(tr("Next Part"), PianoCanvas::CMD_SELECT_NEXT_PART);
+      
       menuEdit->insertItem(tr("&Select"), menuSelect);
 
       eventColor = new QPopupMenu(this);
@@ -206,6 +211,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
 
       splitter = new Splitter(Vertical, mainw, "splitter");
       QPushButton* ctrl = new QPushButton(tr("ctrl"), mainw, "Ctrl");
+      ctrl->setFont(config.fonts[3]);
       QToolTip::add(ctrl, tr("Add Controller View"));
       hscroll = new ScrollScale(-25, -2, xscale, 20000, Horizontal, mainw);
       ctrl->setFixedSize(pianoWidth, hscroll->sizeHint().height());
@@ -1047,6 +1053,9 @@ void PianoRoll::initShortcuts()
       menuSelect->setAccel(shortcuts[SHRT_SELECT_INVERT].key, PianoCanvas::CMD_SELECT_INVERT);
       menuSelect->setAccel(shortcuts[SHRT_SELECT_ILOOP].key, PianoCanvas::CMD_SELECT_ILOOP);
       menuSelect->setAccel(shortcuts[SHRT_SELECT_OLOOP].key, PianoCanvas::CMD_SELECT_OLOOP);
+      
+      menuSelect->setAccel(shortcuts[SHRT_SELECT_PREV_PART].key, PianoCanvas::CMD_SELECT_PREV_PART);
+      menuSelect->setAccel(shortcuts[SHRT_SELECT_NEXT_PART].key, PianoCanvas::CMD_SELECT_NEXT_PART);
 
       menuConfig->setAccel(shortcuts[SHRT_EVENT_COLOR].key, menu_ids[CMD_EVENT_COLOR]);
 
diff --git a/muse/muse/midiedit/prcanvas.cpp b/muse/muse/midiedit/prcanvas.cpp
index 1ae4f267..b5a5d87c 100644
--- a/muse/muse/midiedit/prcanvas.cpp
+++ b/muse/muse/midiedit/prcanvas.cpp
@@ -963,6 +963,42 @@ void PianoCanvas::cmd(int cmd, int quantStrength,
                               selectItem(k->second, false);
                         }
                   break;
+            case CMD_SELECT_PREV_PART:     // select previous part
+                  {
+                    Part* pt = editor->curCanvasPart();
+                    Part* newpt = pt;
+                    PartList* pl = editor->parts();
+                    for(iPart ip = pl->begin(); ip != pl->end(); ++ip)
+                      if(ip->second == pt) 
+                      {
+                        if(ip == pl->begin())
+                          ip = pl->end();
+                        --ip;
+                        newpt = ip->second;
+                        break;    
+                      }
+                    if(newpt != pt)
+                      editor->setCurCanvasPart(newpt);
+                  }
+                  break;
+            case CMD_SELECT_NEXT_PART:     // select next part
+                  {
+                    Part* pt = editor->curCanvasPart();
+                    Part* newpt = pt;
+                    PartList* pl = editor->parts();
+                    for(iPart ip = pl->begin(); ip != pl->end(); ++ip)
+                      if(ip->second == pt) 
+                      {
+                        ++ip;
+                        if(ip == pl->end())
+                          ip = pl->begin();
+                        newpt = ip->second;
+                        break;    
+                      }
+                    if(newpt != pt)
+                      editor->setCurCanvasPart(newpt);
+                  }
+                  break;
             case CMD_MODIFY_GATE_TIME:
                   {
                   GateTime w(this);
diff --git a/muse/muse/midiedit/prcanvas.h b/muse/muse/midiedit/prcanvas.h
index 95f58458..9720ad88 100644
--- a/muse/muse/midiedit/prcanvas.h
+++ b/muse/muse/midiedit/prcanvas.h
@@ -87,7 +87,7 @@ class PianoCanvas : public EventCanvas {
          CMD_OVER_QUANTIZE, CMD_ON_QUANTIZE, CMD_ONOFF_QUANTIZE,
          CMD_ITERATIVE_QUANTIZE,
          CMD_SELECT_ALL, CMD_SELECT_NONE, CMD_SELECT_INVERT,
-         CMD_SELECT_ILOOP, CMD_SELECT_OLOOP,
+         CMD_SELECT_ILOOP, CMD_SELECT_OLOOP, CMD_SELECT_PREV_PART, CMD_SELECT_NEXT_PART, 
          CMD_MODIFY_GATE_TIME, CMD_MODIFY_VELOCITY,
          CMD_CRESCENDO, CMD_TRANSPOSE, CMD_THIN_OUT, CMD_ERASE_EVENT,
          CMD_NOTE_SHIFT, CMD_MOVE_CLOCK, CMD_COPY_MEASURE,
diff --git a/muse/muse/midieditor.cpp b/muse/muse/midieditor.cpp
index 70ee9183..08951b17 100644
--- a/muse/muse/midieditor.cpp
+++ b/muse/muse/midieditor.cpp
@@ -196,7 +196,7 @@ void MidiEditor::setCurDrumInstrument(int instr)
       }
 
 //---------------------------------------------------------
-//   curMidiPart
+//   curCanvasPart
 //---------------------------------------------------------
 
 Part* MidiEditor::curCanvasPart() 
@@ -219,3 +219,13 @@ WavePart* MidiEditor::curWavePart()
     return 0; 
 }
 
+//---------------------------------------------------------
+//   setCurCanvasPart
+//---------------------------------------------------------
+
+void MidiEditor::setCurCanvasPart(Part* part) 
+{ 
+  if(canvas) 
+    canvas->setCurrentPart(part); 
+}
+
diff --git a/muse/muse/midieditor.h b/muse/muse/midieditor.h
index 3b9aca10..1838f13f 100644
--- a/muse/muse/midieditor.h
+++ b/muse/muse/midieditor.h
@@ -77,6 +77,7 @@ class MidiEditor : public TopWin  {
       int curDrumInstrument() const  { return _curDrumInstrument; }
       Part* curCanvasPart();
       WavePart* curWavePart();
+      void setCurCanvasPart(Part*); 
       };
 
 #endif
diff --git a/muse/muse/mixer/astrip.cpp b/muse/muse/mixer/astrip.cpp
index f0d7ce77..6a31bc82 100644
--- a/muse/muse/mixer/astrip.cpp
+++ b/muse/muse/mixer/astrip.cpp
@@ -874,10 +874,12 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
       connect(solo, SIGNAL(toggled(bool)), SLOT(soloToggled(bool)));
       if (type == Track::AUDIO_OUTPUT) {
             QToolTip::add(record, tr("record downmix"));
-            QToolTip::add(solo, tr("solo mode (monitor)"));
+            //QToolTip::add(solo, tr("solo mode (monitor)"));
+            QToolTip::add(solo, tr("solo mode"));
             }
       else {
-            QToolTip::add(solo, tr("pre fader listening"));
+            //QToolTip::add(solo, tr("pre fader listening"));
+            QToolTip::add(solo, tr("solo mode"));
             }
 
       off  = new TransparentToolButton(this);
diff --git a/muse/muse/mixer/mstrip.cpp b/muse/muse/mixer/mstrip.cpp
index bf626f35..cd9cea86 100644
--- a/muse/muse/mixer/mstrip.cpp
+++ b/muse/muse/mixer/mstrip.cpp
@@ -311,7 +311,8 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
         useSoloIconSet2 = false;
       }  
       
-      QToolTip::add(solo, tr("pre fader listening"));
+      //QToolTip::add(solo, tr("pre fader listening"));
+      QToolTip::add(solo, tr("solo mode"));
       solo->setToggleButton(true);
       solo->setOn(t->solo());
       solo->setFixedWidth(STRIP_WIDTH/2);
diff --git a/muse/muse/shortcuts.cpp b/muse/muse/shortcuts.cpp
index 8b188cba..29dbbce8 100644
--- a/muse/muse/shortcuts.cpp
+++ b/muse/muse/shortcuts.cpp
@@ -139,6 +139,8 @@ void initShortCuts()
       defShrt(SHRT_SELECT_INVERT,    Qt::CTRL + Qt::Key_I, "Edit: Invert selection", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT,  "sel_inv");
       defShrt(SHRT_SELECT_ILOOP,     0, "Edit: Select events/parts inside locators", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT,  "sel_ins_loc");
       defShrt(SHRT_SELECT_OLOOP,     0, "Edit: Select events/parts outside locators", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_out_loc");
+      defShrt(SHRT_SELECT_PREV_PART, Qt::ALT + Qt::Key_Left, "Edit: Select previous part", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_prv_prt");
+      defShrt(SHRT_SELECT_NEXT_PART, Qt::ALT + Qt::Key_Right, "Edit: Select next part", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_nxt_prt");
       defShrt(SHRT_SEL_LEFT,         Qt::Key_Left,  "Edit: Select nearest part/event to the left", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_left");
       defShrt(SHRT_SEL_LEFT_ADD,     Qt::Key_Left + Qt::SHIFT,  "Edit: Add nearest part/event to the left to selection", PROLL_SHRT + DEDIT_SHRT, "sel_left_add");
       defShrt(SHRT_SEL_RIGHT,        Qt::Key_Right,  "Edit: Select nearest part/event to the left", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT,"sel_right");
diff --git a/muse/muse/shortcuts.h b/muse/muse/shortcuts.h
index daa76689..f4159031 100644
--- a/muse/muse/shortcuts.h
+++ b/muse/muse/shortcuts.h
@@ -169,6 +169,8 @@ enum {
       SHRT_SELECT_INVERT, //Ctrl+I
       SHRT_SELECT_ILOOP, //Default: Undefined
       SHRT_SELECT_OLOOP, //Default: Undefined
+      SHRT_SELECT_PREV_PART, // Ctrl+-
+      SHRT_SELECT_NEXT_PART, // Ctrl++
       SHRT_SEL_LEFT, //left
       SHRT_SEL_LEFT_ADD, //move left and add to selection
       SHRT_SEL_RIGHT, //Right
diff --git a/muse/muse/widgets/appearancebase.ui b/muse/muse/widgets/appearancebase.ui
index 452ec14c..a64ca38a 100644
--- a/muse/muse/widgets/appearancebase.ui
+++ b/muse/muse/widgets/appearancebase.ui
@@ -245,7 +245,8 @@
                 <attribute name="title">
                     <string>Colors</string>
                 </attribute>
-                <grid>
+                <vbox>
+                  <grid>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
@@ -893,6 +894,24 @@
                         </property>
                     </widget>
                 </grid>
+                <spacer>
+                  <property name="name">
+                    <cstring>botColorSpacer</cstring>
+                  </property>
+                  <property name="orientation">
+                    <enum>Vertical</enum>
+                  </property>
+                  <property name="sizeType">
+                    <enum>Expanding</enum>
+                  </property>
+                  <property name="sizeHint">
+                    <size>
+                      <width>20</width>
+                      <height>40</height>
+                    </size>
+                  </property>
+                </spacer>
+              </vbox>
             </widget>
             <widget class="QWidget">
                 <property name="name">
diff --git a/muse/muse/widgets/canvas.cpp b/muse/muse/widgets/canvas.cpp
index feea7f0d..14275746 100644
--- a/muse/muse/widgets/canvas.cpp
+++ b/muse/muse/widgets/canvas.cpp
@@ -1367,4 +1367,11 @@ void Canvas::canvasPopup(int n)
       emit toolChanged(n);
       }
 
-
+void Canvas::setCurrentPart(Part* part)
+{
+  curItem = NULL;
+  deselectAll();
+  curPart = part;
+  curPartId = curPart->sn();
+  curPartChanged();
+}
diff --git a/muse/muse/widgets/canvas.h b/muse/muse/widgets/canvas.h
index 9d649b78..66e612c8 100644
--- a/muse/muse/widgets/canvas.h
+++ b/muse/muse/widgets/canvas.h
@@ -173,6 +173,7 @@ class Canvas : public View {
       int selectionSize();
       Tool tool() const { return _tool; }
       Part* part() const { return curPart; }
+      void setCurrentPart(Part*); 
       void setCanvasTools(int n) { canvasTools = n; }
       };
 #endif
diff --git a/muse/muse/widgets/gensetbase.ui b/muse/muse/widgets/gensetbase.ui
index 845797d0..85873922 100644
--- a/muse/muse/widgets/gensetbase.ui
+++ b/muse/muse/widgets/gensetbase.ui
@@ -222,7 +222,7 @@
                                     </sizepolicy>
                                 </property>
                                 <property name="text">
-                                    <string>Mixer 1</string>
+                                    <string>Mixer A</string>
                                 </property>
                             </widget>
                             <widget class="QLabel" row="4" column="0">
@@ -238,7 +238,7 @@
                                 </sizepolicy>
                               </property>
                               <property name="text">
-                                <string>Mixer 2</string>
+                                <string>Mixer B</string>
                               </property>
                             </widget>
                             <widget class="QLabel" row="2" column="0">
diff --git a/muse/muse/widgets/musewidgetsplug.cpp b/muse/muse/widgets/musewidgetsplug.cpp
index b8ddad48..59d1e826 100644
--- a/muse/muse/widgets/musewidgetsplug.cpp
+++ b/muse/muse/widgets/musewidgetsplug.cpp
@@ -91,7 +91,7 @@ GlobalConfigValues config = {
       QColor(0x80, 0xff, 0x80),     // selected track Bg;
       QColor(0x00, 0x00, 0x00),     // selected track Fg;
       QColor(0xff, 0xff, 0xff),     // midiTrackBg;
-      QColor(0x00, 0x00, 0xff),     // ctrlGraphFg;
+      QColor(255, 170, 0),          // ctrlGraphFg; Medium orange
       QColor(0xff, 0xff, 0xff),     // drumTrackBg;
       QColor(0xff, 0xff, 0xff),     // waveTrackBg;
       QColor(0xff, 0xff, 0xff),     // outputTrackBg;