author | llornkcor <llornkcor> | 2002-08-29 23:28:09 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-08-29 23:28:09 (UTC) |
commit | c4af3c78c9f6f073c1e0b11b331a2e24df80b9ff (patch) (side-by-side diff) | |
tree | bf090bfc613bf84852b1a389877a8180af061595 /noncore/settings | |
parent | 598b2f4c404c2e12f59c2abc765f58bb8d0862a3 (diff) | |
download | opie-c4af3c78c9f6f073c1e0b11b331a2e24df80b9ff.zip opie-c4af3c78c9f6f073c1e0b11b331a2e24df80b9ff.tar.gz opie-c4af3c78c9f6f073c1e0b11b331a2e24df80b9ff.tar.bz2 |
fix for opie restart. not a checkbox to activate restart on close of vmemo sound settings. does not remember, and default is to not restart
-rw-r--r-- | noncore/settings/sound/opie-sound.control | 10 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 48 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.h | 4 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.cpp | 10 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.h | 2 |
5 files changed, 44 insertions, 30 deletions
diff --git a/noncore/settings/sound/opie-sound.control b/noncore/settings/sound/opie-sound.control deleted file mode 100644 index 3d42ca0..0000000 --- a/noncore/settings/sound/opie-sound.control +++ b/dev/null @@ -1,10 +0,0 @@ -Files: bin/sound apps/Settings/Sound.desktop -Priority: optional -Section: opie/settings -Maintainer: L.J. Potter -Architecture: arm -Arch: iPAQ -Version: $QPE_VERSION-$SUB_VERSION.2 -Depends: opie-base ($QPE_VERSION) -Description: Sound settings dialog - For the Opie environment. 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; +} + diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h index 6b8b835..0f3605e 100644 --- a/noncore/settings/sound/soundsettings.h +++ b/noncore/settings/sound/soundsettings.h @@ -34,2 +34,3 @@ public: protected: + bool noWarning; /* void accept(); */ @@ -40,3 +41,3 @@ protected: private slots: - void setKeyButton(const QString &); + void setKeyButton( int); void setSizeLimitButton(const QString &); @@ -44,2 +45,3 @@ private slots: void cleanUp(); + void restartOpie(bool); }; diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp index 05b4b7e..1a60109 100644 --- a/noncore/settings/sound/soundsettingsbase.cpp +++ b/noncore/settings/sound/soundsettingsbase.cpp @@ -149,2 +149,5 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m + keyLabel= new QLabel( this, "keyLabel" ); + SoundSettingsBaseLayout->addMultiCellWidget( keyLabel , 6, 6, 0, 2, 3); + QLabel *timeLimitLabel; @@ -164,2 +167,9 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m + + restartCheckBox= new QCheckBox( this, "restartCheck" ); + restartCheckBox->setText( tr( "Restart Opie if needed" ) ); + + SoundSettingsBaseLayout->addMultiCellWidget( restartCheckBox , 9, 9, 0, 0, 1); + + QSpacerItem* spacer4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h index 30f32ca..e6bc186 100644 --- a/noncore/settings/sound/soundsettingsbase.h +++ b/noncore/settings/sound/soundsettingsbase.h @@ -34,2 +34,3 @@ public: QLabel* TextLabel1_2; + QLabel *keyLabel; /* QLabel* volLabel; */ @@ -50,2 +51,3 @@ public: QComboBox* timeLimitComboBox; + QCheckBox *restartCheckBox; bool keyReset; |