Skip to content

Commit

Permalink
Remove "What's This?" and update tooltips (LMMS#4128)
Browse files Browse the repository at this point in the history
  • Loading branch information
Sawuare authored Jun 5, 2018
1 parent 21467f0 commit 1e78d4a
Show file tree
Hide file tree
Showing 82 changed files with 640 additions and 1,845 deletions.
7 changes: 0 additions & 7 deletions include/CaptionMenu.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@ class EXPORT CaptionMenu : public QMenu
public:
CaptionMenu( const QString & _title, QWidget * _parent = 0 );
virtual ~CaptionMenu();

///
/// \brief Adds a "Help" action displaying the Menu's parent's WhatsThis
/// text when selected.
///
void addHelpAction();

} ;


Expand Down
1 change: 0 additions & 1 deletion include/ControllerView.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ class ControllerView : public QFrame, public ModelView
public slots:
void editControls();
void deleteController();
void displayHelp();
void closeControls();
void renameController();

Expand Down
1 change: 0 additions & 1 deletion include/EffectView.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ public slots:
void moveUp();
void moveDown();
void deletePlugin();
void displayHelp();
void closeEffects();


Expand Down
1 change: 0 additions & 1 deletion include/FxLine.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ private slots:
void removeUnusedChannels();
void moveChannelLeft();
void moveChannelRight();
void displayHelp();
};


Expand Down
1 change: 0 additions & 1 deletion include/Knob.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ class EXPORT Knob : public QWidget, public FloatModelView

private slots:
virtual void enterValue();
void displayHelp();
void friendlyUpdate();
void toggleScale();

Expand Down
1 change: 0 additions & 1 deletion include/MainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ public slots:
void resetWindowTitle();

void emptySlot();
void enterWhatsThisMode();
void createNewProject();
void createNewProjectFromTemplate( QAction * _idx );
void openProject();
Expand Down
4 changes: 0 additions & 4 deletions include/SetupDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ private slots:
// general settings widget
void setBufferSize( int _value );
void resetBufSize();
void displayBufSizeHelp();

// path settings widget
void setWorkingDir( const QString & _wd );
Expand All @@ -86,15 +85,12 @@ private slots:
// performance settings widget
void setAutoSaveInterval( int time );
void resetAutoSave();
void displaySaveIntervalHelp();

// audio settings widget
void audioInterfaceChanged( const QString & _driver );
void displayAudioHelp();

// MIDI settings widget
void midiInterfaceChanged( const QString & _driver );
void displayMIDIHelp();


void toggleToolTips( bool _enabled );
Expand Down
22 changes: 11 additions & 11 deletions plugins/Bitcrush/BitcrushControlDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,59 +55,59 @@ BitcrushControlDialog::BitcrushControlDialog( BitcrushControls * controls ) :
inGain->move( 16, 32 );
inGain->setModel( & controls->m_inGain );
inGain->setLabel( tr( "GAIN" ) );
inGain->setHintText( tr( "Input Gain:" ) + " ", " dBFS" );
inGain->setHintText( tr( "Input gain:" ) , " dBFS" );

Knob * inNoise = new Knob( knobBright_26, this );
inNoise->move( 14, 76 );
inNoise->setModel( & controls->m_inNoise );
inNoise->setLabel( tr( "NOISE" ) );
inNoise->setHintText( tr( "Input Noise:" ) + " ", "%" );
inNoise->setHintText( tr( "Input noise:" ) , "%" );


// output knobs
Knob * outGain = new Knob( knobBright_26, this );
outGain->move( 138, 32 );
outGain->setModel( & controls->m_outGain );
outGain->setLabel( tr( "GAIN" ) );
outGain->setHintText( tr( "Output Gain:" ) + " ", " dBFS" );
outGain->setHintText( tr( "Output gain:" ) , " dBFS" );

Knob * outClip = new Knob( knobBright_26, this );
outClip->move( 138, 76 );
outClip->setModel( & controls->m_outClip );
outClip->setLabel( tr( "CLIP" ) );
outClip->setHintText( tr( "Output Clip:" ) + " ", "%" );
outClip->setHintText( tr( "Output clip:" ) , "%" );


// leds
LedCheckBox * rateEnabled = new LedCheckBox( "", this, tr( "Rate Enabled" ), LedCheckBox::Green );
LedCheckBox * rateEnabled = new LedCheckBox( "", this, tr( "Rate enabled" ), LedCheckBox::Green );
rateEnabled->move( 64, 14 );
rateEnabled->setModel( & controls->m_rateEnabled );
ToolTip::add( rateEnabled, tr( "Enable samplerate-crushing" ) );
ToolTip::add( rateEnabled, tr( "Enable sample-rate crushing" ) );

