added user message to restart opie or not on key switch change and changed control name

3 files changed, 21 insertions, 3 deletions

diff --git a/noncore/settings/sound/opie-vmemo-settings.control b/noncore/settings/sound/opie-vmemo-settings.control
new file mode 100644
index 0000000..3d42ca0
--- a/dev/null
+++ b/noncore/settings/sound/opie-vmemo-settings.control
@@ -0,0 +1,10 @@
+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 cddb478..8b97e4d 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -17,6 +17,7 @@
 ** not clear to you.
 **
 **********************************************************************/
+// parts copyright 2002 L.J. Potter
 
 #include "soundsettings.h"
 
@@ -109,6 +110,7 @@ SoundSettings::SoundSettings( QWidget* parent,  const char* objname, WFlags fl )
     connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT( setSizeLimitButton(const QString &)));
 //     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 }
+
 void SoundSettings::updateStorageCombo() {
 
    Config config( "Vmemo" );
@@ -157,8 +159,15 @@ void SoundSettings::cleanUp() {
     cfg.writeEntry("Stereo",stereoCheckBox->isChecked());
     cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
 
-    if(keyReset) QCopEnvelope ("QPE/System", "restart()");
-        
+    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: 
+              QCopEnvelope ("QPE/System", "restart()");
+              break;
+        };
+    }
 }
 
 void SoundSettings::setKeyButton(const QString &name) {
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp
index 3c98362..05b4b7e 100644
--- a/noncore/settings/sound/soundsettingsbase.cpp
+++ b/noncore/settings/sound/soundsettingsbase.cpp
@@ -162,7 +162,6 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
 
     SoundSettingsBaseLayout->addMultiCellWidget(timeLimitComboBox  , 8, 8, 0, 0, 1);
 
-
       QSpacerItem* spacer4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding );
       SoundSettingsBaseLayout->addItem( spacer4, 9, 0 );
 }