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 /noncore/settings/sound | |
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 @@ -44,13 +44,16 @@ using namespace Opie::Core; 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"); @@ -73,18 +76,18 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) //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 @@ -108,5 +111,6 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) cfg.setGroup("Defaults"); - keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); + recordKey = cfg.readNumEntry("toggleKey"); + keyComboBox->setCurrentItem( recordKey); updateStorageCombo(); @@ -116,14 +120,9 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) 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()) ); @@ -150,5 +149,5 @@ void SoundSettings::updateStorageCombo() { 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; @@ -169,5 +168,12 @@ void SoundSettings::setLocation(const QString & string) { } + void SoundSettings::accept() { + cleanUp(); + qApp->quit(); +} + + void SoundSettings::cleanUp() { + Config cfg("Vmemo"); cfg.writeEntry("Alert",AlertCheckBox->isChecked()); @@ -180,20 +186,25 @@ void SoundSettings::cleanUp() { 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(); } @@ -206,5 +217,5 @@ 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 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 @@ -32,8 +32,10 @@ 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(); @@ -41,4 +43,5 @@ protected: private slots: +//void closeEvent(QCloseEvent * ); void setKeyButton( int); void setSizeLimitButton(const QString &); 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 @@ -69,5 +69,6 @@ static const char* const image1_data[] = { */ 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 ); 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 @@ -12,5 +12,5 @@ #include <qvariant.h> #include <qdialog.h> -#include <qmainwindow.h> +//#include <qmainwindow.h> class QVBoxLayout; @@ -23,5 +23,6 @@ class QLabel; class QSlider; -class SoundSettingsBase : public QMainWindow +class SoundSettingsBase : public QDialog +//class SoundSettingsBase : public QMainWindow { Q_OBJECT |