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 | |
parent | 7cec3bc3d3b8945e80c9171b9173d3d2dbdd2eaf (diff) | |
download | opie-d295491048567c8424643b983a21dc503857d91a.zip opie-d295491048567c8424643b983a21dc503857d91a.tar.gz opie-d295491048567c8424643b983a21dc503857d91a.tar.bz2 |
new sound config
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 14 | ||||
-rw-r--r-- | core/applets/volumeapplet/volume.cpp | 168 | ||||
-rw-r--r-- | core/applets/volumeapplet/volume.h | 9 |
3 files changed, 130 insertions, 61 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index c27050d..7cc4062 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -270,5 +270,5 @@ bool VMemo::startRecording() { if ( recording) return FALSE;; - Config config( "Sound" ); + Config config( "Vmemo" ); config.setGroup( "System" ); useAlerts = config.readBoolEntry("Alert"); @@ -289,14 +289,12 @@ bool VMemo::startRecording() { } - Config vmCfg("VMemo"); - vmCfg.setGroup("Defaults"); + config.setGroup("Defaults"); QDateTime dt = QDateTime::currentDateTime(); QString fName; - Config cfg( "Sound" ); - cfg.setGroup( "System" ); + config.setGroup( "System" ); fName = QPEApplication::documentDir() ; - fileName = cfg.readEntry("RecLocation", fName); + fileName = config.readEntry("RecLocation", fName); int s; @@ -326,5 +324,5 @@ bool VMemo::startRecording() { QArray<int> cats(1); - cats[0] = vmCfg.readNumEntry("Category", 0); + cats[0] = config.readNumEntry("Category", 0); QString dlName("vm_"); @@ -347,5 +345,5 @@ void VMemo::stopRecording() { int VMemo::openDSP() { - Config cfg("Sound"); + Config cfg("Vmemo"); cfg.setGroup("Record"); 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 @@ -53,6 +53,6 @@ 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); @@ -68,4 +68,7 @@ void VolumeControl::createView(bool showMic) downButton->setPixmap( Resource::loadPixmap( "down" ) ); vboxButtons->setSpacing( 2 ); + + upButton->setFixedHeight(26); + downButton->setFixedHeight(26); vboxButtons->addWidget( upButton ); @@ -80,5 +83,5 @@ void VolumeControl::createView(bool showMic) slider->setTickInterval( 20 ); slider->setFocusPolicy( QWidget::NoFocus ); - slider->setValue(cfg.readNumEntry("Volume")); + slider->setValue(cfg.readNumEntry("VolumePercent")); QVBoxLayout *sbox = new QVBoxLayout(this); @@ -88,41 +91,69 @@ void VolumeControl::createView(bool showMic) sbox->addWidget( slider, 0, Qt::AlignVCenter | Qt::AlignHCenter ); - if (showMic == TRUE) { - mic = new QSlider(this); - mic->setRange( 0, 100 ); - mic->setTickmarks( QSlider::Both ); - mic->setTickInterval( 20 ); - mic->setFocusPolicy( QWidget::NoFocus ); - mic->setValue(cfg.readNumEntry("Mic")); +// if (showMic == TRUE) { + mic = new QSlider(this); + mic->setRange( 0, 100 ); + mic->setTickmarks( QSlider::Both ); + mic->setTickInterval( 20 ); + mic->setFocusPolicy( QWidget::NoFocus ); + mic->setValue(cfg.readNumEntry("Mic")); - QVBoxLayout *mbox = new QVBoxLayout(this); - mbox->setMargin( 3 ); - mbox->setSpacing( 3 ); - mbox->addWidget( new QLabel("Mic", this) , 0, Qt::AlignVCenter | Qt::AlignHCenter ); - mbox->addWidget( mic, 0, Qt::AlignVCenter | Qt::AlignHCenter ); - - hbox = new QHBoxLayout( this ); - hbox->setMargin( 3 ); - hbox->setSpacing( 3 ); - hbox->addLayout( sbox, 1); - hbox->addLayout( mbox, 1); - } + QVBoxLayout *mbox = new QVBoxLayout(this); + mbox->setMargin( 3 ); + mbox->setSpacing( 3 ); + mbox->addWidget( new QLabel("Mic", this) , 0, Qt::AlignVCenter | Qt::AlignHCenter ); + mbox->addWidget( mic, 0, Qt::AlignVCenter | Qt::AlignHCenter ); + + hbox = new QHBoxLayout( this ); + 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) - vbox->addLayout( hbox, 1 ); - else - vbox->addLayout( sbox, 1); +// if (showMic == TRUE) + vbox->addLayout( hbox, 1 ); +// else +// vbox->addLayout( sbox, 1); vbox->addWidget( muteBox, 0, Qt::AlignVCenter | Qt::AlignHCenter ); hboxLayout->addLayout( vboxButtons ); - hboxLayout->addLayout(vbox); + hboxLayout->addLayout( vbox); + hboxLayout->addLayout( klbox); - setFixedHeight( 120 ); - setFixedWidth( sizeHint().width() ); + + setFixedHeight( 120); +// setFixedWidth( sizeHint().width() ); setFocusPolicy(QWidget::NoFocus); connect( upButton, SIGNAL( pressed() ), this, SLOT( ButtonChanged() ) ); @@ -180,6 +211,6 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { - Config cfg("Sound"); - cfg.setGroup("System"); + Config cfg("qpe"); + cfg.setGroup("Volume"); setFixedHeight( 18 ); @@ -188,5 +219,5 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) volumePixmap = Resource::loadPixmap( "volume" ); - volumePercent = cfg.readNumEntry("Volume",50); + volumePercent = cfg.readNumEntry("VolumePercent",50); micPercent = cfg.readNumEntry("Mic", 50); muted = FALSE; // ### read from pref @@ -230,24 +261,35 @@ 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(); @@ -303,13 +345,13 @@ 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"); } @@ -334,7 +376,7 @@ 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) @@ -347,6 +389,6 @@ void VolumeApplet::writeSystemMic() { { - Config cfg("Sound"); - cfg.setGroup("System"); + Config cfg("qpe"); + cfg.setGroup("Volume"); cfg.writeEntry("Mic",micPercent); } @@ -379,2 +421,24 @@ void VolumeApplet::paintEvent( QPaintEvent* ) } } + +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 @@ -24,5 +24,4 @@ #include <qwidget.h> -#include <qpushbutton.h> #include <qframe.h> #include <qpixmap.h> @@ -43,4 +42,8 @@ public: QSlider *mic; QCheckBox *muteBox; + QCheckBox *alarmSound; + QCheckBox *screentaps; + QCheckBox *keyclicks; + private: @@ -95,4 +98,8 @@ private: void writeSystemMic(); +protected slots: + void alarmSoundCheckToggled(bool); + void keyclicksCheckToggled(bool); + void screentapsCheckToggled(bool); }; |