improved step recording and minor fixes

3 files changed, 34 insertions, 16 deletions

diff --git a/muse2/muse/mplugins/mrconfig.cpp b/muse2/muse/mplugins/mrconfig.cpp
index f64384af..1a55c826 100644
--- a/muse2/muse/mplugins/mrconfig.cpp
+++ b/muse2/muse/mplugins/mrconfig.cpp
@@ -26,12 +26,14 @@ MRConfig::MRConfig(QWidget* parent, Qt::WFlags fl)
       sb2->setValue(rcRecordNote);
       sb3->setValue(rcGotoLeftMarkNote);
       sb4->setValue(rcPlayNote);
+      steprec_box->setValue(rcSteprecNote);
 
       connect(b1,  SIGNAL(toggled(bool)), SLOT(setRcEnable(bool)));
       connect(sb1, SIGNAL(valueChanged(int)), SLOT(setRcStopNote(int)));
       connect(sb2, SIGNAL(valueChanged(int)), SLOT(setRcRecordNote(int)));
       connect(sb3, SIGNAL(valueChanged(int)), SLOT(setRcGotoLeftMarkNote(int)));
       connect(sb4, SIGNAL(valueChanged(int)), SLOT(setRcPlayNote(int)));
+      connect(steprec_box, SIGNAL(valueChanged(int)), SLOT(setRcSteprecNote(int)));
       }
 
 //---------------------------------------------------------
@@ -69,3 +71,8 @@ void MRConfig::setRcPlayNote(int val)
       rcPlayNote = val;
       }
 
+void MRConfig::setRcSteprecNote(int val)
+      {
+      rcSteprecNote = val;
+      }
+
diff --git a/muse2/muse/mplugins/mrconfig.h b/muse2/muse/mplugins/mrconfig.h
index e829c15c..5e4b38af 100644
--- a/muse2/muse/mplugins/mrconfig.h
+++ b/muse2/muse/mplugins/mrconfig.h
@@ -32,6 +32,7 @@ class MRConfig : public QWidget, public Ui::MRConfigBase {
       void setRcRecordNote(int);
       void setRcGotoLeftMarkNote(int);
       void setRcPlayNote(int);
+      void setRcSteprecNote(int);
 
    public:
       MRConfig(QWidget* parent=0, Qt::WFlags fl = 0);
diff --git a/muse2/muse/mplugins/mrconfigbase.ui b/muse2/muse/mplugins/mrconfigbase.ui
index ed04c334..18050c78 100644
--- a/muse2/muse/mplugins/mrconfigbase.ui
+++ b/muse2/muse/mplugins/mrconfigbase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>298</width>
-    <height>249</height>
+    <height>267</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -95,19 +95,29 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="PitchEdit" name="sb1" native="true"/>
+       <widget class="Awl::PitchEdit" name="sb1"/>
       </item>
       <item row="1" column="1">
-       <widget class="PitchEdit" name="sb2" native="true"/>
+       <widget class="Awl::PitchEdit" name="sb2"/>
       </item>
       <item row="2" column="1">
-       <widget class="PitchEdit" name="sb3" native="true"/>
+       <widget class="Awl::PitchEdit" name="sb3"/>
       </item>
       <item row="3" column="1">
-       <widget class="PitchEdit" name="sb4" native="true"/>
+       <widget class="Awl::PitchEdit" name="sb4"/>
       </item>
-      <item row="0" column="2">
-       <spacer name="Spacer1">
+      <item row="4" column="1">
+       <widget class="Awl::PitchEdit" name="steprec_box"/>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Insert rest (step rec) </string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <spacer name="Spacer4">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -122,8 +132,8 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="2">
-       <spacer name="Spacer2">
+      <item row="2" column="2">
+       <spacer name="Spacer3">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -138,8 +148,8 @@
         </property>
        </spacer>
       </item>
-      <item row="2" column="2">
-       <spacer name="Spacer3">
+      <item row="1" column="2">
+       <spacer name="Spacer2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -154,8 +164,8 @@
         </property>
        </spacer>
       </item>
-      <item row="3" column="2">
-       <spacer name="Spacer4">
+      <item row="0" column="2">
+       <spacer name="Spacer1">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -178,9 +188,9 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>PitchEdit</class>
-   <extends>QWidget</extends>
-   <header>pitchedit.h</header>
+   <class>Awl::PitchEdit</class>
+   <extends>QSpinBox</extends>
+   <header>awl/pitchedit.h</header>
   </customwidget>
  </customwidgets>
  <includes>