summaryrefslogtreecommitdiff
path: root/noncore/settings
authorllornkcor <llornkcor>2002-08-29 23:28:09 (UTC)
committer llornkcor <llornkcor>2002-08-29 23:28:09 (UTC)
commitc4af3c78c9f6f073c1e0b11b331a2e24df80b9ff (patch) (side-by-side diff)
treebf090bfc613bf84852b1a389877a8180af061595 /noncore/settings
parent598b2f4c404c2e12f59c2abc765f58bb8d0862a3 (diff)
downloadopie-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
Diffstat (limited to 'noncore/settings') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/opie-sound.control10
-rw-r--r--noncore/settings/sound/soundsettings.cpp54
-rw-r--r--noncore/settings/sound/soundsettings.h6
-rw-r--r--noncore/settings/sound/soundsettingsbase.cpp10
-rw-r--r--noncore/settings/sound/soundsettingsbase.h2
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
@@ -32,6 +32,7 @@
#include <qcheckbox.h>
#include <qlineedit.h>
#include <qcombobox.h>
+#include <qlabel.h>
#include <sys/utsname.h>
#include <sys/time.h>
@@ -40,11 +41,12 @@
#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");
@@ -64,10 +66,12 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
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,...
@@ -106,9 +110,14 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
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()) );
}
@@ -134,7 +143,7 @@ void SoundSettings::updateStorageCombo() {
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++;
}
@@ -160,28 +169,24 @@ void SoundSettings::cleanUp() {
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();
}
@@ -199,3 +204,8 @@ void SoundSettings::setSizeLimitButton(const QString &index) {
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
@@ -32,16 +32,18 @@ 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);
};
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
@@ -147,6 +147,9 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m
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:" ) );
@@ -162,6 +165,13 @@ 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
@@ -32,6 +32,7 @@ public:
QLabel* PixmapLabel1_2;
QLabel* TextLabel1_2;
+ QLabel *keyLabel;
/* QLabel* volLabel; */
/* QLabel* micLabel; */
/* QSlider* volume; */
@@ -48,6 +49,7 @@ public:
QComboBox* LocationComboBox;
QComboBox* keyComboBox;
QComboBox* timeLimitComboBox;
+ QCheckBox *restartCheckBox;
bool keyReset;
protected:
QGridLayout* SoundSettingsBaseLayout;