This is probably the most contentious patch in this series. Note that "the most contentious" doesn't necessarily mean that it _will be_ contentious; just that I expect other patches to be even less contentious.

Cheers,
- Graham
Index: src/gui/editors/notation/NotationWidget.cpp
===================================================================
--- src/gui/editors/notation/NotationWidget.cpp	(revision 12276)
+++ src/gui/editors/notation/NotationWidget.cpp	(working copy)
@@ -1636,7 +1636,14 @@
     return instrument->getDevice();
 }
 
+// used in pitchtracker
 void
+NotationWidget::addWidgetToBottom(QWidget *bottomWidget)
+{
+    m_layout->addWidget(bottomWidget, BOTTOM_ROW, MAIN_COL, 1, 1);
+}
+
+void
 NotationWidget::slotSegmentChangerMoved(int v)
 {
     // see comments in slotPrimaryThumbWheelMoved() for an explanation of that
Index: src/gui/editors/notation/NotationView.cpp
===================================================================
--- src/gui/editors/notation/NotationView.cpp	(revision 12276)
+++ src/gui/editors/notation/NotationView.cpp	(working copy)
@@ -712,8 +712,15 @@
     //"Transport" subMenu
     createAction("play", SIGNAL(play()));
     createAction("stop", SIGNAL(stop()));
-    createAction("cursor_back", SLOT(slotStepBackward()));
-    createAction("cursor_forward", SLOT(slotStepForward()));    
+    //Step Backward/Forward are protected signals
+    // so the pitch tracker (our derrived class) can see them
+    // Because they're protected, we'll connect them here.
+    createAction("cursor_back", SIGNAL(stepBackward()));
+    connect(this, SIGNAL(stepBackward()),
+            this, SLOT(slotStepBackward()));
+    createAction("cursor_forward", SIGNAL(stepForward()));
+    connect(this, SIGNAL(stepForward()),
+            this, SLOT(slotStepForward()));
     createAction("playback_pointer_back_bar", SIGNAL(rewindPlayback()));
     createAction("playback_pointer_forward_bar", SIGNAL(fastForwardPlayback()));
     createAction("playback_pointer_start", SIGNAL(rewindPlaybackToBeginning()));
@@ -4594,10 +4601,10 @@
                 connect((*i), SIGNAL(clicked()), this, SIGNAL(fastForwardPlayback()));
 
             } else if (act == cbkAction) {
-                connect((*i), SIGNAL(clicked()), this, SLOT(slotStepBackward()));
+                connect((*i), SIGNAL(clicked()), this, SIGNAL(stepBackward()));
 
             } else if (act == cfwAction) {
-                connect((*i), SIGNAL(clicked()), this, SLOT(slotStepForward()));
+                connect((*i), SIGNAL(clicked()), this, SIGNAL(stepForward()));
 
             } else  {
                 continue;
Index: src/gui/editors/notation/NotationView.h
===================================================================
--- src/gui/editors/notation/NotationView.h	(revision 12276)
+++ src/gui/editors/notation/NotationView.h	(working copy)
@@ -73,6 +73,8 @@
 signals:
     void play();
     void stop();
+    void stepBackward();
+    void stepForward();
     void rewindPlayback();
     void fastForwardPlayback();
     void rewindPlaybackToBeginning();
@@ -431,8 +433,11 @@
     void setCurrentNotePixmap(QPixmap);
     void setCurrentNotePixmapFrom(QAction *);
 
+// FIXME: likely to be debated. --gp     Used for subclassing in pitchtracker
+protected:
     RosegardenDocument *m_document;
     NotationWidget *m_notationWidget;
+private:
     CommandRegistry *m_commandRegistry;
     DurationMonobarModeType m_durationMode;  // Stores morph state.
     QAction *m_durationPressed;  //Store the last duration button pressed.
Index: src/gui/editors/notation/NotationWidget.h
===================================================================
--- src/gui/editors/notation/NotationWidget.h	(revision 12276)
+++ src/gui/editors/notation/NotationWidget.h	(working copy)
@@ -123,6 +123,11 @@
     double getHorizontalZoomFactor() const;
     double getVerticalZoomFactor() const;
 
+    // used in pitchtracker
+    void addWidgetToBottom(QWidget *bottomWidget);
+
+    void updateSegmentChangerBackground();
+
 signals:
     void segmentDeleted(Segment *);
     void sceneDeleted();
@@ -309,7 +314,8 @@
         BOTTOMRULER_ROW,
         CONTROLS_ROW,
         HSLIDER_ROW,
-        PANNER_ROW
+        PANNER_ROW,
+        BOTTOM_ROW
     };
 
     /**
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Rosegarden-devel mailing list
Rosegarden-devel@lists.sourceforge.net - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel

Reply via email to