From f5db88086754e80b9a9bc56ef6502b6052afa3bf Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Sat, 13 Jul 2019 22:09:36 +0200 Subject: [PATCH 1/6] SubWindow.cpp: Fix comment --- src/gui/SubWindow.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/SubWindow.cpp b/src/gui/SubWindow.cpp index 7340d428c..1c3f26e59 100644 --- a/src/gui/SubWindow.cpp +++ b/src/gui/SubWindow.cpp @@ -1,4 +1,4 @@ -/* +/* * SubWindow.cpp - Implementation of QMdiSubWindow that correctly tracks * the geometry that windows should be restored to. * Workaround for https://bugreports.qt.io/browse/QTBUG-256 @@ -375,10 +375,10 @@ void SubWindow::focusChanged( QMdiSubWindow *subWindow ) /** * @brief SubWindow::resizeEvent * - * On every rezise event we have to adjust our title label. - * - * At next we give the event to QMdiSubWindow::resizeEvent() which handles + * At first we give the event to QMdiSubWindow::resizeEvent() which handles * the event on its behavior. + * + * On every resize event we have to adjust our title label. * * At last we store the current size into m_trackedNormalGeom. This size * will be saved with the project because of an Qt bug wich doesn't From 3585b14b98a45db2dd7a944f4b211111363e6e83 Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Sat, 13 Jul 2019 22:14:55 +0200 Subject: [PATCH 2/6] Instrument view: Add missing size hints Those are needed for the case when an instrument is being resized manually. --- include/InstrumentView.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/InstrumentView.h b/include/InstrumentView.h index 9c6081a77..06a1a0277 100644 --- a/include/InstrumentView.h +++ b/include/InstrumentView.h @@ -34,9 +34,12 @@ class InstrumentTrackWindow; class LMMS_EXPORT InstrumentView : public PluginView { + QSize sizeHint() const override { return QSize(250, 250); } + QSize minimumSizeHint() const override { return sizeHint(); } + public: InstrumentView( Instrument * _instrument, QWidget * _parent ); - virtual ~InstrumentView(); + ~InstrumentView() override; Instrument * model() { @@ -48,7 +51,7 @@ public: return( castModel() ); } - virtual void setModel( Model * _model, bool = false ); + void setModel( Model * _model, bool = false ) override; InstrumentTrackWindow * instrumentTrackWindow(); From a4b801fe1b7bb55f5770033a950b4cce3468dd45 Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Sat, 13 Jul 2019 22:15:56 +0200 Subject: [PATCH 3/6] TabWidget: Add missing size hints This is mostly for completeness, it does not fix any known issues. --- include/TabWidget.h | 1 + src/gui/widgets/TabWidget.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/TabWidget.h b/include/TabWidget.h index 11e4da40a..88ecf9034 100644 --- a/include/TabWidget.h +++ b/include/TabWidget.h @@ -78,6 +78,7 @@ protected: virtual void resizeEvent( QResizeEvent * _re ); virtual void wheelEvent( QWheelEvent * _we ); virtual QSize minimumSizeHint() const; + virtual QSize sizeHint() const; private: struct widgetDesc diff --git a/src/gui/widgets/TabWidget.cpp b/src/gui/widgets/TabWidget.cpp index 9bdbec2e0..125bbbd74 100644 --- a/src/gui/widgets/TabWidget.cpp +++ b/src/gui/widgets/TabWidget.cpp @@ -333,6 +333,14 @@ QSize TabWidget::minimumSizeHint() const +QSize TabWidget::sizeHint() const +{ + return minimumSizeHint(); +} + + + + // Return the color to be used to draw a TabWidget's title text (if any) QColor TabWidget::tabTitleText() const { From 4f3ed9f9e145d4daafc37c77eeaa04a112dee1da Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Sat, 13 Jul 2019 22:17:33 +0200 Subject: [PATCH 4/6] EffectControlDialog: Use 'Preferred' size policy This does not have any effect, as the surrounding MDI sub window always uses the minimumSizHint. It's just preparation. --- src/gui/EffectControlDialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/EffectControlDialog.cpp b/src/gui/EffectControlDialog.cpp index c43f451aa..dc273a6a3 100644 --- a/src/gui/EffectControlDialog.cpp +++ b/src/gui/EffectControlDialog.cpp @@ -36,6 +36,7 @@ EffectControlDialog::EffectControlDialog( EffectControls * _controls ) : m_effectControls( _controls ) { setWindowTitle( m_effectControls->effect()->displayName() ); + setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); } From a4df7a976507108fab3c2a70958ce2631d54e742 Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Sun, 14 Jul 2019 10:20:54 +0200 Subject: [PATCH 5/6] Split InstrumentView into itself and InstrumentView250 --- include/DummyInstrument.h | 2 +- include/InstrumentView.h | 18 +++++++++++++++--- plugins/FreeBoy/FreeBoy.cpp | 2 +- plugins/FreeBoy/FreeBoy.h | 2 +- plugins/GigPlayer/GigPlayer.cpp | 2 +- plugins/GigPlayer/GigPlayer.h | 2 +- plugins/OpulenZ/OpulenZ.cpp | 2 +- plugins/OpulenZ/OpulenZ.h | 2 +- plugins/Xpressive/Xpressive.cpp | 2 +- plugins/Xpressive/Xpressive.h | 2 +- .../audio_file_processor.cpp | 2 +- .../audio_file_processor.h | 2 +- plugins/bit_invader/bit_invader.cpp | 2 +- plugins/bit_invader/bit_invader.h | 2 +- plugins/carlabase/carla.cpp | 2 +- plugins/carlabase/carla.h | 2 +- plugins/kicker/kicker.cpp | 2 +- plugins/kicker/kicker.h | 2 +- plugins/lb302/lb302.cpp | 2 +- plugins/lb302/lb302.h | 2 +- plugins/monstro/Monstro.cpp | 2 +- plugins/monstro/Monstro.h | 2 +- plugins/nes/Nes.cpp | 2 +- plugins/nes/Nes.h | 2 +- plugins/organic/organic.cpp | 2 +- plugins/organic/organic.h | 2 +- plugins/patman/patman.cpp | 2 +- plugins/patman/patman.h | 2 +- plugins/sf2_player/sf2_player.cpp | 2 +- plugins/sf2_player/sf2_player.h | 2 +- plugins/sfxr/sfxr.cpp | 2 +- plugins/sfxr/sfxr.h | 2 +- plugins/sid/sid_instrument.cpp | 2 +- plugins/sid/sid_instrument.h | 2 +- plugins/stk/mallets/mallets.cpp | 2 +- plugins/stk/mallets/mallets.h | 2 +- plugins/triple_oscillator/TripleOscillator.cpp | 2 +- plugins/triple_oscillator/TripleOscillator.h | 2 +- plugins/vestige/vestige.cpp | 4 ++-- plugins/vestige/vestige.h | 4 ++-- plugins/vibed/vibed.cpp | 2 +- plugins/vibed/vibed.h | 2 +- plugins/watsyn/Watsyn.cpp | 2 +- plugins/watsyn/Watsyn.h | 2 +- plugins/zynaddsubfx/ZynAddSubFx.cpp | 2 +- plugins/zynaddsubfx/ZynAddSubFx.h | 2 +- src/gui/InstrumentView.cpp | 7 +++++++ 47 files changed, 69 insertions(+), 50 deletions(-) diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h index b69594b00..436b23c6f 100644 --- a/include/DummyInstrument.h +++ b/include/DummyInstrument.h @@ -68,7 +68,7 @@ public: virtual PluginView * instantiateView( QWidget * _parent ) { - return new InstrumentView( this, _parent ); + return new InstrumentView250( this, _parent ); } } ; diff --git a/include/InstrumentView.h b/include/InstrumentView.h index 06a1a0277..bb1bc766b 100644 --- a/include/InstrumentView.h +++ b/include/InstrumentView.h @@ -32,11 +32,9 @@ class InstrumentTrackWindow; +//! Instrument view with variable size class LMMS_EXPORT InstrumentView : public PluginView { - QSize sizeHint() const override { return QSize(250, 250); } - QSize minimumSizeHint() const override { return sizeHint(); } - public: InstrumentView( Instrument * _instrument, QWidget * _parent ); ~InstrumentView() override; @@ -58,4 +56,18 @@ public: } ; + + +//! Instrument view with fixed LMMS-default size +class LMMS_EXPORT InstrumentView250 : public InstrumentView +{ + QSize sizeHint() const override { return QSize(250, 250); } + QSize minimumSizeHint() const override { return sizeHint(); } + +public: + using InstrumentView::InstrumentView; + ~InstrumentView250() override; +} ; + + #endif diff --git a/plugins/FreeBoy/FreeBoy.cpp b/plugins/FreeBoy/FreeBoy.cpp index dd05444a6..d503d135c 100644 --- a/plugins/FreeBoy/FreeBoy.cpp +++ b/plugins/FreeBoy/FreeBoy.cpp @@ -457,7 +457,7 @@ public: FreeBoyInstrumentView::FreeBoyInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { setAutoFillBackground( true ); diff --git a/plugins/FreeBoy/FreeBoy.h b/plugins/FreeBoy/FreeBoy.h index 69c478505..84d2fd2e6 100644 --- a/plugins/FreeBoy/FreeBoy.h +++ b/plugins/FreeBoy/FreeBoy.h @@ -111,7 +111,7 @@ private: } ; -class FreeBoyInstrumentView : public InstrumentView +class FreeBoyInstrumentView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/GigPlayer/GigPlayer.cpp b/plugins/GigPlayer/GigPlayer.cpp index bf5990252..695378ab1 100644 --- a/plugins/GigPlayer/GigPlayer.cpp +++ b/plugins/GigPlayer/GigPlayer.cpp @@ -922,7 +922,7 @@ public: GigInstrumentView::GigInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { GigInstrument * k = castModel(); diff --git a/plugins/GigPlayer/GigPlayer.h b/plugins/GigPlayer/GigPlayer.h index 0a5e023f9..8232d7a97 100644 --- a/plugins/GigPlayer/GigPlayer.h +++ b/plugins/GigPlayer/GigPlayer.h @@ -334,7 +334,7 @@ signals: -class GigInstrumentView : public InstrumentView +class GigInstrumentView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/OpulenZ/OpulenZ.cpp b/plugins/OpulenZ/OpulenZ.cpp index d8d5f3e26..ce85e064d 100644 --- 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 ) + InstrumentView250( _instrument, _parent ) { #define KNOB_GEN(knobname, hinttext, hintunit,xpos,ypos) \ diff --git a/plugins/OpulenZ/OpulenZ.h b/plugins/OpulenZ/OpulenZ.h index e69c278ef..a986c9f21 100644 --- a/plugins/OpulenZ/OpulenZ.h +++ b/plugins/OpulenZ/OpulenZ.h @@ -142,7 +142,7 @@ private: -class OpulenzInstrumentView : public InstrumentView +class OpulenzInstrumentView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/Xpressive/Xpressive.cpp b/plugins/Xpressive/Xpressive.cpp index cb0293710..929a1c631 100644 --- a/plugins/Xpressive/Xpressive.cpp +++ b/plugins/Xpressive/Xpressive.cpp @@ -274,7 +274,7 @@ public: XpressiveView::XpressiveView(Instrument * _instrument, QWidget * _parent) : - InstrumentView(_instrument, _parent) + InstrumentView250(_instrument, _parent) { const int COL_KNOBS = 194; diff --git a/plugins/Xpressive/Xpressive.h b/plugins/Xpressive/Xpressive.h index ca80f2b78..422002aa8 100644 --- a/plugins/Xpressive/Xpressive.h +++ b/plugins/Xpressive/Xpressive.h @@ -139,7 +139,7 @@ private: } ; -class XpressiveView : public InstrumentView +class XpressiveView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp index 6c080f7c9..16c190170 100644 --- 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 ) + InstrumentView250( _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 index 150807686..854c2b7cd 100644 --- a/plugins/audio_file_processor/audio_file_processor.h +++ b/plugins/audio_file_processor/audio_file_processor.h @@ -111,7 +111,7 @@ private: class AudioFileProcessorWaveView; -class AudioFileProcessorView : public InstrumentView +class AudioFileProcessorView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp index ecc77be0b..563e0e2eb 100644 --- a/plugins/bit_invader/bit_invader.cpp +++ b/plugins/bit_invader/bit_invader.cpp @@ -327,7 +327,7 @@ PluginView * bitInvader::instantiateView( QWidget * _parent ) bitInvaderView::bitInvaderView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { setAutoFillBackground( true ); QPalette pal; diff --git a/plugins/bit_invader/bit_invader.h b/plugins/bit_invader/bit_invader.h index 1489ab104..60b468683 100644 --- a/plugins/bit_invader/bit_invader.h +++ b/plugins/bit_invader/bit_invader.h @@ -108,7 +108,7 @@ private: -class bitInvaderView : public InstrumentView +class bitInvaderView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/carlabase/carla.cpp b/plugins/carlabase/carla.cpp index 578c3ac65..7ab862957 100644 --- 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), + : InstrumentView250(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 index a4efb67e0..8a169e4db 100644 --- a/plugins/carlabase/carla.h +++ b/plugins/carlabase/carla.h @@ -99,7 +99,7 @@ private: friend class CarlaInstrumentView; }; -class CarlaInstrumentView : public InstrumentView +class CarlaInstrumentView : public InstrumentView250 { Q_OBJECT diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp index 2087cf880..62e46b8b5 100644 --- a/plugins/kicker/kicker.cpp +++ b/plugins/kicker/kicker.cpp @@ -267,7 +267,7 @@ public: kickerInstrumentView::kickerInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { const int ROW1 = 14; const int ROW2 = ROW1 + 56; diff --git a/plugins/kicker/kicker.h b/plugins/kicker/kicker.h index 295887c2f..f2dabd1fd 100644 --- a/plugins/kicker/kicker.h +++ b/plugins/kicker/kicker.h @@ -94,7 +94,7 @@ private: -class kickerInstrumentView : public InstrumentView +class kickerInstrumentView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp index d32f14e88..dc630ee92 100644 --- a/plugins/lb302/lb302.cpp +++ b/plugins/lb302/lb302.cpp @@ -804,7 +804,7 @@ PluginView * lb302Synth::instantiateView( QWidget * _parent ) lb302SynthView::lb302SynthView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { // GUI m_vcfCutKnob = new Knob( knobBright_26, this ); diff --git a/plugins/lb302/lb302.h b/plugins/lb302/lb302.h index 3ca22c78b..2d70ccee1 100644 --- a/plugins/lb302/lb302.h +++ b/plugins/lb302/lb302.h @@ -256,7 +256,7 @@ private: } ; -class lb302SynthView : public InstrumentView +class lb302SynthView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/monstro/Monstro.cpp b/plugins/monstro/Monstro.cpp index baee242bb..231517abb 100644 --- a/plugins/monstro/Monstro.cpp +++ b/plugins/monstro/Monstro.cpp @@ -1448,7 +1448,7 @@ void MonstroInstrument::updateSlope2() MonstroView::MonstroView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { m_operatorsView = setupOperatorsView( this ); setWidgetBackground( m_operatorsView, "artwork_op" ); diff --git a/plugins/monstro/Monstro.h b/plugins/monstro/Monstro.h index a8b186904..18cce7ad1 100644 --- a/plugins/monstro/Monstro.h +++ b/plugins/monstro/Monstro.h @@ -569,7 +569,7 @@ private: }; -class MonstroView : public InstrumentView +class MonstroView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/nes/Nes.cpp b/plugins/nes/Nes.cpp index 5b34dcb1f..345f94249 100644 --- a/plugins/nes/Nes.cpp +++ b/plugins/nes/Nes.cpp @@ -732,7 +732,7 @@ QPixmap * NesInstrumentView::s_artwork = NULL; NesInstrumentView::NesInstrumentView( Instrument * instrument, QWidget * parent ) : - InstrumentView( instrument, parent ) + InstrumentView250( instrument, parent ) { setAutoFillBackground( true ); QPalette pal; diff --git a/plugins/nes/Nes.h b/plugins/nes/Nes.h index 20f703739..855cab710 100644 --- a/plugins/nes/Nes.h +++ b/plugins/nes/Nes.h @@ -294,7 +294,7 @@ private: }; -class NesInstrumentView : public InstrumentView +class NesInstrumentView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp index b6d45c8d3..1c9aa5ab0 100644 --- a/plugins/organic/organic.cpp +++ b/plugins/organic/organic.cpp @@ -418,7 +418,7 @@ public: organicInstrumentView::organicInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ), + InstrumentView250( _instrument, _parent ), m_oscKnobs( NULL ) { organicInstrument * oi = castModel(); diff --git a/plugins/organic/organic.h b/plugins/organic/organic.h index 86b25ea77..083fa6333 100644 --- a/plugins/organic/organic.h +++ b/plugins/organic/organic.h @@ -173,7 +173,7 @@ private slots: } ; -class organicInstrumentView : public InstrumentView +class organicInstrumentView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp index 6ab7adce7..61368a575 100644 --- 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 ), + InstrumentView250( _instrument, _parent ), m_pi( NULL ) { setAutoFillBackground( true ); diff --git a/plugins/patman/patman.h b/plugins/patman/patman.h index a3b5a39b8..014a7d63c 100644 --- a/plugins/patman/patman.h +++ b/plugins/patman/patman.h @@ -116,7 +116,7 @@ signals: -class PatmanView : public InstrumentView +class PatmanView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index 4bf75777c..f0676dc8c 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -859,7 +859,7 @@ public: sf2InstrumentView::sf2InstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _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 index eed7e24ab..20da89adb 100644 --- a/plugins/sf2_player/sf2_player.h +++ b/plugins/sf2_player/sf2_player.h @@ -187,7 +187,7 @@ public: -class sf2InstrumentView : public InstrumentView +class sf2InstrumentView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/sfxr/sfxr.cpp b/plugins/sfxr/sfxr.cpp index c99f46f88..c954e72a0 100644 --- a/plugins/sfxr/sfxr.cpp +++ b/plugins/sfxr/sfxr.cpp @@ -601,7 +601,7 @@ public: sfxrInstrumentView::sfxrInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { srand(time(NULL)); setAutoFillBackground( true ); diff --git a/plugins/sfxr/sfxr.h b/plugins/sfxr/sfxr.h index 27246a1b8..dc601d322 100644 --- a/plugins/sfxr/sfxr.h +++ b/plugins/sfxr/sfxr.h @@ -223,7 +223,7 @@ private: -class sfxrInstrumentView : public InstrumentView +class sfxrInstrumentView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/sid/sid_instrument.cpp b/plugins/sid/sid_instrument.cpp index 2eb46be56..2df551f20 100644 --- a/plugins/sid/sid_instrument.cpp +++ b/plugins/sid/sid_instrument.cpp @@ -481,7 +481,7 @@ public: sidInstrumentView::sidInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { setAutoFillBackground( true ); diff --git a/plugins/sid/sid_instrument.h b/plugins/sid/sid_instrument.h index 6128bf91c..2649b9cba 100644 --- a/plugins/sid/sid_instrument.h +++ b/plugins/sid/sid_instrument.h @@ -132,7 +132,7 @@ private: -class sidInstrumentView : public InstrumentView +class sidInstrumentView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp index 7111bcdaa..a39cd689c 100644 --- 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 ) + InstrumentView250( _instrument, _parent ) { m_modalBarWidget = setupModalBarControls( this ); setWidgetBackground( m_modalBarWidget, "artwork" ); diff --git a/plugins/stk/mallets/mallets.h b/plugins/stk/mallets/mallets.h index 3928c531c..ec13f5eb9 100644 --- a/plugins/stk/mallets/mallets.h +++ b/plugins/stk/mallets/mallets.h @@ -187,7 +187,7 @@ private: } ; -class malletsInstrumentView: public InstrumentView +class malletsInstrumentView: public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/triple_oscillator/TripleOscillator.cpp b/plugins/triple_oscillator/TripleOscillator.cpp index 6b644fd46..fa4f3b4ae 100644 --- a/plugins/triple_oscillator/TripleOscillator.cpp +++ b/plugins/triple_oscillator/TripleOscillator.cpp @@ -419,7 +419,7 @@ public: TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { setAutoFillBackground( true ); QPalette pal; diff --git a/plugins/triple_oscillator/TripleOscillator.h b/plugins/triple_oscillator/TripleOscillator.h index fb2b48a41..b45fea1f3 100644 --- a/plugins/triple_oscillator/TripleOscillator.h +++ b/plugins/triple_oscillator/TripleOscillator.h @@ -136,7 +136,7 @@ private: -class TripleOscillatorView : public InstrumentView +class TripleOscillatorView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index 73ea33a51..c06a771d3 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -460,7 +460,7 @@ PluginView * vestigeInstrument::instantiateView( QWidget * _parent ) VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ), + InstrumentView250( _instrument, _parent ), lastPosInMenu (0) { if( s_artwork == NULL ) @@ -892,7 +892,7 @@ void VestigeInstrumentView::paintEvent( QPaintEvent * ) manageVestigeInstrumentView::manageVestigeInstrumentView( Instrument * _instrument, QWidget * _parent, vestigeInstrument * m_vi2 ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { m_vi = m_vi2; m_vi->m_scrollArea = new QScrollArea( this ); diff --git a/plugins/vestige/vestige.h b/plugins/vestige/vestige.h index 2c007efc0..423146497 100644 --- a/plugins/vestige/vestige.h +++ b/plugins/vestige/vestige.h @@ -98,7 +98,7 @@ private: } ; -class manageVestigeInstrumentView : public InstrumentView +class manageVestigeInstrumentView : public InstrumentView250 { Q_OBJECT public: @@ -134,7 +134,7 @@ private: } ; -class VestigeInstrumentView : public InstrumentView +class VestigeInstrumentView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp index f33a90428..f0c347b7c 100644 --- a/plugins/vibed/vibed.cpp +++ b/plugins/vibed/vibed.cpp @@ -350,7 +350,7 @@ PluginView * vibed::instantiateView( QWidget * _parent ) vibedView::vibedView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { setAutoFillBackground( true ); QPalette pal; diff --git a/plugins/vibed/vibed.h b/plugins/vibed/vibed.h index 9e175c4cc..039b88d24 100644 --- a/plugins/vibed/vibed.h +++ b/plugins/vibed/vibed.h @@ -82,7 +82,7 @@ private: -class vibedView : public InstrumentView +class vibedView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/watsyn/Watsyn.cpp b/plugins/watsyn/Watsyn.cpp index 0122b293a..9d45531d5 100644 --- a/plugins/watsyn/Watsyn.cpp +++ b/plugins/watsyn/Watsyn.cpp @@ -667,7 +667,7 @@ void WatsynInstrument::updateWaveB2() WatsynView::WatsynView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { setAutoFillBackground( true ); QPalette pal; diff --git a/plugins/watsyn/Watsyn.h b/plugins/watsyn/Watsyn.h index e52b7bb75..27cd65e47 100644 --- a/plugins/watsyn/Watsyn.h +++ b/plugins/watsyn/Watsyn.h @@ -293,7 +293,7 @@ private: }; -class WatsynView : public InstrumentView +class WatsynView : public InstrumentView250 { Q_OBJECT public: diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp index ad8d9a78c..42340ab62 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.cpp +++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp @@ -488,7 +488,7 @@ PluginView * ZynAddSubFxInstrument::instantiateView( QWidget * _parent ) ZynAddSubFxView::ZynAddSubFxView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView( _instrument, _parent ) + InstrumentView250( _instrument, _parent ) { setAutoFillBackground( true ); QPalette pal; diff --git a/plugins/zynaddsubfx/ZynAddSubFx.h b/plugins/zynaddsubfx/ZynAddSubFx.h index e8974d149..88d70d83b 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.h +++ b/plugins/zynaddsubfx/ZynAddSubFx.h @@ -132,7 +132,7 @@ signals: -class ZynAddSubFxView : public InstrumentView +class ZynAddSubFxView : public InstrumentView250 { Q_OBJECT public: diff --git a/src/gui/InstrumentView.cpp b/src/gui/InstrumentView.cpp index d2a7483e4..86b2fcc91 100644 --- a/src/gui/InstrumentView.cpp +++ b/src/gui/InstrumentView.cpp @@ -70,3 +70,10 @@ InstrumentTrackWindow * InstrumentView::instrumentTrackWindow( void ) parentWidget()->parentWidget() ) ); } + + + +InstrumentView250::~InstrumentView250() +{ +} + From aa8f9361c6b1be8a6fd0b15f2d411240ee8eeaba Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Wed, 17 Jul 2019 22:20:25 +0200 Subject: [PATCH 6/6] Rename InstrumentView250 to InstrumentViewFixedSize --- include/DummyInstrument.h | 2 +- include/InstrumentView.h | 4 ++-- plugins/FreeBoy/FreeBoy.cpp | 2 +- plugins/FreeBoy/FreeBoy.h | 2 +- plugins/GigPlayer/GigPlayer.cpp | 2 +- plugins/GigPlayer/GigPlayer.h | 2 +- plugins/OpulenZ/OpulenZ.cpp | 2 +- plugins/OpulenZ/OpulenZ.h | 2 +- plugins/Xpressive/Xpressive.cpp | 2 +- plugins/Xpressive/Xpressive.h | 2 +- plugins/audio_file_processor/audio_file_processor.cpp | 2 +- plugins/audio_file_processor/audio_file_processor.h | 2 +- plugins/bit_invader/bit_invader.cpp | 2 +- plugins/bit_invader/bit_invader.h | 2 +- plugins/carlabase/carla.cpp | 2 +- plugins/carlabase/carla.h | 2 +- plugins/kicker/kicker.cpp | 2 +- plugins/kicker/kicker.h | 2 +- plugins/lb302/lb302.cpp | 2 +- plugins/lb302/lb302.h | 2 +- plugins/monstro/Monstro.cpp | 2 +- plugins/monstro/Monstro.h | 2 +- plugins/nes/Nes.cpp | 2 +- plugins/nes/Nes.h | 2 +- plugins/organic/organic.cpp | 2 +- plugins/organic/organic.h | 2 +- plugins/patman/patman.cpp | 2 +- plugins/patman/patman.h | 2 +- plugins/sf2_player/sf2_player.cpp | 2 +- plugins/sf2_player/sf2_player.h | 2 +- plugins/sfxr/sfxr.cpp | 2 +- plugins/sfxr/sfxr.h | 2 +- plugins/sid/sid_instrument.cpp | 2 +- plugins/sid/sid_instrument.h | 2 +- plugins/stk/mallets/mallets.cpp | 2 +- plugins/stk/mallets/mallets.h | 2 +- plugins/triple_oscillator/TripleOscillator.cpp | 2 +- plugins/triple_oscillator/TripleOscillator.h | 2 +- plugins/vestige/vestige.cpp | 4 ++-- plugins/vestige/vestige.h | 4 ++-- plugins/vibed/vibed.cpp | 2 +- plugins/vibed/vibed.h | 2 +- plugins/watsyn/Watsyn.cpp | 2 +- plugins/watsyn/Watsyn.h | 2 +- plugins/zynaddsubfx/ZynAddSubFx.cpp | 2 +- plugins/zynaddsubfx/ZynAddSubFx.h | 2 +- src/gui/InstrumentView.cpp | 2 +- 47 files changed, 50 insertions(+), 50 deletions(-) diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h index 436b23c6f..87083f262 100644 --- a/include/DummyInstrument.h +++ b/include/DummyInstrument.h @@ -68,7 +68,7 @@ public: virtual PluginView * instantiateView( QWidget * _parent ) { - return new InstrumentView250( this, _parent ); + return new InstrumentViewFixedSize( this, _parent ); } } ; diff --git a/include/InstrumentView.h b/include/InstrumentView.h index bb1bc766b..838ed2d91 100644 --- a/include/InstrumentView.h +++ b/include/InstrumentView.h @@ -59,14 +59,14 @@ public: //! Instrument view with fixed LMMS-default size -class LMMS_EXPORT InstrumentView250 : public InstrumentView +class LMMS_EXPORT InstrumentViewFixedSize : public InstrumentView { QSize sizeHint() const override { return QSize(250, 250); } QSize minimumSizeHint() const override { return sizeHint(); } public: using InstrumentView::InstrumentView; - ~InstrumentView250() override; + ~InstrumentViewFixedSize() override; } ; diff --git a/plugins/FreeBoy/FreeBoy.cpp b/plugins/FreeBoy/FreeBoy.cpp index d503d135c..b9428c5af 100644 --- a/plugins/FreeBoy/FreeBoy.cpp +++ b/plugins/FreeBoy/FreeBoy.cpp @@ -457,7 +457,7 @@ public: FreeBoyInstrumentView::FreeBoyInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _instrument, _parent ) + InstrumentViewFixedSize( _instrument, _parent ) { setAutoFillBackground( true ); diff --git a/plugins/FreeBoy/FreeBoy.h b/plugins/FreeBoy/FreeBoy.h index 84d2fd2e6..9ceb27966 100644 --- a/plugins/FreeBoy/FreeBoy.h +++ b/plugins/FreeBoy/FreeBoy.h @@ -111,7 +111,7 @@ private: } ; -class FreeBoyInstrumentView : public InstrumentView250 +class FreeBoyInstrumentView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/GigPlayer/GigPlayer.cpp b/plugins/GigPlayer/GigPlayer.cpp index 695378ab1..336922e28 100644 --- a/plugins/GigPlayer/GigPlayer.cpp +++ b/plugins/GigPlayer/GigPlayer.cpp @@ -922,7 +922,7 @@ public: GigInstrumentView::GigInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _instrument, _parent ) + InstrumentViewFixedSize( _instrument, _parent ) { GigInstrument * k = castModel(); diff --git a/plugins/GigPlayer/GigPlayer.h b/plugins/GigPlayer/GigPlayer.h index 8232d7a97..b9467b91b 100644 --- a/plugins/GigPlayer/GigPlayer.h +++ b/plugins/GigPlayer/GigPlayer.h @@ -334,7 +334,7 @@ signals: -class GigInstrumentView : public InstrumentView250 +class GigInstrumentView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/OpulenZ/OpulenZ.cpp b/plugins/OpulenZ/OpulenZ.cpp index ce85e064d..54b518dd8 100644 --- 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 ) : - InstrumentView250( _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 index a986c9f21..2273b355a 100644 --- a/plugins/OpulenZ/OpulenZ.h +++ b/plugins/OpulenZ/OpulenZ.h @@ -142,7 +142,7 @@ private: -class OpulenzInstrumentView : public InstrumentView250 +class OpulenzInstrumentView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/Xpressive/Xpressive.cpp b/plugins/Xpressive/Xpressive.cpp index 929a1c631..7dc26dd03 100644 --- a/plugins/Xpressive/Xpressive.cpp +++ b/plugins/Xpressive/Xpressive.cpp @@ -274,7 +274,7 @@ public: XpressiveView::XpressiveView(Instrument * _instrument, QWidget * _parent) : - InstrumentView250(_instrument, _parent) + InstrumentViewFixedSize(_instrument, _parent) { const int COL_KNOBS = 194; diff --git a/plugins/Xpressive/Xpressive.h b/plugins/Xpressive/Xpressive.h index 422002aa8..5abee2691 100644 --- a/plugins/Xpressive/Xpressive.h +++ b/plugins/Xpressive/Xpressive.h @@ -139,7 +139,7 @@ private: } ; -class XpressiveView : public InstrumentView250 +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 index 16c190170..58fa990a7 100644 --- 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 ) : - InstrumentView250( _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 index 854c2b7cd..43ab0149c 100644 --- a/plugins/audio_file_processor/audio_file_processor.h +++ b/plugins/audio_file_processor/audio_file_processor.h @@ -111,7 +111,7 @@ private: class AudioFileProcessorWaveView; -class AudioFileProcessorView : public InstrumentView250 +class AudioFileProcessorView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp index 563e0e2eb..bb4b4ffb1 100644 --- a/plugins/bit_invader/bit_invader.cpp +++ b/plugins/bit_invader/bit_invader.cpp @@ -327,7 +327,7 @@ PluginView * bitInvader::instantiateView( QWidget * _parent ) bitInvaderView::bitInvaderView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _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 index 60b468683..793831e4a 100644 --- a/plugins/bit_invader/bit_invader.h +++ b/plugins/bit_invader/bit_invader.h @@ -108,7 +108,7 @@ private: -class bitInvaderView : public InstrumentView250 +class bitInvaderView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/carlabase/carla.cpp b/plugins/carlabase/carla.cpp index 7ab862957..3df97ce40 100644 --- 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) - : InstrumentView250(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 index 8a169e4db..393912a50 100644 --- a/plugins/carlabase/carla.h +++ b/plugins/carlabase/carla.h @@ -99,7 +99,7 @@ private: friend class CarlaInstrumentView; }; -class CarlaInstrumentView : public InstrumentView250 +class CarlaInstrumentView : public InstrumentViewFixedSize { Q_OBJECT diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp index 62e46b8b5..dbdb94a2a 100644 --- a/plugins/kicker/kicker.cpp +++ b/plugins/kicker/kicker.cpp @@ -267,7 +267,7 @@ public: kickerInstrumentView::kickerInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _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 index f2dabd1fd..22b2b854f 100644 --- a/plugins/kicker/kicker.h +++ b/plugins/kicker/kicker.h @@ -94,7 +94,7 @@ private: -class kickerInstrumentView : public InstrumentView250 +class kickerInstrumentView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp index dc630ee92..f2f5b2399 100644 --- a/plugins/lb302/lb302.cpp +++ b/plugins/lb302/lb302.cpp @@ -804,7 +804,7 @@ PluginView * lb302Synth::instantiateView( QWidget * _parent ) lb302SynthView::lb302SynthView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _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 index 2d70ccee1..557d958d4 100644 --- a/plugins/lb302/lb302.h +++ b/plugins/lb302/lb302.h @@ -256,7 +256,7 @@ private: } ; -class lb302SynthView : public InstrumentView250 +class lb302SynthView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/monstro/Monstro.cpp b/plugins/monstro/Monstro.cpp index 231517abb..f462fe108 100644 --- a/plugins/monstro/Monstro.cpp +++ b/plugins/monstro/Monstro.cpp @@ -1448,7 +1448,7 @@ void MonstroInstrument::updateSlope2() MonstroView::MonstroView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _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 index 18cce7ad1..fc0cc13b0 100644 --- a/plugins/monstro/Monstro.h +++ b/plugins/monstro/Monstro.h @@ -569,7 +569,7 @@ private: }; -class MonstroView : public InstrumentView250 +class MonstroView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/nes/Nes.cpp b/plugins/nes/Nes.cpp index 345f94249..9f74883a3 100644 --- a/plugins/nes/Nes.cpp +++ b/plugins/nes/Nes.cpp @@ -732,7 +732,7 @@ QPixmap * NesInstrumentView::s_artwork = NULL; NesInstrumentView::NesInstrumentView( Instrument * instrument, QWidget * parent ) : - InstrumentView250( instrument, parent ) + InstrumentViewFixedSize( instrument, parent ) { setAutoFillBackground( true ); QPalette pal; diff --git a/plugins/nes/Nes.h b/plugins/nes/Nes.h index 855cab710..bbf326d32 100644 --- a/plugins/nes/Nes.h +++ b/plugins/nes/Nes.h @@ -294,7 +294,7 @@ private: }; -class NesInstrumentView : public InstrumentView250 +class NesInstrumentView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp index 1c9aa5ab0..3aa0d0c67 100644 --- a/plugins/organic/organic.cpp +++ b/plugins/organic/organic.cpp @@ -418,7 +418,7 @@ public: organicInstrumentView::organicInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _instrument, _parent ), + InstrumentViewFixedSize( _instrument, _parent ), m_oscKnobs( NULL ) { organicInstrument * oi = castModel(); diff --git a/plugins/organic/organic.h b/plugins/organic/organic.h index 083fa6333..c0bc29f16 100644 --- a/plugins/organic/organic.h +++ b/plugins/organic/organic.h @@ -173,7 +173,7 @@ private slots: } ; -class organicInstrumentView : public InstrumentView250 +class organicInstrumentView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp index 61368a575..1402de306 100644 --- 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 ) : - InstrumentView250( _instrument, _parent ), + InstrumentViewFixedSize( _instrument, _parent ), m_pi( NULL ) { setAutoFillBackground( true ); diff --git a/plugins/patman/patman.h b/plugins/patman/patman.h index 014a7d63c..8d5689b73 100644 --- a/plugins/patman/patman.h +++ b/plugins/patman/patman.h @@ -116,7 +116,7 @@ signals: -class PatmanView : public InstrumentView250 +class PatmanView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index f0676dc8c..b10a5d9a4 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -859,7 +859,7 @@ public: sf2InstrumentView::sf2InstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _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 index 20da89adb..1dde587ad 100644 --- a/plugins/sf2_player/sf2_player.h +++ b/plugins/sf2_player/sf2_player.h @@ -187,7 +187,7 @@ public: -class sf2InstrumentView : public InstrumentView250 +class sf2InstrumentView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/sfxr/sfxr.cpp b/plugins/sfxr/sfxr.cpp index c954e72a0..1fd0be9de 100644 --- a/plugins/sfxr/sfxr.cpp +++ b/plugins/sfxr/sfxr.cpp @@ -601,7 +601,7 @@ public: sfxrInstrumentView::sfxrInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _instrument, _parent ) + InstrumentViewFixedSize( _instrument, _parent ) { srand(time(NULL)); setAutoFillBackground( true ); diff --git a/plugins/sfxr/sfxr.h b/plugins/sfxr/sfxr.h index dc601d322..20ae54c96 100644 --- a/plugins/sfxr/sfxr.h +++ b/plugins/sfxr/sfxr.h @@ -223,7 +223,7 @@ private: -class sfxrInstrumentView : public InstrumentView250 +class sfxrInstrumentView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/sid/sid_instrument.cpp b/plugins/sid/sid_instrument.cpp index 2df551f20..edb3181a6 100644 --- a/plugins/sid/sid_instrument.cpp +++ b/plugins/sid/sid_instrument.cpp @@ -481,7 +481,7 @@ public: sidInstrumentView::sidInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _instrument, _parent ) + InstrumentViewFixedSize( _instrument, _parent ) { setAutoFillBackground( true ); diff --git a/plugins/sid/sid_instrument.h b/plugins/sid/sid_instrument.h index 2649b9cba..479d09c5d 100644 --- a/plugins/sid/sid_instrument.h +++ b/plugins/sid/sid_instrument.h @@ -132,7 +132,7 @@ private: -class sidInstrumentView : public InstrumentView250 +class sidInstrumentView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp index a39cd689c..2d7163975 100644 --- 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 ) : - InstrumentView250( _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 index ec13f5eb9..6fd28d41c 100644 --- a/plugins/stk/mallets/mallets.h +++ b/plugins/stk/mallets/mallets.h @@ -187,7 +187,7 @@ private: } ; -class malletsInstrumentView: public InstrumentView250 +class malletsInstrumentView: public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/triple_oscillator/TripleOscillator.cpp b/plugins/triple_oscillator/TripleOscillator.cpp index fa4f3b4ae..e8d8547d9 100644 --- a/plugins/triple_oscillator/TripleOscillator.cpp +++ b/plugins/triple_oscillator/TripleOscillator.cpp @@ -419,7 +419,7 @@ public: TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _instrument, _parent ) + InstrumentViewFixedSize( _instrument, _parent ) { setAutoFillBackground( true ); QPalette pal; diff --git a/plugins/triple_oscillator/TripleOscillator.h b/plugins/triple_oscillator/TripleOscillator.h index b45fea1f3..815fa3505 100644 --- a/plugins/triple_oscillator/TripleOscillator.h +++ b/plugins/triple_oscillator/TripleOscillator.h @@ -136,7 +136,7 @@ private: -class TripleOscillatorView : public InstrumentView250 +class TripleOscillatorView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index c06a771d3..10a156185 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -460,7 +460,7 @@ PluginView * vestigeInstrument::instantiateView( QWidget * _parent ) VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _instrument, _parent ), + InstrumentViewFixedSize( _instrument, _parent ), lastPosInMenu (0) { if( s_artwork == NULL ) @@ -892,7 +892,7 @@ void VestigeInstrumentView::paintEvent( QPaintEvent * ) manageVestigeInstrumentView::manageVestigeInstrumentView( Instrument * _instrument, QWidget * _parent, vestigeInstrument * m_vi2 ) : - InstrumentView250( _instrument, _parent ) + InstrumentViewFixedSize( _instrument, _parent ) { m_vi = m_vi2; m_vi->m_scrollArea = new QScrollArea( this ); diff --git a/plugins/vestige/vestige.h b/plugins/vestige/vestige.h index 423146497..9d74918fd 100644 --- a/plugins/vestige/vestige.h +++ b/plugins/vestige/vestige.h @@ -98,7 +98,7 @@ private: } ; -class manageVestigeInstrumentView : public InstrumentView250 +class manageVestigeInstrumentView : public InstrumentViewFixedSize { Q_OBJECT public: @@ -134,7 +134,7 @@ private: } ; -class VestigeInstrumentView : public InstrumentView250 +class VestigeInstrumentView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp index f0c347b7c..e560b692b 100644 --- a/plugins/vibed/vibed.cpp +++ b/plugins/vibed/vibed.cpp @@ -350,7 +350,7 @@ PluginView * vibed::instantiateView( QWidget * _parent ) vibedView::vibedView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _instrument, _parent ) + InstrumentViewFixedSize( _instrument, _parent ) { setAutoFillBackground( true ); QPalette pal; diff --git a/plugins/vibed/vibed.h b/plugins/vibed/vibed.h index 039b88d24..b1c33f4b7 100644 --- a/plugins/vibed/vibed.h +++ b/plugins/vibed/vibed.h @@ -82,7 +82,7 @@ private: -class vibedView : public InstrumentView250 +class vibedView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/watsyn/Watsyn.cpp b/plugins/watsyn/Watsyn.cpp index 9d45531d5..332e34117 100644 --- a/plugins/watsyn/Watsyn.cpp +++ b/plugins/watsyn/Watsyn.cpp @@ -667,7 +667,7 @@ void WatsynInstrument::updateWaveB2() WatsynView::WatsynView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _instrument, _parent ) + InstrumentViewFixedSize( _instrument, _parent ) { setAutoFillBackground( true ); QPalette pal; diff --git a/plugins/watsyn/Watsyn.h b/plugins/watsyn/Watsyn.h index 27cd65e47..079e532e4 100644 --- a/plugins/watsyn/Watsyn.h +++ b/plugins/watsyn/Watsyn.h @@ -293,7 +293,7 @@ private: }; -class WatsynView : public InstrumentView250 +class WatsynView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp index 42340ab62..214896a9c 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.cpp +++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp @@ -488,7 +488,7 @@ PluginView * ZynAddSubFxInstrument::instantiateView( QWidget * _parent ) ZynAddSubFxView::ZynAddSubFxView( Instrument * _instrument, QWidget * _parent ) : - InstrumentView250( _instrument, _parent ) + InstrumentViewFixedSize( _instrument, _parent ) { setAutoFillBackground( true ); QPalette pal; diff --git a/plugins/zynaddsubfx/ZynAddSubFx.h b/plugins/zynaddsubfx/ZynAddSubFx.h index 88d70d83b..6f5bc754d 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.h +++ b/plugins/zynaddsubfx/ZynAddSubFx.h @@ -132,7 +132,7 @@ signals: -class ZynAddSubFxView : public InstrumentView250 +class ZynAddSubFxView : public InstrumentViewFixedSize { Q_OBJECT public: diff --git a/src/gui/InstrumentView.cpp b/src/gui/InstrumentView.cpp index 86b2fcc91..44fcc2a8a 100644 --- a/src/gui/InstrumentView.cpp +++ b/src/gui/InstrumentView.cpp @@ -73,7 +73,7 @@ InstrumentTrackWindow * InstrumentView::instrumentTrackWindow( void ) -InstrumentView250::~InstrumentView250() +InstrumentViewFixedSize::~InstrumentViewFixedSize() { }