From 1cf9300f72db9e4f6c6f4ce075f6465cb3fd0a19 Mon Sep 17 00:00:00 2001
From: Dave French <dave.french3@googlemail.com>
Date: Wed, 21 Jan 2015 11:55:30 +0000
Subject: [PATCH] 821 changed to use sockets/ slots

---
 include/TimeLineWidget.h       |  6 +++++-
 include/TrackContainerView.h   | 31 +++++++++++--------------------
 src/gui/TimeLineWidget.cpp     | 10 +++-------
 src/gui/TrackContainerView.cpp | 13 +++++++++++++
 src/gui/editors/SongEditor.cpp |  4 ++++
 5 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/include/TimeLineWidget.h b/include/TimeLineWidget.h
index 4c70bc0ea..37e1f6ee7 100644
--- a/include/TimeLineWidget.h
+++ b/include/TimeLineWidget.h
@@ -129,6 +129,11 @@ public:
 					m_ppt / MidiTime::ticksPerTact() );
 	}
 
+signals:
+
+	void regionSelectedFromPixels( int, int );
+	void selectionFinished();
+
 
 public slots:
 	void updatePosition( const MidiTime & );
@@ -172,7 +177,6 @@ private:
 
 
 	TextFloat * m_hint;
-	SongEditor *m_songEditor;
 	int m_initalXSelect;
 
 
diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h
index f4ee969d1..51b8ca0fa 100644
--- a/include/TrackContainerView.h
+++ b/include/TrackContainerView.h
@@ -92,26 +92,6 @@ public:
 		return( QVector<selectableObject *>() );
 	}
 
-	///
-	/// \brief selectRegionFromPixels
-	/// \param x
-	/// \param y
-	/// Use the rubber band to select TCO from all tracks using x, y pixels
-	void selectRegionFromPixels(int x, int y)
-	{
-		m_rubberBand->setEnabled( true );
-		m_rubberBand->show();
-		m_rubberBand->setGeometry( min( x, y ), 0, max( x, y ) - min( x, y ), std::numeric_limits<int>::max() );
-	}
-
-	///
-	/// \brief stopRubberBand
-	/// Removes the rubber band from display when finished with.
-	void stopRubberBand()
-	{
-		m_rubberBand->hide();
-		m_rubberBand->setEnabled( false );
-	}
 
 	TrackContainer* model()
 	{
@@ -146,6 +126,17 @@ public slots:
 
 	virtual void dropEvent( QDropEvent * _de );
 	virtual void dragEnterEvent( QDragEnterEvent * _dee );
+	///
+	/// \brief selectRegionFromPixels
+	/// \param x
+	/// \param y
+	/// Use the rubber band to select TCO from all tracks using x, y pixels
+	void selectRegionFromPixels(int x, int y);
+
+	///
+	/// \brief stopRubberBand
+	/// Removes the rubber band from display when finished with.
+	void stopRubberBand();
 
 protected:
 	static const int DEFAULT_PIXELS_PER_TACT = 16;
diff --git a/src/gui/TimeLineWidget.cpp b/src/gui/TimeLineWidget.cpp
index 94a7756b2..4ab508c9c 100644
--- a/src/gui/TimeLineWidget.cpp
+++ b/src/gui/TimeLineWidget.cpp
@@ -106,7 +106,6 @@ TimeLineWidget::TimeLineWidget( const int _xoff, const int _yoff, const float _p
 	connect( update_timer, SIGNAL( timeout() ),
 					this, SLOT( updatePosition() ) );
 	update_timer->start( 50 );
-	m_songEditor = dynamic_cast<SongEditor*>(_parent);
 }
 
 
@@ -294,7 +293,7 @@ void TimeLineWidget::mousePressEvent( QMouseEvent* event )
 			m_moveXOff = s_posMarkerPixmap->width() / 2;
 		}
 	}
-	else if( event->button() == Qt::LeftButton  && (event->modifiers() & Qt::ShiftModifier) && m_songEditor )
+	else if( event->button() == Qt::LeftButton  && (event->modifiers() & Qt::ShiftModifier) )
 	{
 		m_action = SelectSongTCO;
 		m_initalXSelect = event->x();
@@ -381,10 +380,7 @@ void TimeLineWidget::mouseMoveEvent( QMouseEvent* event )
 			break;
 		}
 	case SelectSongTCO:
-		if( m_songEditor )
-		{
-			m_songEditor->selectRegionFromPixels( m_initalXSelect , event->x() );
-		}
+			emit regionSelectedFromPixels( m_initalXSelect , event->x() );
 		break;
 
 		default:
@@ -399,7 +395,7 @@ void TimeLineWidget::mouseReleaseEvent( QMouseEvent* event )
 {
 	delete m_hint;
 	m_hint = NULL;
-	if(m_action == SelectSongTCO && m_songEditor ) { m_songEditor->stopRubberBand(); }
+	if ( m_action == SelectSongTCO ) { emit selectionFinished(); }
 	m_action = NoAction;
 }
 
diff --git a/src/gui/TrackContainerView.cpp b/src/gui/TrackContainerView.cpp
index a2d3ce12b..8872512c9 100644
--- a/src/gui/TrackContainerView.cpp
+++ b/src/gui/TrackContainerView.cpp
@@ -313,6 +313,19 @@ void TrackContainerView::dragEnterEvent( QDragEnterEvent * _dee )
 						arg( Track::SampleTrack ) );
 }
 
+void TrackContainerView::selectRegionFromPixels(int x, int y)
+{
+	m_rubberBand->setEnabled( true );
+	m_rubberBand->show();
+	m_rubberBand->setGeometry( min( x, y ), 0, max( x, y ) - min( x, y ), std::numeric_limits<int>::max() );
+}
+
+void TrackContainerView::stopRubberBand()
+{
+	m_rubberBand->hide();
+	m_rubberBand->setEnabled( false );
+}
+
 
 
 
diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 900b936a5..4186c3a0b 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -98,6 +98,10 @@ SongEditor::SongEditor( Song * _song ) :
 			SLOT( updatePosition( const MidiTime & ) ) );
 	connect( m_timeLine, SIGNAL( positionChanged( const MidiTime & ) ),
 			this, SLOT( updatePosition( const MidiTime & ) ) );
+	connect( m_timeLine, SIGNAL( regionSelectedFromPixels( int, int ) ),
+			this, SLOT( selectRegionFromPixels( int, int ) ) );
+	connect( m_timeLine, SIGNAL( selectionFinished() ),
+			 this, SLOT( stopRubberBand() ) );
 
 	m_positionLine = new positionLine( this );