Diffstat (limited to 'noncore/settings/sound/soundsettings.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 48 |
1 files changed, 29 insertions, 19 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index 20f0dab..dd341c0 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp @@ -34,2 +34,3 @@ #include <qcombobox.h> +#include <qlabel.h> @@ -42,2 +43,3 @@ + SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) @@ -46,3 +48,3 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) keyReset=FALSE; - + noWarning=false; Config config( "qpe"); @@ -66,5 +68,7 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) - stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); //TODO hide if zaurus- mono only + stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); +//TODO hide if zaurus- mono only -#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) //since ipaq and zaurus have particular +#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) +//since ipaq and zaurus have particular //devices @@ -108,5 +112,10 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) updateStorageCombo(); - 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( 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( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); @@ -162,10 +171,4 @@ void SoundSettings::cleanUp() { - if(keyReset) { - switch ( QMessageBox::warning(this,tr("Restart"), - tr("To implement a new key switch\nOpie will have to be restarted./n<B>Restart</B> Opie now?"), - tr("Yes"),tr("No"),0,1,1) ) { - case 0: + if(keyReset && noWarning) { QCopEnvelope ("QPE/System", "restart()"); - break; - }; } @@ -173,13 +176,15 @@ void SoundSettings::cleanUp() { -void SoundSettings::setKeyButton(const QString &name) { +void SoundSettings::setKeyButton( int index) { Config cfg("Vmemo"); cfg.setGroup("Defaults"); - cfg.writeEntry( "toggleKey", keyComboBox->currentItem() ); + cfg.writeEntry( "toggleKey", index ); keyReset = TRUE; - if(keyComboBox->currentItem() == 1) + if( index == 1) { cfg.writeEntry( "hideIcon", 0 ); - else + keyLabel->setText(tr("Shows icon")); + } + else { cfg.writeEntry( "hideIcon", 1); - - + keyLabel->setText(tr("Hides icon")); + } cfg.write(); @@ -201 +206,6 @@ void SoundSettings::setSizeLimitButton(const QString &index) { } + +void SoundSettings::restartOpie(bool b) { + noWarning=b; +} + |