author | llornkcor <llornkcor> | 2002-07-13 18:11:09 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-07-13 18:11:09 (UTC) |
commit | c458ba7f91acf0eb84cb1e414f77dbde0581b905 (patch) (side-by-side diff) | |
tree | 637d7aceb0ce2717f7631c396c5fcdff73137d1f /noncore/settings/sound/soundsettings.cpp | |
parent | f0421434c11a7781040340714fa01b6db2266a0b (diff) | |
download | opie-c458ba7f91acf0eb84cb1e414f77dbde0581b905.zip opie-c458ba7f91acf0eb84cb1e414f77dbde0581b905.tar.gz opie-c458ba7f91acf0eb84cb1e414f77dbde0581b905.tar.bz2 |
remove volume controls as they are handled by volume applet, made into a more flexible layout
Diffstat (limited to 'noncore/settings/sound/soundsettings.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index a163d38..99fccf7 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp @@ -46,8 +46,4 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) Config config( "qpe"); config.setGroup( "Volume" ); - volume->setValue(100-config.readNumEntry("VolumePercent")); - mic->setValue(100-config.readNumEntry("Mic")); -// touchsound->setChecked(config.readBoolEntry("TouchSound")); -// keysound->setChecked(config.readBoolEntry("KeySound")); Config cfg("Vmemo"); connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); @@ -101,5 +97,4 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) timeLimitComboBox->setCurrentItem(4); - sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); @@ -108,10 +103,4 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) updateStorageCombo(); - - connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); - connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); - connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); - connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); - connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); connect( keyComboBox,SIGNAL(activated(const QString &)),this,SLOT( setKeyButton(const QString &))); @@ -119,90 +108,4 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); } - -// void SoundSettings::reject() -// { -// qDebug("reject"); -// Config config( "qpe"); -// config.setGroup( "Volume"); - -// setVolume(100-config.readNumEntry("VolumePercent")); -// setMic(100-config.readNumEntry("Mic")); - -// // config.setGroup("Record"); -// // int rate=config.readNumEntry("SampleRate", 11025); -// // if(rate == 11025) -// // sampleRate->setCurrentItem(0); -// // else if(rate == 22050) -// // sampleRate->setCurrentItem(1); -// // else if(rate == 32000) -// // sampleRate->setCurrentItem(2); -// // else if(rate==44100) -// // sampleRate->setCurrentItem(3); -// // stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); -// // sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); -// qDebug("QDialog::reject();"); -// ::exit(-1); -// } - -// void SoundSettings::accept() -// { -// qDebug("accept"); -// Config config( "qpe" ); -// config.setGroup( "Volume" ); -// config.writeEntry("VolumePercent",100-volume->value()); -// config.writeEntry("Mic",100-mic->value()); -// // config.writeEntry("TouchSound",touchsound->isChecked()); -// // config.writeEntry("KeySound",keysound->isChecked()); - -// Config cfg("Vmemo"); -// cfg.writeEntry("Alert",AlertCheckBox->isChecked()); -// setVolume(volume->value()); -// setMic(mic->value()); - -// cfg.setGroup("Record"); -// cfg.writeEntry("SampleRate",sampleRate->currentText()); -// cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); -// cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); -// // Config cfg( "VMemo" ); -// // cfg.setGroup( "Defaults" ); -// // cfg.writeEntry( "hideIcon", HideIcon_CheckBox->isChecked()); -// qDebug("QDialog::accept();"); -// ::exit(0); -// } - -void SoundSettings::setVolume(int v) -{ - Config config( "qpe" ); - config.setGroup( "Volume" ); - config.writeEntry("VolumePercent",100-v); -#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) - QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; -#endif -} - -void SoundSettings::setMic(int m) -{ - Config config( "qpe" ); - config.setGroup( "Volume" ); - config.writeEntry("Mic",100-m); -#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) - QCopEnvelope( "QPE/System", "micChange(bool)" ) << FALSE; -#endif -} - -void SoundSettings::volumeChanged( bool ) -{ - Config config( "qpe" ); - config.setGroup( "Volume" ); - volume->setValue(100-config.readNumEntry("VolumePercent")); -} - -void SoundSettings::micChanged( bool ) -{ - Config config( "qpe" ); - config.setGroup( "Volume" ); - mic->setValue(100-config.readNumEntry("Mic")); -} - void SoundSettings::updateStorageCombo() { @@ -245,16 +148,6 @@ void SoundSettings::setLocation(const QString & string) { void SoundSettings::cleanUp() { - qDebug("cleanup"); - Config config( "qpe" ); - config.setGroup( "Volume" ); - config.writeEntry("VolumePercent",100-volume->value()); - config.writeEntry("Mic",100-mic->value()); -// config.writeEntry("TouchSound",touchsound->isChecked()); -// config.writeEntry("KeySound",keysound->isChecked()); - Config cfg("Vmemo"); cfg.writeEntry("Alert",AlertCheckBox->isChecked()); - setVolume(volume->value()); - setMic(mic->value()); cfg.setGroup("Record"); |