author | llornkcor <llornkcor> | 2002-05-23 02:03:12 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-05-23 02:03:12 (UTC) |
commit | d295491048567c8424643b983a21dc503857d91a (patch) (side-by-side diff) | |
tree | 54cc32b49eef8518ffbeeacb99ffcbb35ec60769 /core/applets/volumeapplet | |
parent | 7cec3bc3d3b8945e80c9171b9173d3d2dbdd2eaf (diff) | |
download | opie-d295491048567c8424643b983a21dc503857d91a.zip opie-d295491048567c8424643b983a21dc503857d91a.tar.gz opie-d295491048567c8424643b983a21dc503857d91a.tar.bz2 |
new sound config
-rw-r--r-- | core/applets/volumeapplet/volume.cpp | 126 | ||||
-rw-r--r-- | core/applets/volumeapplet/volume.h | 9 |
2 files changed, 103 insertions, 32 deletions
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index e393f0f..e8921f0 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp @@ -51,10 +51,10 @@ VolumeControl::VolumeControl( bool showMic, QWidget *parent, const char *name ) } void VolumeControl::createView(bool showMic) { - Config cfg("Sound"); - cfg.setGroup("System"); + Config cfg("qpe"); + cfg.setGroup("Volume"); //showMic = TRUE; QHBoxLayout *hboxLayout = new QHBoxLayout(this); hboxLayout->setMargin( 3 ); hboxLayout->setSpacing( 0); @@ -67,8 +67,11 @@ void VolumeControl::createView(bool showMic) downButton->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) ); downButton->setPixmap( Resource::loadPixmap( "down" ) ); vboxButtons->setSpacing( 2 ); + upButton->setFixedHeight(26); + downButton->setFixedHeight(26); + vboxButtons->addWidget( upButton ); vboxButtons->addWidget( downButton ); QVBoxLayout *vbox = new QVBoxLayout( this ); @@ -78,17 +81,17 @@ void VolumeControl::createView(bool showMic) slider->setRange( 0, 100 ); slider->setTickmarks( QSlider::Both ); slider->setTickInterval( 20 ); slider->setFocusPolicy( QWidget::NoFocus ); - slider->setValue(cfg.readNumEntry("Volume")); + slider->setValue(cfg.readNumEntry("VolumePercent")); QVBoxLayout *sbox = new QVBoxLayout(this); sbox->setMargin( 3 ); sbox->setSpacing( 3 ); sbox->addWidget( new QLabel("Vol", this) , 0, Qt::AlignVCenter | Qt::AlignHCenter ); sbox->addWidget( slider, 0, Qt::AlignVCenter | Qt::AlignHCenter ); - if (showMic == TRUE) { +// if (showMic == TRUE) { mic = new QSlider(this); mic->setRange( 0, 100 ); mic->setTickmarks( QSlider::Both ); mic->setTickInterval( 20 ); @@ -105,26 +108,54 @@ void VolumeControl::createView(bool showMic) hbox->setMargin( 3 ); hbox->setSpacing( 3 ); hbox->addLayout( sbox, 1); hbox->addLayout( mbox, 1); - } + // } muteBox = new QCheckBox( tr("Mute"), this ); muteBox->setFocusPolicy( QWidget::NoFocus ); + QVBoxLayout *klbox = new QVBoxLayout(this); + + QLabel *Label1; + Label1 = new QLabel( this, "Label1" ); + Label1->setText( tr( "Enable Sounds for:" )); + + alarmSound = new QCheckBox( tr("Alarm Sound"), this ); + alarmSound->setFocusPolicy( QWidget::NoFocus ); + + keyclicks = new QCheckBox( tr("Key Clicks"), this ); + keyclicks->setFocusPolicy( QWidget::NoFocus ); + + screentaps = new QCheckBox( tr("Screen taps"), this ); + screentaps->setFocusPolicy( QWidget::NoFocus ); + + + keyclicks->setChecked( cfg.readBoolEntry("KeySound",0)); + screentaps->setChecked( cfg.readBoolEntry("TouchSound",0)); + alarmSound->setChecked( cfg.readBoolEntry("AlarmSound",1)); + + klbox->setMargin( 3 ); + klbox->setSpacing( 0 ); + klbox->addWidget( Label1, 1); + klbox->addWidget( alarmSound, 1); + klbox->addWidget( keyclicks, 1); + klbox->addWidget( screentaps, 1); vbox->setMargin( 3 ); vbox->setSpacing( 0 ); - if (showMic == TRUE) +// if (showMic == TRUE) vbox->addLayout( hbox, 1 ); - else - vbox->addLayout( sbox, 1); +// else +// vbox->addLayout( sbox, 1); vbox->addWidget( muteBox, 0, Qt::AlignVCenter | Qt::AlignHCenter ); hboxLayout->addLayout( vboxButtons ); hboxLayout->addLayout(vbox); + hboxLayout->addLayout( klbox); + setFixedHeight( 120 ); - setFixedWidth( sizeHint().width() ); +// setFixedWidth( sizeHint().width() ); setFocusPolicy(QWidget::NoFocus); connect( upButton, SIGNAL( pressed() ), this, SLOT( ButtonChanged() ) ); connect( upButton, SIGNAL( released() ), this, SLOT( ButtonChanged() ) ); connect( downButton, SIGNAL( pressed() ), this, SLOT( ButtonChanged() ) ); @@ -178,17 +209,17 @@ void VolumeControl::rateTimerDone() VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { - Config cfg("Sound"); - cfg.setGroup("System"); + Config cfg("qpe"); + cfg.setGroup("Volume"); setFixedHeight( 18 ); setFixedWidth( 14 ); volumePixmap = Resource::loadPixmap( "volume" ); - volumePercent = cfg.readNumEntry("Volume",50); + volumePercent = cfg.readNumEntry("VolumePercent",50); micPercent = cfg.readNumEntry("Mic", 50); muted = FALSE; // ### read from pref micMuted = FALSE; // ### read from pref @@ -228,28 +259,39 @@ void VolumeApplet::advVolControl() } void VolumeApplet::showVolControl(bool showMic) { - Config cfg("Sound"); - cfg.setGroup("System"); - volumePercent = cfg.readNumEntry("Volume",50); + Config cfg("qpe"); + cfg.setGroup("Volume"); + volumePercent = cfg.readNumEntry("VolumePercent",50); micPercent = cfg.readNumEntry("Mic", 50); - QString show = cfg.readEntry("ShowMic", "FALSE"); - if(show == "TRUE") showMic = TRUE; + // Create a small volume control window to adjust the volume with VolumeControl *vc = new VolumeControl(showMic); vc->slider->setValue( 100 - volumePercent ); - if (showMic) - { +// if (showMic) +// { vc->mic->setValue( 100 - micPercent ); connect( vc->mic, SIGNAL( valueChanged( int ) ), this, SLOT( micMoved( int ) ) ); - } +// } vc->muteBox->setChecked( muted ); connect( vc->slider, SIGNAL( valueChanged( int ) ), this, SLOT( sliderMoved( int ) ) ); connect( vc->muteBox, SIGNAL( toggled( bool ) ), this, SLOT( mute( bool ) ) ); + + Config config("qpe"); + config.setGroup("Volume"); + + vc->keyclicks->setChecked( config.readBoolEntry("KeySound",0)); + vc->screentaps->setChecked( config.readBoolEntry("TouchSound",0)); + vc->alarmSound->setChecked( config.readBoolEntry("AlarmSound",1)); + + connect( vc->alarmSound, SIGNAL(toggled(bool)), this, SLOT( alarmSoundCheckToggled(bool))); + connect( vc->keyclicks, SIGNAL(toggled(bool)), this, SLOT( keyclicksCheckToggled(bool))); + connect( vc->screentaps, SIGNAL(toggled(bool)), this, SLOT( screentapsCheckToggled(bool))); + QPoint curPos = mapToGlobal( rect().topLeft() ); - vc->move( curPos.x()-(vc->sizeHint().width()-width())/2, curPos.y() - 120 ); + vc->move( curPos.x()-(vc->sizeHint().width()/2+50), curPos.y() - 120 ); vc->show(); advancedTimer->stop(); } @@ -301,17 +343,17 @@ void VolumeApplet::micMoved( int percent ) } void VolumeApplet::readSystemVolume() { - Config cfg("Sound"); - cfg.setGroup("System"); - volumePercent = cfg.readNumEntry("Volume"); + Config cfg("qpe"); + cfg.setGroup("Volume"); + volumePercent = cfg.readNumEntry("VolumePercent"); } void VolumeApplet::readSystemMic() { - Config cfg("Sound"); - cfg.setGroup("System"); + Config cfg("qpe"); + cfg.setGroup("Volume"); micPercent = cfg.readNumEntry("Mic"); } void VolumeApplet::setVolume( int percent ) @@ -332,11 +374,11 @@ void VolumeApplet::setMic( int percent ) void VolumeApplet::writeSystemVolume() { { - Config cfg("Sound"); - cfg.setGroup("System"); - cfg.writeEntry("Volume",volumePercent); + Config cfg("qpe"); + cfg.setGroup("Volume"); + cfg.writeEntry("VolumePercent",volumePercent); } #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) // Send notification that the volume has changed QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; @@ -345,10 +387,10 @@ void VolumeApplet::writeSystemVolume() void VolumeApplet::writeSystemMic() { { - Config cfg("Sound"); - cfg.setGroup("System"); + Config cfg("qpe"); + cfg.setGroup("Volume"); cfg.writeEntry("Mic",micPercent); } #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) // Send notification that the volume has changed @@ -377,4 +419,26 @@ void VolumeApplet::paintEvent( QPaintEvent* ) p.drawLine( width() - 2, 2, 1, height() - 5 ); p.drawLine( width() - 2, 3, 1, height() - 4 ); } } + +void VolumeApplet::screentapsCheckToggled(bool b) { + Config cfg("qpe"); + cfg.setGroup("Volume"); + cfg.writeEntry("TouchSound",b ); + cfg.write(); +} + +void VolumeApplet::keyclicksCheckToggled(bool b) { + Config cfg("qpe"); + cfg.setGroup("Volume"); + cfg.writeEntry("KeySound",b); + cfg.write(); +} + +void VolumeApplet::alarmSoundCheckToggled(bool b) { + Config cfg("qpe"); + cfg.setGroup("Volume"); + cfg.writeEntry("AlarmSound",b); + cfg.write(); +} + diff --git a/core/applets/volumeapplet/volume.h b/core/applets/volumeapplet/volume.h index 3a2da43..6e631f2 100644 --- a/core/applets/volumeapplet/volume.h +++ b/core/applets/volumeapplet/volume.h @@ -22,9 +22,8 @@ #define __VOLUME_APPLET_H__ #include <qwidget.h> -#include <qpushbutton.h> #include <qframe.h> #include <qpixmap.h> #include <qguardedptr.h> #include <qtimer.h> @@ -41,8 +40,12 @@ public: public: QSlider *slider; QSlider *mic; QCheckBox *muteBox; + QCheckBox *alarmSound; + QCheckBox *screentaps; + QCheckBox *keyclicks; + private: QPushButton *upButton; QPushButton *downButton; @@ -93,8 +96,12 @@ private: void keyPressEvent ( QKeyEvent * e ); void mouseReleaseEvent( QMouseEvent *); void writeSystemMic(); +protected slots: + void alarmSoundCheckToggled(bool); + void keyclicksCheckToggled(bool); + void screentapsCheckToggled(bool); }; #endif // __VOLUME_APPLET_H__ |