LedCheckBox * depthEnabled = new LedCheckBox( "", this, tr( "Depth Enabled" ), LedCheckBox::Green );
LedCheckBox * depthEnabled = new LedCheckBox( "", this, tr( "Depth enabled" ), LedCheckBox::Green );
depthEnabled->move( 101, 14 );
depthEnabled->setModel( & controls->m_depthEnabled );
ToolTip::add( depthEnabled, tr( "Enable bitdepth-crushing" ) );
ToolTip::add( depthEnabled, tr( "Enable bit-depth crushing" ) );


// rate crushing knobs
Knob * rate = new Knob( knobBright_26, this );
rate->move( 59, 32 );
rate->setModel( & controls->m_rate );
rate->setLabel( tr( "FREQ" ) );
rate->setHintText( tr( "Sample rate:" ) + " ", " Hz" );
rate->setHintText( tr( "Sample rate:" ) , " Hz" );

Knob * stereoDiff = new Knob( knobBright_26, this );
stereoDiff->move( 72, 76 );
stereoDiff->setModel( & controls->m_stereoDiff );
stereoDiff->setLabel( tr( "STEREO" ) );
stereoDiff->setHintText( tr( "Stereo difference:" ) + " ", "%" );
stereoDiff->setHintText( tr( "Stereo difference:" ) , "%" );


