summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-05-06 12:25:13 (UTC)
committer llornkcor <llornkcor>2002-05-06 12:25:13 (UTC)
commitc556c027c47921970b11f79aaa4429c2174b5c5b (patch) (unidiff)
treef9be4d90d54eb160aeb28bd7f6d8fb10c1c2db49
parent5549afd820c485db5ec70ad5bf1faed5821ab04a (diff)
downloadopie-c556c027c47921970b11f79aaa4429c2174b5c5b.zip
opie-c556c027c47921970b11f79aaa4429c2174b5c5b.tar.gz
opie-c556c027c47921970b11f79aaa4429c2174b5c5b.tar.bz2
added config file setting for showing mic level Sound.conf [System] ShowMic = TRUE will get you in!
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/volumeapplet/volume.cpp3
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
@@ -204,65 +204,66 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
204 204
205VolumeApplet::~VolumeApplet() 205VolumeApplet::~VolumeApplet()
206{ 206{
207} 207}
208 208
209void VolumeApplet::keyPressEvent ( QKeyEvent * e ) 209void VolumeApplet::keyPressEvent ( QKeyEvent * e )
210{ 210{
211 QString s; 211 QString s;
212 s.setNum(e->key()); 212 s.setNum(e->key());
213 qWarning(s); 213 qWarning(s);
214} 214}
215void VolumeApplet::mousePressEvent( QMouseEvent * ) 215void VolumeApplet::mousePressEvent( QMouseEvent * )
216{ 216{
217 advancedTimer->start( 750, TRUE ); 217 advancedTimer->start( 750, TRUE );
218} 218}
219 219
220void VolumeApplet::mouseReleaseEvent( QMouseEvent * ) 220void VolumeApplet::mouseReleaseEvent( QMouseEvent * )
221{ 221{
222 showVolControl(FALSE); 222 showVolControl(FALSE);
223} 223}
224 224
225void VolumeApplet::advVolControl() 225void VolumeApplet::advVolControl()
226{ 226{
227 showVolControl(TRUE); 227 showVolControl(TRUE);
228} 228}
229 229
230void VolumeApplet::showVolControl(bool showMic) 230void 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 ) ) );
249 QPoint curPos = mapToGlobal( rect().topLeft() ); 250 QPoint curPos = mapToGlobal( rect().topLeft() );
250 vc->move( curPos.x()-(vc->sizeHint().width()-width())/2, curPos.y() - 120 ); 251 vc->move( curPos.x()-(vc->sizeHint().width()-width())/2, curPos.y() - 120 );
251 vc->show(); 252 vc->show();
252 253
253 advancedTimer->stop(); 254 advancedTimer->stop();
254} 255}
255 256
256void VolumeApplet::volumeChanged( bool nowMuted ) 257void VolumeApplet::volumeChanged( bool nowMuted )
257{ 258{
258 int previousVolume = volumePercent; 259 int previousVolume = volumePercent;
259 260
260 if ( !nowMuted ) 261 if ( !nowMuted )
261 readSystemVolume(); 262 readSystemVolume();
262 263
263 // Handle case where muting it toggled 264 // Handle case where muting it toggled
264 if ( muted != nowMuted ) { 265 if ( muted != nowMuted ) {
265 muted = nowMuted; 266 muted = nowMuted;
266 repaint( TRUE ); 267 repaint( TRUE );
267 return; 268 return;
268 } 269 }