summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/opie-vmemo-settings.control10
-rw-r--r--noncore/settings/sound/soundsettings.cpp113
-rw-r--r--noncore/settings/sound/soundsettingsbase.cpp5
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,23 +1,24 @@
/**********************************************************************
-** 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>
@@ -38,9 +39,9 @@
#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");
@@ -108,45 +109,46 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
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");
@@ -156,10 +158,17 @@ void SoundSettings::cleanUp() {
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");
@@ -183,9 +192,9 @@ 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
@@ -161,11 +161,10 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m
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