FX-Fader: added accessibleName property for FX faders for not displaying
an empty titlebar in context-menu
(cherry picked from commit c24b923b78)
Conflicts:
src/gui/fx_mixer_view.cpp
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* fader.h - fader-widget used in FX-mixer - partly taken from Hydrogen
|
||||
*
|
||||
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
* Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
@@ -58,7 +58,7 @@ class fader : public QWidget, public floatModelView
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
fader( floatModel * _model, QWidget * _parent );
|
||||
fader( floatModel * _model, const QString & _name, QWidget * _parent );
|
||||
virtual ~fader();
|
||||
|
||||
void setMaxPeak( float _max );
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* fx_mixer_view.cpp - effect-mixer-view for LMMS
|
||||
*
|
||||
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
* Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
@@ -97,6 +97,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private:
|
||||
fxMixerView * m_mv;
|
||||
QString & m_name;
|
||||
@@ -173,6 +174,7 @@ fxMixerView::fxMixerView() :
|
||||
|
||||
|
||||
cv->m_fader = new fader( &m->m_fxChannels[i]->m_volumeModel,
|
||||
tr( "FX Fader %1" ).arg( i ),
|
||||
cv->m_fxLine );
|
||||
cv->m_fader->move( 15-cv->m_fader->width()/2,
|
||||
cv->m_fxLine->height()-
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* fader.cpp - fader-widget used in mixer - partly taken from Hydrogen
|
||||
*
|
||||
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
* Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
@@ -57,7 +57,7 @@
|
||||
|
||||
|
||||
|
||||
fader::fader( floatModel * _model, QWidget * _parent ) :
|
||||
fader::fader( floatModel * _model, const QString & _name, QWidget * _parent ) :
|
||||
QWidget( _parent ),
|
||||
floatModelView( _model, this ),
|
||||
m_model( _model ),
|
||||
@@ -69,6 +69,7 @@ fader::fader( floatModel * _model, QWidget * _parent ) :
|
||||
m_leds( embed::getIconPixmap( "fader_leds" ) ),
|
||||
m_knob( embed::getIconPixmap( "fader_knob" ) )
|
||||
{
|
||||
setAccessibleName( _name );
|
||||
setAttribute( Qt::WA_OpaquePaintEvent, true );
|
||||
setMinimumSize( 23, 116 );
|
||||
setMaximumSize( 23, 116);
|
||||
|
||||
Reference in New Issue
Block a user