Diffstat (limited to 'core/applets/volumeapplet/volume.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/volumeapplet/volume.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index 344f86f..e393f0f 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp | |||
@@ -224,25 +224,26 @@ void VolumeApplet::mouseReleaseEvent( QMouseEvent * ) | |||
224 | 224 | ||
225 | void VolumeApplet::advVolControl() | 225 | void VolumeApplet::advVolControl() |
226 | { | 226 | { |
227 | showVolControl(TRUE); | 227 | showVolControl(TRUE); |
228 | } | 228 | } |
229 | 229 | ||
230 | void VolumeApplet::showVolControl(bool showMic) | 230 | void VolumeApplet::showVolControl(bool showMic) |
231 | { | 231 | { |
232 | Config cfg("Sound"); | 232 | Config cfg("Sound"); |
233 | cfg.setGroup("System"); | 233 | cfg.setGroup("System"); |
234 | volumePercent = cfg.readNumEntry("Volume",50); | 234 | volumePercent = cfg.readNumEntry("Volume",50); |
235 | micPercent = cfg.readNumEntry("Mic", 50); | 235 | micPercent = cfg.readNumEntry("Mic", 50); |
236 | 236 | QString show = cfg.readEntry("ShowMic", "FALSE"); | |
237 | if(show == "TRUE") showMic = TRUE; | ||
237 | // Create a small volume control window to adjust the volume with | 238 | // Create a small volume control window to adjust the volume with |
238 | VolumeControl *vc = new VolumeControl(showMic); | 239 | VolumeControl *vc = new VolumeControl(showMic); |
239 | vc->slider->setValue( 100 - volumePercent ); | 240 | vc->slider->setValue( 100 - volumePercent ); |
240 | if (showMic) | 241 | if (showMic) |
241 | { | 242 | { |
242 | vc->mic->setValue( 100 - micPercent ); | 243 | vc->mic->setValue( 100 - micPercent ); |
243 | connect( vc->mic, SIGNAL( valueChanged( int ) ), this, SLOT( micMoved( int ) ) ); | 244 | connect( vc->mic, SIGNAL( valueChanged( int ) ), this, SLOT( micMoved( int ) ) ); |
244 | } | 245 | } |
245 | 246 | ||
246 | vc->muteBox->setChecked( muted ); | 247 | vc->muteBox->setChecked( muted ); |
247 | connect( vc->slider, SIGNAL( valueChanged( int ) ), this, SLOT( sliderMoved( int ) ) ); | 248 | connect( vc->slider, SIGNAL( valueChanged( int ) ), this, SLOT( sliderMoved( int ) ) ); |
248 | connect( vc->muteBox, SIGNAL( toggled( bool ) ), this, SLOT( mute( bool ) ) ); | 249 | connect( vc->muteBox, SIGNAL( toggled( bool ) ), this, SLOT( mute( bool ) ) ); |