Merge branch 'variable-tab-widget'

michaelgregorius · Jul 17, 2019 · 73c2c70 · 73c2c70
2 parents 59e186d + aa8f936
commit 73c2c70
Show file tree

Hide file tree

Showing 51 changed files with 85 additions and 53 deletions.
diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h
@@ -68,7 +68,7 @@ class DummyInstrument : public Instrument
 
 	virtual PluginView * instantiateView( QWidget * _parent )
 	{
-		return new InstrumentView( this, _parent );
+		return new InstrumentViewFixedSize( this, _parent );
 	}
 } ;
 

diff --git a/include/InstrumentView.h b/include/InstrumentView.h
@@ -32,11 +32,12 @@
 class InstrumentTrackWindow;
 
 
+//! Instrument view with variable size
 class LMMS_EXPORT InstrumentView : public PluginView
 {
 public:
 	InstrumentView( Instrument * _instrument, QWidget * _parent );
-	virtual ~InstrumentView();
+	~InstrumentView() override;
 
 	Instrument * model()
 	{
@@ -48,11 +49,25 @@ class LMMS_EXPORT InstrumentView : public PluginView
 		return( castModel<Instrument>() );
 	}
 
-	virtual void setModel( Model * _model, bool = false );
+	void setModel( Model * _model, bool = false ) override;
 
 	InstrumentTrackWindow * instrumentTrackWindow();
 
 } ;
 
 
+
+
+//! Instrument view with fixed LMMS-default size
+class LMMS_EXPORT InstrumentViewFixedSize : public InstrumentView
+{
+	QSize sizeHint() const override { return QSize(250, 250); }
+	QSize minimumSizeHint() const override { return sizeHint(); }
+
+public:
+	using InstrumentView::InstrumentView;
+	~InstrumentViewFixedSize() override;
+} ;
+
+
 #endif
diff --git a/include/TabWidget.h b/include/TabWidget.h
@@ -78,6 +78,7 @@ class TabWidget : public QWidget
 	virtual void resizeEvent( QResizeEvent * _re );
 	virtual void wheelEvent( QWheelEvent * _we );
 	virtual QSize minimumSizeHint() const;
+	virtual QSize sizeHint() const;
 
 private:
 	struct widgetDesc

diff --git a/plugins/FreeBoy/FreeBoy.cpp b/plugins/FreeBoy/FreeBoy.cpp
@@ -457,7 +457,7 @@ class FreeBoyKnob : public Knob
 
 FreeBoyInstrumentView::FreeBoyInstrumentView( Instrument * _instrument,
 							QWidget * _parent ) :
-	InstrumentView( _instrument, _parent )
+	InstrumentViewFixedSize( _instrument, _parent )
 {
 
 	setAutoFillBackground( true );

diff --git a/plugins/FreeBoy/FreeBoy.h b/plugins/FreeBoy/FreeBoy.h
@@ -111,7 +111,7 @@ class FreeBoyInstrument : public Instrument
 } ;
 
 
-class FreeBoyInstrumentView : public InstrumentView
+class FreeBoyInstrumentView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/GigPlayer/GigPlayer.cpp b/plugins/GigPlayer/GigPlayer.cpp
@@ -922,7 +922,7 @@ class gigKnob : public Knob
 
 
 GigInstrumentView::GigInstrumentView( Instrument * _instrument, QWidget * _parent ) :
