author | llornkcor <llornkcor> | 2005-02-18 08:35:49 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-02-18 08:35:49 (UTC) |
commit | 0f1ae1478122e2f65f8d477d9baad8de15df1eb2 (patch) (side-by-side diff) | |
tree | 903fe5a875bfd9fda0fccf7d8ba4b8eda9a3a07c | |
parent | 436a26541402c85a24eaf9ffb3ab2e866631000c (diff) | |
download | opie-0f1ae1478122e2f65f8d477d9baad8de15df1eb2.zip opie-0f1ae1478122e2f65f8d477d9baad8de15df1eb2.tar.gz opie-0f1ae1478122e2f65f8d477d9baad8de15df1eb2.tar.bz2 |
change to dialog so user can cancel
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 71 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.h | 5 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.h | 5 |
4 files changed, 50 insertions, 34 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index d55a751..df3def5 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp @@ -38,25 +38,28 @@ using namespace Opie::Core; #include <sys/utsname.h> #include <sys/time.h> #include <sys/types.h> #include <unistd.h> #include <sys/stat.h> SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) - : SoundSettingsBase( parent, objname, TRUE, fl ) + : SoundSettingsBase( parent, objname, true, fl ) { - keyReset=FALSE; + keyReset=false; noWarning=false; Config config( "qpe"); config.setGroup( "Volume" ); Config cfg("Vmemo"); - connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); - AlertCheckBox->setChecked(cfg.readBoolEntry("Alert")); + + +// connect(qApp,SIGNAL(aboutToQuit()),SLOT(cleanUp())); + + AlertCheckBox->setChecked( cfg.readBoolEntry("Alert", 1)); cfg.setGroup("Record"); int rate=config.readNumEntry("SampleRate", 22050); if(rate == 8000) sampleRate->setCurrentItem(0); else if(rate == 11025) sampleRate->setCurrentItem(1); else if(rate == 22050) @@ -67,30 +70,30 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) sampleRate->setCurrentItem(4); stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); //TODO hide if zaurus- mono only #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) //since ipaq and zaurus have particular //devices - bool systemZaurus=FALSE; + bool systemZaurus=false; struct utsname name; /* check for embedix kernel running on the zaurus*/ if (uname(&name) != -1) {// TODO change this here,... QString release=name.release; - if( release.find("embedix",0,TRUE) != -1) { + if( release.find("embedix",0,true) != -1) { odebug << "IS System Zaurus" << oendl; - systemZaurus=TRUE; + systemZaurus=true; } } if(!systemZaurus) { - stereoCheckBox->setChecked(TRUE); + stereoCheckBox->setChecked(true); } - stereoCheckBox->setEnabled(FALSE); - sixteenBitCheckBox->setEnabled(FALSE); + stereoCheckBox->setEnabled(false); + sixteenBitCheckBox->setEnabled(false); #else #endif int sRate=cfg.readNumEntry("SizeLimit", 30); odebug << "" << sRate << "" << oendl; if(sRate ==30) timeLimitComboBox->setCurrentItem(0); else if(sRate==20) @@ -102,34 +105,30 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) else if(sRate == 5) timeLimitComboBox->setCurrentItem(4); else timeLimitComboBox->setCurrentItem(5); sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); cfg.setGroup("Defaults"); - keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); + recordKey = cfg.readNumEntry("toggleKey"); + keyComboBox->setCurrentItem( recordKey); updateStorageCombo(); Config vmCfg("Vmemo"); vmCfg.setGroup("Defaults"); adpcmCheckBox->setChecked( vmCfg.readBoolEntry("use_ADPCM", 0)); - connect( LocationComboBox,SIGNAL(activated(const QString&)), this, - SLOT( setLocation(const QString&))); - connect( keyComboBox,SIGNAL(activated(int)), this, - SLOT( setKeyButton(int))); - connect( timeLimitComboBox,SIGNAL(activated(const QString&)), this, - SLOT( setSizeLimitButton(const QString&))); - connect( restartCheckBox,SIGNAL( toggled(bool)), this, - SLOT( restartOpie(bool))); - connect( adpcmCheckBox,SIGNAL( toggled(bool)), this, - SLOT( slotAdpcm(bool))); + connect(LocationComboBox,SIGNAL(activated(const QString&)),this,SLOT(setLocation(const QString&))); + connect(keyComboBox,SIGNAL(activated(int)),this,SLOT(setKeyButton(int))); + connect(timeLimitComboBox,SIGNAL(activated(const QString&)),this,SLOT(setSizeLimitButton(const QString&))); + connect(restartCheckBox,SIGNAL( toggled(bool)),this,SLOT(restartOpie(bool))); + connect(adpcmCheckBox,SIGNAL( toggled(bool)),this,SLOT(slotAdpcm(bool))); // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); } void SoundSettings::updateStorageCombo() { Config config( "Vmemo" ); config.setGroup( "System" ); @@ -144,17 +143,17 @@ void SoundSettings::updateStorageCombo() { const QList<FileSystem> &fs = storageInfo.fileSystems(); QListIterator<FileSystem> it ( fs ); for( ; it.current(); ++it ){ const QString name = (*it)->name(); const QString path = (*it)->path(); odebug << "storage name "+name +" storage path is "+path << oendl; list << name + ": " +path; - if( loc.find( path,0,TRUE) != -1) + if( loc.find( path,0,true) != -1) set = i; // if(dit.current()->file().find(path) != -1 ) storage=name; i++; } LocationComboBox->insertStringList(list); odebug << "set item " << set << "" << oendl; LocationComboBox->setCurrentItem(set); @@ -163,54 +162,66 @@ void SoundSettings::updateStorageCombo() { void SoundSettings::setLocation(const QString & string) { Config config( "Vmemo" ); config.setGroup( "System" ); config.writeEntry("RecLocation",string); odebug << "set location "+string << oendl; config.write(); } + void SoundSettings::accept() { + cleanUp(); + qApp->quit(); +} + + void SoundSettings::cleanUp() { + Config cfg("Vmemo"); cfg.writeEntry("Alert",AlertCheckBox->isChecked()); cfg.setGroup("Record"); cfg.writeEntry("SampleRate",sampleRate->currentText()); cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); if(keyReset && noWarning) { QCopEnvelope ("QPE/System", "restart()"); } + cfg.setGroup("Defaults"); + cfg.writeEntry( "toggleKey", recordKey); + if( recordKey == 1) { + cfg.writeEntry( "hideIcon", 0 ); + } + else { + cfg.writeEntry( "hideIcon", 1); + } + cfg.write(); } void SoundSettings::setKeyButton( int index) { - Config cfg("Vmemo"); - cfg.setGroup("Defaults"); - cfg.writeEntry( "toggleKey", index ); - keyReset = TRUE; + recordKey = index; + restartCheckBox->setChecked(true); + keyReset = true; if( index == 1) { - cfg.writeEntry( "hideIcon", 0 ); keyLabel->setText(tr("Shows icon")); } else { - cfg.writeEntry( "hideIcon", 1); keyLabel->setText(tr("Hides icon")); } - cfg.write(); } void SoundSettings::updateLocationCombo() { } void SoundSettings::setSizeLimitButton(const QString &index) { Config cfg("Vmemo"); cfg.setGroup("Record"); - if(index.find("Unlimited",0,TRUE) != -1) + if(index.find("Unlimited",0,true) != -1) cfg.writeEntry("SizeLimit", -1); else cfg.writeEntry("SizeLimit", index); cfg.write(); } void SoundSettings::restartOpie(bool b) { noWarning=b; diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h index 57a360f..9db664a 100644 --- a/noncore/settings/sound/soundsettings.h +++ b/noncore/settings/sound/soundsettings.h @@ -26,25 +26,28 @@ class SoundSettings : public SoundSettingsBase { Q_OBJECT public: static QString appName() { return QString::fromLatin1("sound"); } SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); +// ~SoundSettings(); protected: + int recordKey, hideIt; bool noWarning; -/* void accept(); */ + void accept(); /* void reject(); */ void updateStorageCombo(); void updateLocationCombo(); private slots: +//void closeEvent(QCloseEvent * ); void setKeyButton( int); void setSizeLimitButton(const QString &); void setLocation(const QString &); void cleanUp(); void restartOpie(bool); void slotAdpcm(bool); }; diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp index 84187d2..2d894c6 100644 --- a/noncore/settings/sound/soundsettingsbase.cpp +++ b/noncore/settings/sound/soundsettingsbase.cpp @@ -63,17 +63,18 @@ static const char* const image1_data[] = { /* * Constructs a SoundSettingsBase which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QMainWindow( parent, name, fl ) + : QDialog( parent, name, fl ) +// : QMainWindow( parent, name, fl ) { QPixmap image0( ( const char** ) image0_data ); QPixmap image1( ( const char** ) image1_data ); if ( !name ) setName( "SoundSettingsBase" ); // resize(255,301); setCaption( tr( "Vmemo Settings" ) ); diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h index 48c31e8..0234925 100644 --- a/noncore/settings/sound/soundsettingsbase.h +++ b/noncore/settings/sound/soundsettingsbase.h @@ -6,28 +6,29 @@ ** ** WARNING! All changes made in this file will be lost! ****************************************************************************/ #ifndef SOUNDSETTINGSBASE_H #define SOUNDSETTINGSBASE_H #include <qvariant.h> #include <qdialog.h> -#include <qmainwindow.h> +//#include <qmainwindow.h> class QVBoxLayout; class QHBoxLayout; class QGridLayout; class QCheckBox; class QComboBox; class QGroupBox; class QLabel; class QSlider; -class SoundSettingsBase : public QMainWindow +class SoundSettingsBase : public QDialog +//class SoundSettingsBase : public QMainWindow { Q_OBJECT public: SoundSettingsBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SoundSettingsBase(); QLabel* PixmapLabel1_2; |