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
@@ -29,25 +29,27 @@
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qslider.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
+#include <qlabel.h>
 
 #include <sys/utsname.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
 #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" );
     Config cfg("Vmemo");
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
     AlertCheckBox->setChecked(cfg.readBoolEntry("Alert"));
     
@@ -61,16 +63,18 @@ SoundSettings::SoundSettings( QWidget* parent,  const char* objname, WFlags fl )
         sampleRate->setCurrentItem(2);
     else if(rate == 33075)
         sampleRate->setCurrentItem(3);
     else if(rate==44100)
         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*/
     if (uname(&name) != -1) {// TODO change this here,...
         QString release=name.release;
         if( release.find("embedix",0,TRUE) != -1) {
             qDebug("IS System Zaurus");
@@ -103,15 +107,20 @@ SoundSettings::SoundSettings( QWidget* parent,  const char* objname, WFlags fl )
     sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1));
 
     cfg.setGroup("Defaults");
     keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") );
 
     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()) );
 }
 
 void SoundSettings::updateStorageCombo() {
 
     Config config( "Vmemo" );
@@ -131,13 +140,13 @@ void SoundSettings::updateStorageCombo() {
         const QString name = (*it)->name();
         const QString path = (*it)->path();
         qDebug("storage name "+name +" storage path is "+path);
         list << name + ": " +path;
         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++;
     }
 
     LocationComboBox->insertStringList(list);
     qDebug("set item %d", set);
     LocationComboBox->setCurrentItem(set);
@@ -157,34 +166,30 @@ void SoundSettings::cleanUp() {
 
     cfg.setGroup("Record");
     cfg.writeEntry("SampleRate",sampleRate->currentText());
     cfg.writeEntry("Stereo",stereoCheckBox->isChecked());
     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();
 }
 
 void SoundSettings::updateLocationCombo() {
 
 }
@@ -196,6 +201,11 @@ void SoundSettings::setSizeLimitButton(const QString &index) {
     if(index.find("Unlimited",0,TRUE) != -1)
         cfg.writeEntry("SizeLimit", -1);
     else
         cfg.writeEntry("SizeLimit", 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
@@ -29,21 +29,23 @@ class SoundSettings : public SoundSettingsBase
 Q_OBJECT
   
 public:
  SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   
 protected:
+   bool noWarning;
 /*  void accept(); */
 /*  void reject(); */
  void updateStorageCombo();
  void updateLocationCombo();
   
 private slots:
- void setKeyButton(const QString &);
+ void setKeyButton( int);
  void setSizeLimitButton(const QString &);
  void setLocation(const QString &);
- void cleanUp();    
+ void cleanUp();
+ void restartOpie(bool);
 };
 
 
 #endif // SOUNDSETTINGS_H
 
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
@@ -144,12 +144,15 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     keyComboBox->insertItem( tr( "Key_Calender" ) );
     keyComboBox->insertItem( tr( "Key_Contacts" ) );
     keyComboBox->insertItem( tr( "Key_Menu" ) );
     keyComboBox->insertItem( tr( "Key_Mail" ) );
     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" );
     timeLimitLabel->setText( tr( "Recording Limit in seconds:" ) );
     SoundSettingsBaseLayout->addMultiCellWidget(  timeLimitLabel  , 7, 7, 0, 0, 1);
 
     timeLimitComboBox = new QComboBox( FALSE, this, "timeLimitComboBox" );
@@ -159,12 +162,19 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     timeLimitComboBox->insertItem( tr( "10" ) );
     timeLimitComboBox->insertItem( tr( "5" ) );
     timeLimitComboBox->insertItem( tr( "Unlimited" ) );
 
     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 );
 }
 
 /*  
  *  Destroys the object and frees any allocated resources
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
@@ -29,12 +29,13 @@ class SoundSettingsBase : public QMainWindow
 public:
     SoundSettingsBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~SoundSettingsBase();
 
     QLabel* PixmapLabel1_2;
     QLabel* TextLabel1_2;
+    QLabel *keyLabel;
 /*     QLabel* volLabel; */
 /*     QLabel* micLabel; */
 /*     QSlider* volume; */
 /*     QSlider* mic; */
 /*     QLabel* PixmapLabel2_2; */
 /*     QLabel* TextLabel2_2; */
@@ -45,12 +46,13 @@ public:
     QCheckBox* sixteenBitCheckBox;
     QCheckBox* AlertCheckBox;
     QLabel* TextLabel1;
     QComboBox* LocationComboBox;
     QComboBox* keyComboBox;
     QComboBox* timeLimitComboBox;
+    QCheckBox *restartCheckBox;
     bool keyReset;
 protected:
     QGridLayout* SoundSettingsBaseLayout;
 protected slots:
         
 };