author | llornkcor <llornkcor> | 2002-08-26 23:42:26 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-08-26 23:42:26 (UTC) |
commit | fd60f8aac384983daf7999c20bf827a8bacf8f8f (patch) (side-by-side diff) | |
tree | 0a29acacdc405c965027c28dfd57c33a37d1a8af /noncore/settings/sound | |
parent | 2182c3985c78662c0ce422508d23d3b10399583d (diff) | |
download | opie-fd60f8aac384983daf7999c20bf827a8bacf8f8f.zip opie-fd60f8aac384983daf7999c20bf827a8bacf8f8f.tar.gz opie-fd60f8aac384983daf7999c20bf827a8bacf8f8f.tar.bz2 |
added user message to restart opie or not on key switch change and changed control name
-rw-r--r-- | noncore/settings/sound/opie-vmemo-settings.control | 10 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 113 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.cpp | 5 |
3 files changed, 73 insertions, 55 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 @@ -1,25 +1,26 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. -** -** This file is part of Qtopia Environment. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ + ** Copyright (C) 2000 Trolltech AS. All rights reserved. + ** + ** This file is part of Qtopia Environment. + ** + ** This file may be distributed and/or modified under the terms of the + ** GNU General Public License version 2 as published by the Free Software + ** Foundation and appearing in the file LICENSE.GPL included in the + ** packaging of this file. + ** + ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + ** + ** See http://www.trolltech.com/gpl/ for GPL licensing information. + ** + ** Contact info@trolltech.com if any conditions of this licensing are + ** not clear to you. + ** + **********************************************************************/ +// parts copyright 2002 L.J. Potter #include "soundsettings.h" #include <qpe/qpeapplication.h> #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> @@ -36,13 +37,13 @@ #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 ) + : SoundSettingsBase( parent, objname, TRUE, fl ) { keyReset=FALSE; Config config( "qpe"); config.setGroup( "Volume" ); Config cfg("Vmemo"); @@ -106,62 +107,70 @@ 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( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); } + void SoundSettings::updateStorageCombo() { - Config config( "Vmemo" ); - config.setGroup( "System" ); - QString loc = config.readEntry("RecLocation","/"); -int i=0; -int set=0; - StorageInfo storageInfo; - QString sName, sPath; - QStringList list; - list << "Documents : "+QPEApplication::documentDir(); - list << "tmp : /tmp"; - - const QList<FileSystem> &fs = storageInfo.fileSystems(); + Config config( "Vmemo" ); + config.setGroup( "System" ); + QString loc = config.readEntry("RecLocation","/"); + int i=0; + int set=0; + StorageInfo storageInfo; + QString sName, sPath; + QStringList list; + list << "Documents : "+QPEApplication::documentDir(); + list << "tmp : /tmp"; + + const QList<FileSystem> &fs = storageInfo.fileSystems(); QListIterator<FileSystem> it ( fs ); - for( ; it.current(); ++it ){ - 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; + for( ; it.current(); ++it ){ + 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; - i++; - } + i++; + } - LocationComboBox->insertStringList(list); - qDebug("set item %d", set); - LocationComboBox->setCurrentItem(set); + LocationComboBox->insertStringList(list); + qDebug("set item %d", set); + LocationComboBox->setCurrentItem(set); } void SoundSettings::setLocation(const QString & string) { - Config config( "Vmemo" ); - config.setGroup( "System" ); - config.writeEntry("RecLocation",string); - qDebug("set location "+string); - config.write(); + Config config( "Vmemo" ); + config.setGroup( "System" ); + config.writeEntry("RecLocation",string); + qDebug("set location "+string); + config.write(); } void SoundSettings::cleanUp() { Config cfg("Vmemo"); cfg.writeEntry("Alert",AlertCheckBox->isChecked()); cfg.setGroup("Record"); cfg.writeEntry("SampleRate",sampleRate->currentText()); 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) { Config cfg("Vmemo"); cfg.setGroup("Defaults"); cfg.writeEntry( "toggleKey", keyComboBox->currentItem() ); @@ -181,11 +190,11 @@ void SoundSettings::updateLocationCombo() { void SoundSettings::setSizeLimitButton(const QString &index) { Config cfg("Vmemo"); cfg.setGroup("Record"); if(index.find("Unlimited",0,TRUE) != -1) - cfg.writeEntry("SizeLimit", -1); + cfg.writeEntry("SizeLimit", -1); else - cfg.writeEntry("SizeLimit", index); + cfg.writeEntry("SizeLimit", index); cfg.write(); } 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 @@ -159,15 +159,14 @@ 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); - - QSpacerItem* spacer4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); - SoundSettingsBaseLayout->addItem( spacer4, 9, 0 ); + QSpacerItem* spacer4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); + SoundSettingsBaseLayout->addItem( spacer4, 9, 0 ); } /* * Destroys the object and frees any allocated resources */ SoundSettingsBase::~SoundSettingsBase() |