summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-23 19:46:28 (UTC)
committer llornkcor <llornkcor>2002-06-23 19:46:28 (UTC)
commit4e1cc7a828c8b56f75f03cd037ec3b5a893b9188 (patch) (side-by-side diff)
tree56757ef2c8c352ab170e8c67e203b1b8728c6cbe
parent7c4524d0ff6d329c1f5f76fa2e7a727e553d51c8 (diff)
downloadopie-4e1cc7a828c8b56f75f03cd037ec3b5a893b9188.zip
opie-4e1cc7a828c8b56f75f03cd037ec3b5a893b9188.tar.gz
opie-4e1cc7a828c8b56f75f03cd037ec3b5a893b9188.tar.bz2
fixed config handling
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/soundsettings.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index 759a469..5cb59c5 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -57,99 +57,100 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
int rate=config.readNumEntry("SampleRate", 22050);
if(rate == 8000)
sampleRate->setCurrentItem(0);
else if(rate == 11025)
sampleRate->setCurrentItem(1);
else if(rate == 22050)
sampleRate->setCurrentItem(2);
else if(rate == 33075)
sampleRate->setCurrentItem(3);
else if(rate==44100)
sampleRate->setCurrentItem(4);
stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); //TODO hide if zaurus- mono only
struct utsname name; /* check for embedix kernel running on the zaurus*/
if (uname(&name) != -1) {
QString release=name.release;
if( release.find("embedix",0,TRUE) !=-1)
stereoCheckBox->hide();
}
// else
// stereoCheckBox->hide();
int sRate=cfg.readNumEntry("SizeLimit", 30);
qDebug("%d",sRate);
if(sRate ==30)
timeLimitComboBox->setCurrentItem(0);
else if(sRate==20)
timeLimitComboBox->setCurrentItem(1);
else if(sRate == 15)
timeLimitComboBox->setCurrentItem(2);
else if(sRate == 10)
timeLimitComboBox->setCurrentItem(3);
else
timeLimitComboBox->setCurrentItem(4);
sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1));
cfg.setGroup("Defaults");
keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") );
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 &)));
- connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT(setSizeLimitButton(const QString &)));
+ connect( keyComboBox,SIGNAL(activated(const QString &)),this,SLOT( setKeyButton(const QString &)));
+ connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT( setSizeLimitButton(const QString &)));
// 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" );
@@ -211,62 +212,68 @@ int set=0;
qDebug("storage name "+name +" storage path is "+path);
list << name + ": " +path;
if( loc.find( path,0,TRUE) != -1)
set = i;
// if(dit.current()->file().find(path) != -1 ) storage=name;
i++;
}
LocationComboBox->insertStringList(list);
qDebug("set item %d", set);
LocationComboBox->setCurrentItem(set);
}
void SoundSettings::setLocation(const QString & string) {
Config config( "Vmemo" );
config.setGroup( "System" );
config.writeEntry("RecLocation",string);
qDebug("set location "+string);
config.write();
}
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");
cfg.writeEntry("SampleRate",sampleRate->currentText());
cfg.writeEntry("Stereo",stereoCheckBox->isChecked());
cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
if(keyReset) QCopEnvelope ("QPE/System", "restart()");
}
void SoundSettings::setKeyButton(const QString &name) {
Config cfg("Vmemo");
cfg.setGroup("Defaults");
cfg.writeEntry( "toggleKey", keyComboBox->currentItem() );
keyReset = TRUE;
+ if(keyComboBox->currentItem() == 1)
+ cfg.writeEntry( "hideIcon", 0 );
+ else
+ cfg.writeEntry( "hideIcon", 1);
+
+
cfg.write();
}
void SoundSettings::updateLocationCombo() {
}
void SoundSettings::setSizeLimitButton(const QString &index) {
Config cfg("Vmemo");
cfg.setGroup("Record");
cfg.writeEntry("SizeLimit", index);
cfg.write();
}