-	InstrumentView( _instrument, _parent )
+        InstrumentViewFixedSize( _instrument, _parent )
 {
 	GigInstrument * k = castModel<GigInstrument>();
 

diff --git a/plugins/GigPlayer/GigPlayer.h b/plugins/GigPlayer/GigPlayer.h
@@ -334,7 +334,7 @@ public slots:
 
 
 
-class GigInstrumentView : public InstrumentView
+class GigInstrumentView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/OpulenZ/OpulenZ.cpp b/plugins/OpulenZ/OpulenZ.cpp
@@ -681,7 +681,7 @@ void OpulenzInstrument::loadFile( const QString& file ) {
 
 OpulenzInstrumentView::OpulenzInstrumentView( Instrument * _instrument,
                                                         QWidget * _parent ) :
-        InstrumentView( _instrument, _parent )
+        InstrumentViewFixedSize( _instrument, _parent )
 {
 
 #define KNOB_GEN(knobname, hinttext, hintunit,xpos,ypos) \

diff --git a/plugins/OpulenZ/OpulenZ.h b/plugins/OpulenZ/OpulenZ.h
@@ -142,7 +142,7 @@ private slots:
 
 
 
-class OpulenzInstrumentView : public InstrumentView
+class OpulenzInstrumentView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/Xpressive/Xpressive.cpp b/plugins/Xpressive/Xpressive.cpp
@@ -274,7 +274,7 @@ class XpressiveKnob: public Knob {
 
 
 XpressiveView::XpressiveView(Instrument * _instrument, QWidget * _parent) :
-	InstrumentView(_instrument, _parent)
+	InstrumentViewFixedSize(_instrument, _parent)
 
 {
 	const int COL_KNOBS = 194;

diff --git a/plugins/Xpressive/Xpressive.h b/plugins/Xpressive/Xpressive.h
@@ -139,7 +139,7 @@ protected slots:
 } ;
 
 
-class XpressiveView : public InstrumentView
+class XpressiveView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -449,7 +449,7 @@ QPixmap * AudioFileProcessorView::s_artwork = NULL;
 
 AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
 							QWidget * _parent ) :
-	InstrumentView( _instrument, _parent )
+	InstrumentViewFixedSize( _instrument, _parent )
 {
 	if( s_artwork == NULL )
 	{

diff --git a/plugins/audio_file_processor/audio_file_processor.h b/plugins/audio_file_processor/audio_file_processor.h
@@ -111,7 +111,7 @@ private slots:
 class AudioFileProcessorWaveView;
 
 
-class AudioFileProcessorView : public InstrumentView
+class AudioFileProcessorView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp
@@ -326,7 +326,7 @@ PluginView * bitInvader::instantiateView( QWidget * _parent )
 
 bitInvaderView::bitInvaderView( Instrument * _instrument,
 					QWidget * _parent ) :
-	InstrumentView( _instrument, _parent )
+	InstrumentViewFixedSize( _instrument, _parent )
 {
 	setAutoFillBackground( true );
 	QPalette pal;

diff --git a/plugins/bit_invader/bit_invader.h b/plugins/bit_invader/bit_invader.h
@@ -108,7 +108,7 @@ protected slots:
 
 
 
-class bitInvaderView : public InstrumentView
+class bitInvaderView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/carlabase/carla.cpp b/plugins/carlabase/carla.cpp
@@ -460,7 +460,7 @@ void CarlaInstrument::sampleRateChanged()
 // -------------------------------------------------------------------
 
 CarlaInstrumentView::CarlaInstrumentView(CarlaInstrument* const instrument, QWidget* const parent)
-    : InstrumentView(instrument, parent),
+    : InstrumentViewFixedSize(instrument, parent),
       fHandle(instrument->fHandle),
       fDescriptor(instrument->fDescriptor),
       fTimerId(fHandle != NULL && fDescriptor->ui_idle != NULL ? startTimer(30) : 0)

diff --git a/plugins/carlabase/carla.h b/plugins/carlabase/carla.h
@@ -99,7 +99,7 @@ private slots:
     friend class CarlaInstrumentView;
 };
 
-class CarlaInstrumentView : public InstrumentView
+class CarlaInstrumentView : public InstrumentViewFixedSize
 {
     Q_OBJECT
 

diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp
@@ -267,7 +267,7 @@ class kickerLargeKnob : public Knob
 
 kickerInstrumentView::kickerInstrumentView( Instrument * _instrument,
 							QWidget * _parent ) :
-	InstrumentView( _instrument, _parent )
+	InstrumentViewFixedSize( _instrument, _parent )
 {
 	const int ROW1 = 14;
 	const int ROW2 = ROW1 + 56;

diff --git a/plugins/kicker/kicker.h b/plugins/kicker/kicker.h
@@ -94,7 +94,7 @@ class kickerInstrument : public Instrument
 
 
 
-class kickerInstrumentView : public InstrumentView
+class kickerInstrumentView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp
@@ -803,7 +803,7 @@ PluginView * lb302Synth::instantiateView( QWidget * _parent )
 
 
 lb302SynthView::lb302SynthView( Instrument * _instrument, QWidget * _parent ) :
-	InstrumentView( _instrument, _parent )
+	InstrumentViewFixedSize( _instrument, _parent )
 {
 	// GUI
 	m_vcfCutKnob = new Knob( knobBright_26, this );

diff --git a/plugins/lb302/lb302.h b/plugins/lb302/lb302.h
@@ -256,7 +256,7 @@ public slots:
 } ;
 
 
-class lb302SynthView : public InstrumentView
+class lb302SynthView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/monstro/Monstro.cpp b/plugins/monstro/Monstro.cpp
@@ -1447,7 +1447,7 @@ void MonstroInstrument::updateSlope2()
 
 MonstroView::MonstroView( Instrument * _instrument,
 					QWidget * _parent ) :
-					InstrumentView( _instrument, _parent )
+					InstrumentViewFixedSize( _instrument, _parent )
 {
 	m_operatorsView = setupOperatorsView( this );
 	setWidgetBackground( m_operatorsView, "artwork_op" );

diff --git a/plugins/monstro/Monstro.h b/plugins/monstro/Monstro.h
@@ -569,7 +569,7 @@ public slots:
 
 };
 
-class MonstroView : public InstrumentView
+class MonstroView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/nes/Nes.cpp b/plugins/nes/Nes.cpp
@@ -731,7 +731,7 @@ QPixmap * NesInstrumentView::s_artwork = NULL;
 
 
 NesInstrumentView::NesInstrumentView( Instrument * instrument,	QWidget * parent ) :
-	InstrumentView( instrument, parent )
+	InstrumentViewFixedSize( instrument, parent )
 {
 	setAutoFillBackground( true );
 	QPalette pal;

diff --git a/plugins/nes/Nes.h b/plugins/nes/Nes.h
@@ -294,7 +294,7 @@ public slots:
 };
 
 
-class NesInstrumentView : public InstrumentView
+class NesInstrumentView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp
@@ -417,7 +417,7 @@ class organicKnob : public Knob
 
 organicInstrumentView::organicInstrumentView( Instrument * _instrument,
 							QWidget * _parent ) :
-	InstrumentView( _instrument, _parent ),
+	InstrumentViewFixedSize( _instrument, _parent ),
 	m_oscKnobs( NULL )
 {
 	organicInstrument * oi = castModel<organicInstrument>();

diff --git a/plugins/organic/organic.h b/plugins/organic/organic.h
@@ -173,7 +173,7 @@ private slots:
 } ;
 
 
-class organicInstrumentView : public InstrumentView
+class organicInstrumentView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp
@@ -443,7 +443,7 @@ PluginView * patmanInstrument::instantiateView( QWidget * _parent )
 
 
 PatmanView::PatmanView( Instrument * _instrument, QWidget * _parent ) :
-	InstrumentView( _instrument, _parent ),
+	InstrumentViewFixedSize( _instrument, _parent ),
 	m_pi( NULL )
 {
 	setAutoFillBackground( true );

diff --git a/plugins/patman/patman.h b/plugins/patman/patman.h
@@ -116,7 +116,7 @@ public slots:
 
 
 
-class PatmanView : public InstrumentView
+class PatmanView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp
@@ -859,7 +859,7 @@ class sf2Knob : public Knob
 
 
 sf2InstrumentView::sf2InstrumentView( Instrument * _instrument, QWidget * _parent ) :
-	InstrumentView( _instrument, _parent )
+	InstrumentViewFixedSize( _instrument, _parent )
 {
 //	QVBoxLayout * vl = new QVBoxLayout( this );
 //	QHBoxLayout * hl = new QHBoxLayout();

diff --git a/plugins/sf2_player/sf2_player.h b/plugins/sf2_player/sf2_player.h
@@ -187,7 +187,7 @@ class sf2Font
 
 
 
-class sf2InstrumentView : public InstrumentView
+class sf2InstrumentView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/sfxr/sfxr.cpp b/plugins/sfxr/sfxr.cpp
@@ -600,7 +600,7 @@ class sfxrKnob : public Knob
 
 sfxrInstrumentView::sfxrInstrumentView( Instrument * _instrument,
 					QWidget * _parent ) :
-	InstrumentView( _instrument, _parent )
+	InstrumentViewFixedSize( _instrument, _parent )
 {
 	srand(time(NULL));
 	setAutoFillBackground( true );

diff --git a/plugins/sfxr/sfxr.h b/plugins/sfxr/sfxr.h
@@ -223,7 +223,7 @@ class sfxrInstrument : public Instrument
 
 
 
-class sfxrInstrumentView : public InstrumentView
+class sfxrInstrumentView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/sid/sid_instrument.cpp b/plugins/sid/sid_instrument.cpp
@@ -483,7 +483,7 @@ class sidKnob : public Knob
 
 sidInstrumentView::sidInstrumentView( Instrument * _instrument,
 							QWidget * _parent ) :
-	InstrumentView( _instrument, _parent )
+	InstrumentViewFixedSize( _instrument, _parent )
 {
 
 	setAutoFillBackground( true );

diff --git a/plugins/sid/sid_instrument.h b/plugins/sid/sid_instrument.h
@@ -132,7 +132,7 @@ class sidInstrument : public Instrument
 
 
 
-class sidInstrumentView : public InstrumentView
+class sidInstrumentView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp
@@ -384,7 +384,7 @@ PluginView * malletsInstrument::instantiateView( QWidget * _parent )
 
 malletsInstrumentView::malletsInstrumentView( malletsInstrument * _instrument,
 							QWidget * _parent ) :
-	InstrumentView( _instrument, _parent )
+        InstrumentViewFixedSize( _instrument, _parent )
 {
 	m_modalBarWidget = setupModalBarControls( this );
 	setWidgetBackground( m_modalBarWidget, "artwork" );

diff --git a/plugins/stk/mallets/mallets.h b/plugins/stk/mallets/mallets.h
@@ -187,7 +187,7 @@ class malletsInstrument : public Instrument
 } ;
 
 
-class malletsInstrumentView: public InstrumentView
+class malletsInstrumentView: public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/triple_oscillator/TripleOscillator.cpp b/plugins/triple_oscillator/TripleOscillator.cpp
@@ -419,7 +419,7 @@ class TripleOscKnob : public Knob
 
 TripleOscillatorView::TripleOscillatorView( Instrument * _instrument,
 							QWidget * _parent ) :
-	InstrumentView( _instrument, _parent )
+	InstrumentViewFixedSize( _instrument, _parent )
 {
 	setAutoFillBackground( true );
 	QPalette pal;

diff --git a/plugins/triple_oscillator/TripleOscillator.h b/plugins/triple_oscillator/TripleOscillator.h
@@ -136,7 +136,7 @@ protected slots:
 
 
 
-class TripleOscillatorView : public InstrumentView
+class TripleOscillatorView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
 public:

diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp
@@ -468,7 +468,7 @@ PluginView * vestigeInstrument::instantiateView( QWidget * _parent )
 
 VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument,
 							QWidget * _parent ) :
-	InstrumentView( _instrument, _parent ),
+	InstrumentViewFixedSize( _instrument, _parent ),
 	lastPosInMenu (0)
 {
 	if( s_artwork == NULL )
@@ -900,7 +900,7 @@ void VestigeInstrumentView::paintEvent( QPaintEvent * )
 
 manageVestigeInstrumentView::manageVestigeInstrumentView( Instrument * _instrument,
 							QWidget * _parent, vestigeInstrument * m_vi2 ) :
-	InstrumentView( _instrument, _parent )
+	InstrumentViewFixedSize( _instrument, _parent )
 {
 	m_vi = m_vi2;
 	m_vi->m_scrollArea = new QScrollArea( this );