Merge pull request #2222 from michaelgregorius/2209-font-sizes-too-small

2209 font sizes too small

include/ControllerRackView.h

@@ -34,8 +34,10 @@
 
 class QPushButton;
 class QScrollArea;
+class QVBoxLayout;
 
 class ControllerView;
+class Controller;
 
 
 class ControllerRackView : public QWidget, public SerializingObject
@@ -56,12 +58,13 @@ public:
 
 public slots:
 	void deleteController( ControllerView * _view );
+	void onControllerAdded( Controller * );
+	void onControllerRemoved( Controller * );
 
 protected:
 	virtual void closeEvent( QCloseEvent * _ce );
 
 private slots:
-	virtual void update();
 	void addController();
 
 
@@ -69,8 +72,12 @@ private:
 	QVector<ControllerView *> m_controllerViews;
 
 	QScrollArea * m_scrollArea;
+	QVBoxLayout * m_scrollAreaLayout;
 	QPushButton * m_addButton;
 
+	// Stores the index of where to insert the next ControllerView.
+	// Needed so that the StretchItem always stays at the last position.
+	int m_nextIndex;
 } ;
 
 #endif

include/ControllerView.h

@@ -25,7 +25,7 @@
 #ifndef CONTROLLER_VIEW_H
 #define CONTROLLER_VIEW_H
 
-#include <QWidget>
+#include <QFrame>
 
 #include "AutomatableModel.h"
 #include "Controller.h"
@@ -39,7 +39,7 @@ class QMdiSubWindow;
 class LedCheckBox;
 
 
-class ControllerView : public QWidget, public ModelView
+class ControllerView : public QFrame, public ModelView
 {
 	Q_OBJECT
 public:
@@ -70,15 +70,14 @@ signals:
 
 protected:
 	virtual void contextMenuEvent( QContextMenuEvent * _me );
-	virtual void paintEvent( QPaintEvent * _pe );
 	virtual void modelChanged();
 	virtual void mouseDoubleClickEvent( QMouseEvent * event );
 
 
 private:
-	QPixmap m_bg;
 	QMdiSubWindow * m_subWindow;
 	ControllerDialog * m_controllerDlg;
+	QLabel * m_nameLabel;
 	bool m_show;
 
 } ;

include/Song.h

@@ -323,6 +323,8 @@ private:
 	void saveControllerStates( QDomDocument & doc, QDomElement & element );
 	void restoreControllerStates( const QDomElement & element );
 
+	void removeAllControllers();
+
 
 	AutomationTrack * m_globalAutomationTrack;
 
@@ -376,6 +378,8 @@ signals:
 	void lengthChanged( int tacts );
 	void tempoChanged( bpm_t newBPM );
 	void timeSignatureChanged( int oldTicksPerTact, int ticksPerTact );
+	void controllerAdded( Controller * );
+	void controllerRemoved( Controller * );
 
 } ;
 

include/TimeLineWidget.h

@@ -154,7 +154,6 @@ protected:
 
 
 private:
-	static QPixmap * s_timeLinePixmap;
 	static QPixmap * s_posMarkerPixmap;
 	static QPixmap * s_loopPointBeginPixmap;
 	static QPixmap * s_loopPointEndPixmap;