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

5 files changed, 48 insertions, 34 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
@@ -33,4 +33,5 @@
 #include <qlineedit.h>
 #include <qcombobox.h>
+#include <qlabel.h>
 
 #include <sys/utsname.h>
@@ -41,9 +42,10 @@
 #include <sys/stat.h>
 
+
 SoundSettings::SoundSettings( QWidget* parent,  const char* objname, WFlags fl )
         : SoundSettingsBase( parent, objname, TRUE, fl )
 {
     keyReset=FALSE;
-
+    noWarning=false;
     Config config( "qpe");
     config.setGroup( "Volume" );
@@ -65,8 +67,10 @@ SoundSettings::SoundSettings( QWidget* parent,  const char* objname, WFlags fl )
         sampleRate->setCurrentItem(4);
 
-    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
-                                                //devices
+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
+//since ipaq and zaurus have particular
+//devices
     bool systemZaurus=FALSE;
     struct utsname name; /* check for embedix kernel running on the zaurus*/
@@ -107,7 +111,12 @@ 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()) );
 }
@@ -135,5 +144,5 @@ void SoundSettings::updateStorageCombo() {
         if( loc.find( path,0,TRUE) != -1)
             set = i;      
-//             if(dit.current()->file().find(path) != -1 ) storage=name;
+//   if(dit.current()->file().find(path) != -1 ) storage=name;
         i++;
     }
@@ -161,26 +170,22 @@ void SoundSettings::cleanUp() {
     cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
 
-    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;
-        };
+    if(keyReset && noWarning) {
+        QCopEnvelope ("QPE/System", "restart()");
     }
 }
 
-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();
 }
@@ -200,2 +205,7 @@ void SoundSettings::setSizeLimitButton(const QString &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 6b8b835..0f3605e 100644
--- a/noncore/settings/sound/soundsettings.h
+++ b/noncore/settings/sound/soundsettings.h
@@ -33,4 +33,5 @@ public:
   
 protected:
+   bool noWarning;
 /*  void accept(); */
 /*  void reject(); */
@@ -39,8 +40,9 @@ protected:
   
 private slots:
- void setKeyButton(const QString &);
+ void setKeyButton( int);
  void setSizeLimitButton(const QString &);
  void setLocation(const QString &);
- void cleanUp();    
+ 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
@@ -148,4 +148,7 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     SoundSettingsBaseLayout->addMultiCellWidget( keyComboBox , 6, 6, 0, 0 ,1);
 
+    keyLabel=  new QLabel( this, "keyLabel" );
+    SoundSettingsBaseLayout->addMultiCellWidget( keyLabel , 6, 6, 0, 2, 3);
+
     QLabel *timeLimitLabel;
     timeLimitLabel= new QLabel( this, "timeLimitLabel" );
@@ -163,4 +166,11 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     SoundSettingsBaseLayout->addMultiCellWidget(timeLimitComboBox  , 8, 8, 0, 0, 1);
 
+
+    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 );
     SoundSettingsBaseLayout->addItem( spacer4, 9, 0 );
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
@@ -33,4 +33,5 @@ public:
     QLabel* PixmapLabel1_2;
     QLabel* TextLabel1_2;
+    QLabel *keyLabel;
 /*     QLabel* volLabel; */
 /*     QLabel* micLabel; */
@@ -49,4 +50,5 @@ public:
     QComboBox* keyComboBox;
     QComboBox* timeLimitComboBox;
+    QCheckBox *restartCheckBox;
     bool keyReset;
 protected: