small changes to synth control

kirkhansen · Feb 21, 2013 · 03eb808 · 03eb808
1 parent a640fcf
commit 03eb808
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/awl/aslider.cpp b/awl/aslider.cpp
@@ -28,7 +28,7 @@ namespace Awl {
 //---------------------------------------------------------
 
 AbstractSlider::AbstractSlider(QWidget* parent)
-   : QWidget(parent), _scaleColor(Qt::black), _scaleValueColor(Qt::blue)
+   : QWidget(parent), _scaleColor(Qt::darkGray), _scaleValueColor(Qt::blue)
       {
       _id         = 0;
       _value      = 0.5;

diff --git a/awl/mslider.cpp b/awl/mslider.cpp
@@ -179,7 +179,7 @@ void MeterSlider::paintEvent(QPaintEvent* ev)
       //---------------------------------------------------
 
       int mw = _meterWidth / _channel;
-      int x  = 20;
+      int x  = 18;
       int y1 = kh / 2;
       int y3 = h - y1;
 
@@ -207,6 +207,7 @@ void MeterSlider::paintEvent(QPaintEvent* ev)
 
             x += mw;
             }
+      x += 4;
 
       // optimize common case:
       if (ev->rect() == QRect(20, kh/2, _meterWidth-1, mh))

diff --git a/fluid/chorus.cpp b/fluid/chorus.cpp
@@ -131,7 +131,6 @@ Chorus::Chorus(float sr)
 void Chorus::reset()
       {
       memset(chorusbuf, 0, MAX_SAMPLES * sizeof(*chorusbuf));
-      number_blocks = 0;
       number_blocks = FLUID_CHORUS_DEFAULT_N;
       level         = FLUID_CHORUS_DEFAULT_LEVEL;
       speed_Hz      = FLUID_CHORUS_DEFAULT_SPEED;

diff --git a/mscore/synthcontrol.ui b/mscore/synthcontrol.ui
@@ -27,7 +27,7 @@
        <item row="0" column="0">
         <widget class="QTabWidget" name="tabWidget">
          <property name="currentIndex">
-          <number>0</number>
+          <number>2</number>
          </property>
          <widget class="QWidget" name="tab">
           <attribute name="title">
@@ -324,6 +324,9 @@
            </item>
            <item row="2" column="1">
             <widget class="QDoubleSpinBox" name="chorusSpeedBox">
+             <property name="suffix">
+              <string extracomment="short for hertz (frequency)">hz</string>
+             </property>
              <property name="maximum">
               <double>5.000000000000000</double>
              </property>
@@ -354,6 +357,9 @@
            </item>
            <item row="3" column="1">
             <widget class="QDoubleSpinBox" name="chorusDepthBox">
+             <property name="suffix">
+              <string extracomment="short for millisecond">ms</string>
+             </property>
              <property name="maximum">
               <double>10.000000000000000</double>
              </property>