Migrate Timeline::addToolButtons to QToolBar

LMMS · Dec 8, 2014 · e9d841d · e9d841d
1 parent ec9158c
commit e9d841d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 28 deletions.
diff --git a/include/Timeline.h b/include/Timeline.h
@@ -32,6 +32,7 @@
 
 
 class QPixmap;
+class QToolBar;
 class NStateButton;
 class TextFloat;
 
@@ -111,7 +112,7 @@ class Timeline : public QWidget, public JournallingObject
 		update();
 	}
 
-	void addToolButtons( QWidget * _tool_bar );
+	void addToolButtons(QToolBar* _tool_bar );
 
 
 	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );

diff --git a/src/core/Timeline.cpp b/src/core/Timeline.cpp
@@ -29,6 +29,7 @@
 #include <QLayout>
 #include <QMouseEvent>
 #include <QPainter>
+#include <QToolBar>
 
 
 #include "Timeline.h"
@@ -121,7 +122,7 @@ Timeline::~Timeline()
 
 
 
-void Timeline::addToolButtons( QWidget * _tool_bar )
+void Timeline::addToolButtons( QToolBar * _tool_bar )
 {
 	NStateButton * autoScroll = new NStateButton( _tool_bar );
 	autoScroll->setGeneralToolTip( tr( "Enable/disable auto-scrolling" ) );
@@ -152,10 +153,9 @@ void Timeline::addToolButtons( QWidget * _tool_bar )
 	connect( behaviourAtStop, SIGNAL( changedState( int ) ), this,
 					SLOT( toggleBehaviourAtStop( int ) ) );
 
-	QBoxLayout * layout = dynamic_cast<QBoxLayout *>( _tool_bar->layout() );
-	layout->addWidget( autoScroll );
-	layout->addWidget( loopPoints );
-	layout->addWidget( behaviourAtStop );
+	_tool_bar->addWidget( autoScroll );
+	_tool_bar->addWidget( loopPoints );
+	_tool_bar->addWidget( behaviourAtStop );
 }
 
 

diff --git a/src/gui/AutomationEditor.cpp b/src/gui/AutomationEditor.cpp
@@ -2265,13 +2265,7 @@ AutomationEditorWindow::AutomationEditorWindow() :
 	m_toolBar->addWidget( m_copyButton );
 	m_toolBar->addWidget( m_pasteButton );
 	m_toolBar->addSeparator();
-	QWidget* timeLineButtons = new QWidget();
-	timeLineButtons->setFixedHeight(m_cutButton->height());
-	timeLineButtons->move(0,0);
-	QLayout* l = new QHBoxLayout( timeLineButtons );
-	l->setSpacing(0); l->setMargin(0);
-	m_editor->m_timeLine->addToolButtons(timeLineButtons);
-	m_toolBar->addWidget(timeLineButtons);
+	m_editor->m_timeLine->addToolButtons(m_toolBar);
 	m_toolBar->addSeparator();
 	m_toolBar->addWidget( zoom_x_label );
 	m_toolBar->addWidget( m_zoomingXComboBox );

diff --git a/src/gui/PianoRoll.cpp b/src/gui/PianoRoll.cpp
@@ -4145,13 +4145,7 @@ PianoRollWindow::PianoRollWindow() :
 	m_toolBar->addWidget( m_pasteButton );
 
 	m_toolBar->addSeparator();
-	QWidget* timeLineButtons = new QWidget();
-	timeLineButtons->setFixedHeight(m_toolBar->height());
-	timeLineButtons->move(0,0);
-	QLayout* l = new QHBoxLayout( timeLineButtons );
-	l->setSpacing(0); l->setMargin(0);
-	m_editor->m_timeLine->addToolButtons(timeLineButtons);
-	m_toolBar->addWidget(timeLineButtons);
+	m_editor->m_timeLine->addToolButtons(m_toolBar);
 
 	m_toolBar->addSeparator();
 	m_toolBar->addWidget( zoom_lbl );

diff --git a/src/gui/SongEditor.cpp b/src/gui/SongEditor.cpp
@@ -676,14 +676,8 @@ SongEditorWindow::SongEditorWindow(Song* song) :
 	m_toolBar->addSeparator();
 	m_toolBar->addWidget( m_drawModeButton );
 	m_toolBar->addWidget( m_editModeButton );
-
-	QWidget* timeLineButtons = new QWidget();
-	timeLineButtons->setFixedHeight(m_toolBar->height());
-	timeLineButtons->move(0,0);
-	QLayout* l = new QHBoxLayout( timeLineButtons );
-	l->setSpacing(0); l->setMargin(0);
-	m_editor->m_timeLine->addToolButtons(timeLineButtons);
-
+	m_toolBar->addSeparator();
+	m_editor->m_timeLine->addToolButtons(m_toolBar);
 	m_toolBar->addSeparator();
 	m_toolBar->addWidget( zoom_lbl );
 	m_toolBar->addWidget( m_zoomingComboBox );