// depth crushing knob
Knob * levels = new Knob( knobBright_26, this );
levels->move( 92, 32 );
levels->setModel( & controls->m_levels );
levels->setLabel( tr( "QUANT" ) );
levels->setHintText( tr( "Levels:" ) + " ", "" );
levels->setHintText( tr( "Levels:" ) , "" );
}
18 changes: 9 additions & 9 deletions plugins/Bitcrush/BitcrushControls.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
BitcrushControls::BitcrushControls( BitcrushEffect * eff ) :
EffectControls( eff ),
m_effect( eff ),
m_inGain( 0.0f, -20.0f, 20.0f, 0.1f, this, "Input gain" ),
m_inNoise( 0.0f, 0.0f, 100.0f, 0.1f, this, "Input noise" ),
m_outGain( 0.0f, -20.0f, 20.0f, 0.1f, this, "Output gain" ),
m_outClip( 0.0f, -20.0f, 20.0f, 0.1f, this, "Output clip" ),
m_rate( 44100.f, 20.f, 44100.f, 1.0f, this, "Samplerate" ),
m_stereoDiff( 0.f, 0.f, 50.f, 0.1f, this, "Stereo difference" ),
m_levels( 256.f, 1.f, 256.f, 1.0f, this, "Levels" ),
m_rateEnabled( true, this, "Rate enabled" ),
m_depthEnabled( true, this, "Depth enabled" )
m_inGain( 0.0f, -20.0f, 20.0f, 0.1f, this, tr( "Input gain" ) ),
m_inNoise( 0.0f, 0.0f, 100.0f, 0.1f, this, tr( "Input noise" ) ),
m_outGain( 0.0f, -20.0f, 20.0f, 0.1f, this, tr( "Output gain" ) ),
m_outClip( 0.0f, -20.0f, 20.0f, 0.1f, this, tr( "Output clip" ) ),
m_rate( 44100.f, 20.f, 44100.f, 1.0f, this, tr( "Sample rate" ) ),
m_stereoDiff( 0.f, 0.f, 50.f, 0.1f, this, tr( "Stereo difference" ) ),
m_levels( 256.f, 1.f, 256.f, 1.0f, this, tr( "Levels" ) ),
m_rateEnabled( true, this, tr( "Rate enabled" ) ),
m_depthEnabled( true, this, tr( "Depth enabled" ) )
{
m_rate.setStrictStepSize( true );
m_levels.setStrictStepSize( true );
Expand Down
38 changes: 19 additions & 19 deletions plugins/CrossoverEQ/CrossoverEQControlDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,67 +49,67 @@ CrossoverEQControlDialog::CrossoverEQControlDialog( CrossoverEQControls * contro
xover12->move( 29, 11 );
xover12->setModel( & controls->m_xover12 );
xover12->setLabel( "1/2" );
xover12->setHintText( tr( "Band 1/2 Crossover:" ), " Hz" );
xover12->setHintText( tr( "Band 1/2 crossover:" ), " Hz" );

Knob * xover23 = new Knob( knobBright_26, this );
xover23->move( 69, 11 );
xover23->setModel( & controls->m_xover23 );
xover23->setLabel( "2/3" );
xover23->setHintText( tr( "Band 2/3 Crossover:" ), " Hz" );
xover23->setHintText( tr( "Band 2/3 crossover:" ), " Hz" );

Knob * xover34 = new Knob( knobBright_26, this );
xover34->move( 109, 11 );
xover34->setModel( & controls->m_xover34 );
xover34->setLabel( "3/4" );
xover34->setHintText( tr( "Band 3/4 Crossover:" ), " Hz" );
xover34->setHintText( tr( "Band 3/4 crossover:" ), " Hz" );

m_fader_bg = QPixmap( PLUGIN_NAME::getIconPixmap( "fader_bg" ) );
m_fader_empty = QPixmap( PLUGIN_NAME::getIconPixmap( "fader_empty" ) );
m_fader_knob = QPixmap( PLUGIN_NAME::getIconPixmap( "fader_knob2" ) );

// faders
Fader * gain1 = new Fader( &controls->m_gain1, "Band 1 Gain", this,
Fader * gain1 = new Fader( &controls->m_gain1, tr( "Band 1 gain" ), this,
&m_fader_bg, &m_fader_empty, &m_fader_knob );
gain1->move( 7, 56 );
gain1->setDisplayConversion( false );
gain1->setHintText( tr( "Band 1 Gain:" ), " dBFS" );
gain1->setHintText( tr( "Band 1 gain:" ), " dBFS" );

Fader * gain2 = new Fader( &controls->m_gain2, "Band 2 Gain", this,
Fader * gain2 = new Fader( &controls->m_gain2, tr( "Band 2 gain" ), this,
&m_fader_bg, &m_fader_empty, &m_fader_knob );
gain2->move( 47, 56 );
gain2->setDisplayConversion( false );
gain2->setHintText( tr( "Band 2 Gain:" ), " dBFS" );
gain2->setHintText( tr( "Band 2 gain:" ), " dBFS" );

Fader * gain3 = new Fader( &controls->m_gain3, "Band 3 Gain", this,
Fader * gain3 = new Fader( &controls->m_gain3, tr( "Band 3 gain" ), this,
&m_fader_bg, &m_fader_empty, &m_fader_knob );
gain3->move( 87, 56 );
gain3->setDisplayConversion( false );
gain3->setHintText( tr( "Band 3 Gain:" ), " dBFS" );
gain3->setHintText( tr( "Band 3 gain:" ), " dBFS" );

Fader * gain4 = new Fader( &controls->m_gain4, "Band 4 Gain", this,
Fader * gain4 = new Fader( &controls->m_gain4, tr( "Band 4 gain" ), this,
&m_fader_bg, &m_fader_empty, &m_fader_knob );
gain4->move( 127, 56 );
gain4->setDisplayConversion( false );
gain4->setHintText( tr( "Band 4 Gain:" ), " dBFS" );
gain4->setHintText( tr( "Band 4 gain:" ), " dBFS" );

// leds
LedCheckBox * mute1 = new LedCheckBox( "", this, tr( "Band 1 Mute" ), LedCheckBox::Green );
LedCheckBox * mute1 = new LedCheckBox( "", this, tr( "Band 1 mute" ), LedCheckBox::Green );
mute1->move( 15, 154 );
mute1->setModel( & controls->m_mute1 );
ToolTip::add( mute1, tr( "Mute Band 1" ) );
ToolTip::add( mute1, tr( "Mute band 1" ) );

LedCheckBox * mute2 = new LedCheckBox( "", this, tr( "Band 2 Mute" ), LedCheckBox::Green );
LedCheckBox * mute2 = new LedCheckBox( "", this, tr( "Band 2 mute" ), LedCheckBox::Green );
mute2->move( 55, 154 );
mute2->setModel( & controls->m_mute2 );
ToolTip::add( mute2, tr( "Mute Band 2" ) );
ToolTip::add( mute2, tr( "Mute band 2" ) );

LedCheckBox * mute3 = new LedCheckBox( "", this, tr( "Band 3 Mute" ), LedCheckBox::Green );
LedCheckBox * mute3 = new LedCheckBox( "", this, tr( "Band 3 mute" ), LedCheckBox::Green );
mute3->move( 95, 154 );
mute3->setModel( & controls->m_mute3 );
ToolTip::add( mute3, tr( "Mute Band 3" ) );
ToolTip::add( mute3, tr( "Mute band 3" ) );

LedCheckBox * mute4 = new LedCheckBox( "", this, tr( "Band 4 Mute" ), LedCheckBox::Green );
LedCheckBox * mute4 = new LedCheckBox( "", this, tr( "Band 4 mute" ), LedCheckBox::Green );
mute4->move( 135, 154 );
mute4->setModel( & controls->m_mute4 );
ToolTip::add( mute4, tr( "Mute Band 4" ) );
ToolTip::add( mute4, tr( "Mute band 4" ) );
}
6 changes: 3 additions & 3 deletions plugins/Delay/DelayControls.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
DelayControls::DelayControls( DelayEffect* effect ):
EffectControls( effect ),
m_effect ( effect ),
m_delayTimeModel( 0.5, 0.01, 5.0, 0.0001, 5000.0, this, tr( "Delay Samples" )) ,
m_delayTimeModel( 0.5, 0.01, 5.0, 0.0001, 5000.0, this, tr( "Delay samples" )) ,
m_feedbackModel(0.0f,0.0f,1.0f,0.01f,this,tr( "Feedback" ) ),
m_lfoTimeModel(2.0, 0.01, 5.0, 0.0001, 20000.0, this, tr( "Lfo Frequency" ) ),
m_lfoAmountModel(0.0, 0.0, 0.5, 0.0001, 2000.0, this, tr ( "Lfo Amount" ) ),
m_lfoTimeModel(2.0, 0.01, 5.0, 0.0001, 20000.0, this, tr( "LFO frequency" ) ),
m_lfoAmountModel(0.0, 0.0, 0.5, 0.0001, 2000.0, this, tr ( "LFO amount" ) ),
m_outGainModel( 0.0, -60.0, 20.0, 0.01, this, tr( "Output gain" ) )
{
connect( Engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( changeSampleRate() ) );
Expand Down
10 changes: 5 additions & 5 deletions plugins/Delay/DelayControlsDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,30 +47,30 @@ DelayControlsDialog::DelayControlsDialog( DelayControls *controls ) :
sampleDelayKnob->setVolumeKnob( false );
sampleDelayKnob->setModel( &controls->m_delayTimeModel );
sampleDelayKnob->setLabel( tr( "DELAY" ) );
sampleDelayKnob->setHintText( tr( "Delay Time" ) + " ", " s" );
sampleDelayKnob->setHintText( tr( "Delay time" ) + " ", " s" );

Knob * feedbackKnob = new Knob( knobBright_26, this );
feedbackKnob->move( 11, 58 );
feedbackKnob->setVolumeKnob( true) ;
feedbackKnob->setModel( &controls->m_feedbackModel);
feedbackKnob->setLabel( tr( "FDBK" ) );
feedbackKnob->setHintText( tr ( "Feedback Amount" ) + " " , "" );
feedbackKnob->setHintText( tr ( "Feedback amount" ) + " " , "" );

TempoSyncKnob * lfoFreqKnob = new TempoSyncKnob( knobBright_26, this );
lfoFreqKnob->move( 11, 119 );
lfoFreqKnob->setVolumeKnob( false );
lfoFreqKnob->setModel( &controls->m_lfoTimeModel );
lfoFreqKnob->setLabel( tr( "RATE" ) );
lfoFreqKnob->setHintText( tr ( "Lfo") + " ", " s" );
lfoFreqKnob->setHintText( tr ( "LFO frequency") + " ", " s" );

TempoSyncKnob * lfoAmtKnob = new TempoSyncKnob( knobBright_26, this );
lfoAmtKnob->move( 11, 159 );
lfoAmtKnob->setVolumeKnob( false );
lfoAmtKnob->setModel( &controls->m_lfoAmountModel );
lfoAmtKnob->setLabel( tr( "AMNT" ) );
lfoAmtKnob->setHintText( tr ( "Lfo Amt" ) + " " , " s" );
lfoAmtKnob->setHintText( tr ( "LFO amount" ) + " " , " s" );

EqFader * outFader = new EqFader( &controls->m_outGainModel,tr( "Out Gain" ),
EqFader * outFader = new EqFader( &controls->m_outGainModel,tr( "Out gain" ),
this, &controls->m_outPeakL, &controls->m_outPeakR );
outFader->setMaximumHeight( 196 );
outFader->move( 263, 45 );
Expand Down
4 changes: 2 additions & 2 deletions plugins/DualFilter/DualFilterControlDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ DualFilterControlDialog::DualFilterControlDialog( DualFilterControls* controls )

enabled1Toggle -> move( 12, 11 );
enabled1Toggle -> setModel( &controls -> m_enabled1Model );
ToolTip::add( enabled1Toggle, tr( "Click to enable/disable Filter 1" ) );
ToolTip::add( enabled1Toggle, tr( "Enable/disable filter 1" ) );
enabled2Toggle -> move( 210, 11 );
enabled2Toggle -> setModel( &controls -> m_enabled2Model );
ToolTip::add( enabled2Toggle, tr( "Click to enable/disable Filter 2" ) );
ToolTip::add( enabled2Toggle, tr( "Enable/disable filter 2" ) );

ComboBox * m_filter1ComboBox = new ComboBox( this );
m_filter1ComboBox->setGeometry( 19, 70, 137, 22 );
Expand Down
Loading

0 comments on commit 1e78d4a

Please sign in to comment.