Built Awl::posedit and Awl::sigedit, and replaced /widget versions and all usages.

Reverted class SpinBox to previous revision.

16 files changed, 88 insertions, 111 deletions

diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt
index ca1df66a..9394627c 100644
--- a/muse2/muse/widgets/CMakeLists.txt
+++ b/muse2/muse/widgets/CMakeLists.txt
@@ -114,12 +114,12 @@ QT4_WRAP_CPP (widget_mocs
       gatetime.h  
       velocity.h  
       metronome.h  
-      posedit.h  
+      # posedit.h  
       pitchedit.h  
       pitchlabel.h  
       poslabel.h  
       filedialog.h  
-      sigedit.h  
+      # sigedit.h  
       shortcutconfig.h  
       shortcutcapturedialog.h  
       combobox.h  
@@ -217,12 +217,13 @@ add_library ( widgets STATIC
       gatetime.cpp 
       velocity.cpp 
       metronome.cpp 
-      posedit.cpp section.h 
+      # posedit.cpp 
+      section.h 
       pitchedit.cpp 
       pitchlabel.cpp 
       poslabel.cpp 
       filedialog.cpp 
-      sigedit.cpp 
+      # sigedit.cpp 
       shortcutconfig.cpp 
       shortcutcapturedialog.cpp 
       combobox.cpp  
diff --git a/muse2/muse/widgets/bigtime.cpp b/muse2/muse/widgets/bigtime.cpp
index 0c88f045..73c113d2 100644
--- a/muse2/muse/widgets/bigtime.cpp
+++ b/muse2/muse/widgets/bigtime.cpp
@@ -207,7 +207,7 @@ bool BigTime::setString(unsigned v)
       unsigned absFrame = tempomap.tick2frame(v);
       int bar, beat;
       unsigned tick;
-      sigmap.tickValues(v, &bar, &beat, &tick);
+      AL::sigmap.tickValues(v, &bar, &beat, &tick);
       double time = double(absFrame)/double(sampleRate);
       //int hour    = int(time) / 3600;
       //int min     = (int(time) / 60) % 60;
diff --git a/muse2/muse/widgets/cliplisteditorbase.ui b/muse2/muse/widgets/cliplisteditorbase.ui
index 5c4806c2..cb0532b0 100644
--- a/muse2/muse/widgets/cliplisteditorbase.ui
+++ b/muse2/muse/widgets/cliplisteditorbase.ui
@@ -111,7 +111,7 @@
               </widget>
             </item>
             <item>
-              <widget class="PosEdit" name="start">
+              <widget class="Awl::PosEdit" name="start">
                 <property name="smpte">
                   <bool>true</bool>
                 </property>
@@ -128,7 +128,7 @@
               </widget>
             </item>
             <item>
-              <widget class="PosEdit" name="len">
+              <widget class="Awl::PosEdit" name="len">
                 <property name="smpte">
                   <bool>true</bool>
                 </property>
@@ -156,8 +156,13 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11"/>
+  <customwidgets>
+    <customwidget>
+      <class>Awl::PosEdit</class>
+      <extends>QWidget</extends>
+      <header>awl/posedit.h</header>
+      <container>0</container>
+    </customwidget>
+  </customwidgets>
   <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
-  <includes>
-    <include location="local">posedit.h</include>
-  </includes>
 </ui>
diff --git a/muse2/muse/widgets/editnotedialogbase.ui b/muse2/muse/widgets/editnotedialogbase.ui
index 79c449fe..491a10db 100644
--- a/muse2/muse/widgets/editnotedialogbase.ui
+++ b/muse2/muse/widgets/editnotedialogbase.ui
@@ -129,7 +129,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="PosEdit" name="epos" native="true"/>
+    <widget class="Awl::PosEdit" name="epos"/>
    </item>
    <item row="1" column="1">
     <widget class="QSpinBox" name="il1">
@@ -164,9 +164,10 @@
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>PosEdit</class>
+   <class>Awl::PosEdit</class>
    <extends>QWidget</extends>
-   <header>posedit.h</header>
+   <header>awl/posedit.h</header>
+   <container>0</container>
   </customwidget>
   <customwidget>
    <class>PitchEdit</class>
@@ -183,7 +184,6 @@
   <tabstop>buttonCancel</tabstop>
  </tabstops>
  <includes>
-  <include location="local">posedit.h</include>
   <include location="local">pitchedit.h</include>
  </includes>
  <resources/>
diff --git a/muse2/muse/widgets/editsysexdialogbase.ui b/muse2/muse/widgets/editsysexdialogbase.ui
index 6e9aef27..adf5b186 100644
--- a/muse2/muse/widgets/editsysexdialogbase.ui
+++ b/muse2/muse/widgets/editsysexdialogbase.ui
@@ -42,7 +42,7 @@
       </widget>
      </item>
      <item>
-      <widget class="PosEdit" name="epos" native="true"/>
+      <widget class="Awl::PosEdit" name="epos"/>
      </item>
      <item>
       <spacer name="Spacer2">
@@ -152,14 +152,12 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>PosEdit</class>
+   <class>Awl::PosEdit</class>
    <extends>QWidget</extends>
-   <header>posedit.h</header>
+   <header>awl/posedit.h</header>
+   <container>0</container>
   </customwidget>
  </customwidgets>
- <includes>
-  <include location="local">posedit.h</include>
- </includes>
  <resources/>
  <connections>
   <connection>
diff --git a/muse2/muse/widgets/hitscale.cpp b/muse2/muse/widgets/hitscale.cpp
index 2d7c5267..aa3838fe 100644
--- a/muse2/muse/widgets/hitscale.cpp
+++ b/muse2/muse/widgets/hitscale.cpp
@@ -70,7 +70,7 @@ void HitScale::viewMouseReleaseEvent(QMouseEvent*)
 
 void HitScale::viewMouseMoveEvent(QMouseEvent* event)
       {
-      int x = sigmap.raster(event->x(), *raster);
+      int x = AL::sigmap.raster(event->x(), *raster);
       emit timeChanged(x);
       int i;
       switch (button) {
diff --git a/muse2/muse/widgets/mtscale.cpp b/muse2/muse/widgets/mtscale.cpp
index 425c8bf1..0472384c 100644
--- a/muse2/muse/widgets/mtscale.cpp
+++ b/muse2/muse/widgets/mtscale.cpp
@@ -152,7 +152,7 @@ void MTScale::viewMouseMoveEvent(QMouseEvent* event)
       int x = event->x();
       if (waveMode)
             x = tempomap.frame2tick(x);
-      x = sigmap.raster(x, *raster);
+      x = AL::sigmap.raster(x, *raster);
       if (x < 0)
             x = 0;
       //printf("MTScale::viewMouseMoveEvent\n");  
@@ -344,22 +344,22 @@ void MTScale::pdraw(QPainter& p, const QRect& r)
 
       if (waveMode) {
             ctick = tempomap.frame2tick(mapxDev(x));
-            sigmap.tickValues(ctick, &bar1, &beat, &tick);
-            sigmap.tickValues(tempomap.frame2tick(mapxDev(x+w)),
+            AL::sigmap.tickValues(ctick, &bar1, &beat, &tick);
+            AL::sigmap.tickValues(tempomap.frame2tick(mapxDev(x+w)),
                &bar2, &beat, &tick);
             }
       else {
             ctick = mapxDev(x);
-            sigmap.tickValues(ctick, &bar1, &beat, &tick);
-            sigmap.tickValues(mapxDev(x+w), &bar2, &beat, &tick);
+            AL::sigmap.tickValues(ctick, &bar1, &beat, &tick);
+            AL::sigmap.tickValues(mapxDev(x+w), &bar2, &beat, &tick);
             }
 
 //printf("bar %d  %d-%d=%d\n", bar, ntick, stick, ntick-stick);
 
-      int stick = sigmap.bar2tick(bar1, 0, 0);
+      int stick = AL::sigmap.bar2tick(bar1, 0, 0);
       int ntick;
       for (int bar = bar1; bar <= bar2; bar++, stick = ntick) {
-            ntick     = sigmap.bar2tick(bar+1, 0, 0);
+            ntick     = AL::sigmap.bar2tick(bar+1, 0, 0);
             int tpix, a, b=0;
             if (waveMode) {
                   a = tempomap.tick2frame(ntick);
@@ -395,9 +395,9 @@ void MTScale::pdraw(QPainter& p, const QRect& r)
                   }
             else {
                   int z, n;
-                  sigmap.timesig(stick, z, n);
+                  AL::sigmap.timesig(stick, z, n);
                   for (int beat = 0; beat < z; beat++) {
-                        int xx = sigmap.bar2tick(bar, beat, 0);
+                        int xx = AL::sigmap.bar2tick(bar, beat, 0);
                         if (waveMode)
                               xx = tempomap.tick2frame(xx);
                         int xp = mapx(xx);
diff --git a/muse2/muse/widgets/noteinfo.cpp b/muse2/muse/widgets/noteinfo.cpp
index 91e63df9..2bc17783 100644
--- a/muse2/muse/widgets/noteinfo.cpp
+++ b/muse2/muse/widgets/noteinfo.cpp
@@ -10,9 +10,13 @@
 #include "noteinfo.h"
 #include <QLayout>
 #include <QLabel>
+
+#include "awl/posedit.h"
+//#include "awl/pitchedit.h"
+
 #include "song.h"
 #include "globals.h"
-#include "posedit.h"
+///#include "posedit.h"
 #include "pitchedit.h"
 
 //---------------------------------------------------
@@ -32,8 +36,12 @@ NoteInfo::NoteInfo(QWidget* parent)
       label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
       label->setIndent(3);
       addWidget(label);
+      
       //selTime = new PosEdit(this, "Start");
-      selTime = new PosEdit(0, "Start");
+      ///selTime = new PosEdit(0, "Start");
+      selTime = new Awl::PosEdit;
+      selTime->setObjectName("Start");
+      
       addWidget(selTime);
 
       //label = new QLabel(tr("Len"), this, "Len");
diff --git a/muse2/muse/widgets/noteinfo.h b/muse2/muse/widgets/noteinfo.h
index 9607dfc1..ae32bf8d 100644
--- a/muse2/muse/widgets/noteinfo.h
+++ b/muse2/muse/widgets/noteinfo.h
@@ -10,7 +10,12 @@
 //#include <q3toolbar.h>
 #include <QToolBar>
 
-class PosEdit;
+namespace Awl {
+      class PosEdit;
+      //class PitchEdit;
+      };
+
+///class PosEdit;
 class QSpinBox;
 class PitchEdit;
 //class QMainWindow;
@@ -22,7 +27,8 @@ class Pos;
 //---------------------------------------------------------
 
 class NoteInfo : public QToolBar {
-      PosEdit* selTime;
+      ///PosEdit* selTime;
+      Awl::PosEdit* selTime;
       QSpinBox* selLen;
       PitchEdit* selPitch;
       QSpinBox* selVelOn;
diff --git a/muse2/muse/widgets/poslabel.cpp b/muse2/muse/widgets/poslabel.cpp
index feb1486b..4ab7724c 100644
--- a/muse2/muse/widgets/poslabel.cpp
+++ b/muse2/muse/widgets/poslabel.cpp
@@ -13,7 +13,8 @@
 #include <QLabel>
 
 #include "poslabel.h"
-#include "sig.h"
+///#include "sig.h"
+#include "al/sig.h"
 #include "tempo.h"
 #include "globals.h"
 
@@ -89,7 +90,7 @@ void PosLabel::updateValue()
       else {
             int bar, beat;
             unsigned tick;
-            sigmap.tickValues(_tickValue, &bar, &beat, &tick);
+            AL::sigmap.tickValues(_tickValue, &bar, &beat, &tick);
             //s.sprintf("%04d.%02d.%03ud", bar+1, beat+1, tick);
             s.sprintf("%04d.%02d.%03u", bar+1, beat+1, tick);
             }
diff --git a/muse2/muse/widgets/sigedit.cpp b/muse2/muse/widgets/sigedit.cpp
index 9af1d7eb..79cf7885 100644
--- a/muse2/muse/widgets/sigedit.cpp
+++ b/muse2/muse/widgets/sigedit.cpp
@@ -20,7 +20,8 @@
 #include <QStyle>
 #include <QTimerEvent>
 
-#include "sig.h"
+///#include "sig.h"
+#include "al/sig.h"
 #include "sigedit.h"
 #include "spinbox.h"
 
diff --git a/muse2/muse/widgets/siglabel.cpp b/muse2/muse/widgets/siglabel.cpp
index 54338ab6..47fcd2f8 100644
--- a/muse2/muse/widgets/siglabel.cpp
+++ b/muse2/muse/widgets/siglabel.cpp
@@ -16,7 +16,6 @@
 #define TIMER4    50
 
 #include "globals.h"
-//Added by qt3to4:
 #include <QMouseEvent>
 #include <QWheelEvent>
 #include <QLabel>
@@ -26,12 +25,20 @@
 //    edit Signature Values  (4/4)
 //---------------------------------------------------------
 
-SigLabel::SigLabel(int a, int b, QWidget* parent) : QLabel(parent)
+SigLabel::SigLabel(int z, int n, QWidget* parent) : QLabel(parent)
       {
       z = n = 0;
       setFocusPolicy(Qt::NoFocus);
       setAlignment(Qt::AlignCenter);
-      setValue(a, b);
+      setValue(z, n);
+      }
+
+SigLabel::SigLabel(const AL::TimeSignature& sig, QWidget* parent) : QLabel(parent)
+      {
+      z = n = 0;
+      setFocusPolicy(Qt::NoFocus);
+      setAlignment(Qt::AlignCenter);
+      setValue(sig.z, sig.n);
       }
 
 //---------------------------------------------------------
@@ -58,7 +65,7 @@ void SigLabel::mousePressEvent(QMouseEvent* event)
             }
       if ((zz != z) || (nn != n)) {
             setValue(zz, nn);
-            emit valueChanged(zz, nn);
+            emit valueChanged(AL::TimeSignature(zz, nn));
             }
       }
 
@@ -122,7 +129,7 @@ void SigLabel::wheelEvent(QWheelEvent* event)
       incValue(zaehler, inc, zz, nn);
       if ((zz != z) || (nn != n)) {
             setValue(zz, nn);
-            emit valueChanged(zz, nn);
+            emit valueChanged(AL::TimeSignature(zz, nn));
             }
       }
 
diff --git a/muse2/muse/widgets/siglabel.h b/muse2/muse/widgets/siglabel.h
index 4f93a7b8..2131d593 100644
--- a/muse2/muse/widgets/siglabel.h
+++ b/muse2/muse/widgets/siglabel.h
@@ -8,8 +8,9 @@
 #ifndef __SIGLABEL_H__
 #define __SIGLABEL_H__
 
-#include <qlabel.h>
-//Added by qt3to4:
+#include <al/sig.h>
+
+#include <QLabel>
 #include <QWheelEvent>
 #include <QMouseEvent>
 
@@ -26,16 +27,19 @@ class SigLabel : public QLabel {
 
    protected:
       int z, n;
-
+      
    signals:
-      void valueChanged(int, int);
+      void valueChanged(const AL::TimeSignature&);
 
    public slots:
       virtual void setValue(int, int);
+      virtual void setValue(const AL::TimeSignature& sig) { setValue(sig.z, sig.n); }
 
    public:
       SigLabel(int z, int n, QWidget*);
+      SigLabel(const AL::TimeSignature&, QWidget*);
       void value(int& a, int& b) const { a = z; b = n; }
+      AL::TimeSignature value() const { return AL::TimeSignature(z, n); }
       void setFrame(bool);
       };
 #endif
diff --git a/muse2/muse/widgets/sigscale.cpp b/muse2/muse/widgets/sigscale.cpp
index 2735d8d2..bbc6cf85 100644
--- a/muse2/muse/widgets/sigscale.cpp
+++ b/muse2/muse/widgets/sigscale.cpp
@@ -13,6 +13,8 @@
 #include <QEvent>
 #include <QMouseEvent>
 
+#include "al/sig.h"  // Tim.
+
 #include "globals.h"
 #include "midieditor.h"
 #include "sigscale.h"
@@ -76,7 +78,7 @@ void SigScale::viewMouseReleaseEvent(QMouseEvent*)
 
 void SigScale::viewMouseMoveEvent(QMouseEvent* event)
       {
-      int x = sigmap.raster(event->x(), *raster);
+      int x = AL::sigmap.raster(event->x(), *raster);
       emit timeChanged(x);
       int i;
       switch (button) {
@@ -118,8 +120,10 @@ void SigScale::pdraw(QPainter& p, const QRect& r)
       if (x < 0)
             x = 0;
       p.setFont(config.fonts[3]);
-      for (ciSigEvent si = sigmap.begin(); si != sigmap.end(); ++si) {
-            SigEvent* e = si->second;
+      ///for (ciSigEvent si = sigmap.begin(); si != sigmap.end(); ++si) {
+      for (AL::ciSigEvent si = AL::sigmap.begin(); si != AL::sigmap.end(); ++si) {
+            ///SigEvent* e = si->second;
+            AL::SigEvent* e = si->second;
             int xp = mapx(e->tick);
             if (xp > x+w)
                   break;
@@ -128,7 +132,7 @@ void SigScale::pdraw(QPainter& p, const QRect& r)
             p.drawLine(xp, 0, xp, h/2);
             p.drawLine(xp, h/2, xp+5, h/2);
             QString s;
-            s.sprintf("%d/%d", e->z, e->n);
+            s.sprintf("%d/%d", e->sig.z, e->sig.n);
             p.drawText(xp+8, h-6, s);
             }
 
diff --git a/muse2/muse/widgets/spinbox.cpp b/muse2/muse/widgets/spinbox.cpp
index aa536809..ee585da7 100644
--- a/muse2/muse/widgets/spinbox.cpp
+++ b/muse2/muse/widgets/spinbox.cpp
@@ -5,10 +5,8 @@
 //    (C) Copyright 2001 Werner Schweer (ws@seh.de)
 //=========================================================
 
-#include <QEvent>
 #include <QKeyEvent>
-#include <QMouseEvent>
-
+#include <QEvent>
 #include "spinbox.h"
 
 //---------------------------------------------------------
@@ -27,52 +25,8 @@ SpinBox::SpinBox(int minValue, int maxValue, int step, QWidget* parent)
   setRange(minValue, maxValue);
   setSingleStep(step);
   _clearFocus = true;
-  upEnabled = StepUpEnabled;
-  downEnabled = StepDownEnabled;
-}
-
-QAbstractSpinBox::StepEnabled SpinBox::stepEnabled() const
-{
-  return upEnabled | downEnabled;
 }
 
-void SpinBox::setStepEnabled(bool up, bool down)
-{
-  upEnabled = up ? StepUpEnabled : StepNone;
-  downEnabled = down ? StepDownEnabled : StepNone;
-}
-
-int SpinBox::arrowWidth() const
-{
-  QStyleOptionSpinBox styleOpt;
-  styleOpt.initFrom(this);
-  QRect upArrowRect = QApplication::style()->subControlRect(QStyle::CC_SpinBox, &styleOpt, QStyle::SC_SpinBoxUp, this);
-  return upArrowRect.width();
-}
-
-void SpinBox::setEditor(QLineEdit* ed)
-{
-  setLineEdit(ed);
-}
-
-void SpinBox::mousePressEvent ( QMouseEvent * event )
-{
-  // FIXME: I couldn't find a way to access the arrow buttons directly. Hence I am using a QRect::contains method.
-  // Unfortunately this is not 100% accurate with the Oxygen style; one needs to push to the right hand side of the 
-  // buttons. But it works perfect with the QtCurve style - Orcan
-  QStyleOptionSpinBox styleOpt;
-  styleOpt.initFrom(this);
-  QRect upArrowRect = QApplication::style()->subControlRect(QStyle::CC_SpinBox, &styleOpt, QStyle::SC_SpinBoxUp, this);
-  QRect downArrowRect = QApplication::style()->subControlRect(QStyle::CC_SpinBox, &styleOpt, QStyle::SC_SpinBoxDown, this);
- 
-  if (upArrowRect.contains(event->pos()))
-    emit(stepUpPressed());
-  else if (downArrowRect.contains(event->pos()))
-    emit(stepDownPressed());
-  QSpinBox::mousePressEvent(event);
-}
-
-
 bool SpinBox::eventFilter(QObject* o, QEvent* ev)
 {
     // if (o != (QObject*)editor()) ddskrjo can't find editor()
diff --git a/muse2/muse/widgets/spinbox.h b/muse2/muse/widgets/spinbox.h
index c40b97cf..43ff85be 100644
--- a/muse2/muse/widgets/spinbox.h
+++ b/muse2/muse/widgets/spinbox.h
@@ -13,10 +13,7 @@
 #define __SPINBOX_H__
 
 #include <QSpinBox>
-
-class QEvent;
-class QLineEdit;
-class QMouseEvent;
+#include <QEvent>
 
 //---------------------------------------------------------
 //   SpinBox
@@ -26,29 +23,20 @@ class SpinBox : public QSpinBox {
       Q_OBJECT
 
       bool _clearFocus; 
-      StepEnabled upEnabled;
-      StepEnabled downEnabled;
 
    protected:
       bool eventFilter(QObject* obj, QEvent* ev);
-      virtual void mousePressEvent ( QMouseEvent * event );
-      virtual StepEnabled stepEnabled() const;      
-
+      
    public slots:
       virtual void stepUp();
       virtual void stepDown();
    
    signals:
       void doubleClicked();
-      void stepDownPressed();
-      void stepUpPressed();
 
    public:
       SpinBox(QWidget* parent=0);
       SpinBox(int minValue, int maxValue, int step = 1, QWidget* parent=0);
-      void setStepEnabled(bool up, bool down);
-      int arrowWidth() const;
-      void setEditor(QLineEdit* ed);
 };
 
 #endif