summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/main.cpp3
-rw-r--r--noncore/settings/sound/opie-sound.control2
-rw-r--r--noncore/settings/sound/soundsettings.cpp76
-rw-r--r--noncore/settings/sound/soundsettings.h5
-rw-r--r--noncore/settings/sound/soundsettingsbase.ui381
5 files changed, 258 insertions, 209 deletions
diff --git a/noncore/settings/sound/main.cpp b/noncore/settings/sound/main.cpp
index 5d28a8c..33b0523 100644
--- a/noncore/settings/sound/main.cpp
+++ b/noncore/settings/sound/main.cpp
@@ -26,11 +26,8 @@
int main(int argc, char** argv)
{
QPEApplication a(argc,argv);
-
SoundSettings dlg;
-
a.showMainWidget(&dlg);
-
return a.exec();
}
diff --git a/noncore/settings/sound/opie-sound.control b/noncore/settings/sound/opie-sound.control
index b14105c..3d42ca0 100644
--- a/noncore/settings/sound/opie-sound.control
+++ b/noncore/settings/sound/opie-sound.control
@@ -1,7 +1,7 @@
Files: bin/sound apps/Settings/Sound.desktop
Priority: optional
Section: opie/settings
-Maintainer: Warwick Allison <warwick@trolltech.com>
+Maintainer: L.J. Potter
Architecture: arm
Arch: iPAQ
Version: $QPE_VERSION-$SUB_VERSION.2
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index 467f23e..51522b3 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -21,6 +21,8 @@
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
+#include <qpe/storage.h>
+
#include <qapplication.h>
#include <qslider.h>
#include <qcheckbox.h>
@@ -39,7 +41,7 @@ SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
keysound->setChecked(config.readBoolEntry("Key"));
config.setGroup("Record");
- int rate=config.readNumEntry("SampleRate", 11025);
+ int rate=config.readNumEntry("SampleRate", 22050);
if(rate == 11025)
sampleRate->setCurrentItem(0);
else if(rate == 22050)
@@ -49,34 +51,38 @@ SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
else if(rate==44100)
sampleRate->setCurrentItem(2);
- stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
- sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 1));
+ stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
+ sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 1));
+ updateStorageCombo();
connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int)));
connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int)));
connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
- connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) );
+ connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) );
+ connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &)));
+// connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
}
void SoundSettings::reject()
{
Config config( "Sound" );
config.setGroup( "System" );
- setVolume(100-config.readNumEntry("Volume"));
- setMic(100-config.readNumEntry("Mic"));
- config.setGroup("Record");
- int rate=config.readNumEntry("SampleRate", 11025);
- if(rate == 11025)
- sampleRate->setCurrentItem(0);
- else if(rate == 22050)
- sampleRate->setCurrentItem(1);
- else if(rate == 32000)
- sampleRate->setCurrentItem(2);
- else if(rate==44100)
- sampleRate->setCurrentItem(3);
- stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
- sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
+ setVolume(100-config.readNumEntry("Volume"));
+ setMic(100-config.readNumEntry("Mic"));
+
+// config.setGroup("Record");
+// int rate=config.readNumEntry("SampleRate", 11025);
+// if(rate == 11025)
+// sampleRate->setCurrentItem(0);
+// else if(rate == 22050)
+// sampleRate->setCurrentItem(1);
+// else if(rate == 32000)
+// sampleRate->setCurrentItem(2);
+// else if(rate==44100)
+// sampleRate->setCurrentItem(3);
+// stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
+// sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
QDialog::reject();
}
@@ -91,12 +97,12 @@ void SoundSettings::accept()
config.writeEntry("Key",keysound->isChecked());
setVolume(volume->value());
- setMic(mic->value());
+ setMic(mic->value());
- config.setGroup("Record");
- config.writeEntry("SampleRate",sampleRate->currentText());
- config.writeEntry("Stereo",stereoCheckBox->isChecked());
- config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
+ config.setGroup("Record");
+ config.writeEntry("SampleRate",sampleRate->currentText());
+ config.writeEntry("Stereo",stereoCheckBox->isChecked());
+ config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
QDialog::accept();
}
@@ -134,3 +140,27 @@ void SoundSettings::micChanged( bool )
config.setGroup( "System" );
mic->setValue(100-config.readNumEntry("Mic"));
}
+
+void SoundSettings::updateStorageCombo() {
+
+ StorageInfo storageInfo;
+ QString sName, sPath;
+ QStringList list;
+ 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(dit.current()->file().find(path) != -1 ) storage=name;
+ }
+ LocationComboBox->insertStringList(list);
+}
+
+void SoundSettings::setLocation(const QString & string) {
+ Config config( "Sound" );
+ config.setGroup( "System" );
+ config.writeEntry("RecLocation",string);
+
+}
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h
index 7679c1e..aec7614 100644
--- a/noncore/settings/sound/soundsettings.h
+++ b/noncore/settings/sound/soundsettings.h
@@ -27,15 +27,18 @@
class SoundSettings : public SoundSettingsBase
{
Q_OBJECT
-
+
public:
SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
protected:
void accept();
void reject();
+ void updateStorageCombo();
private slots:
+ void setLocation(const QString &);
+
void setVolume(int);
void setMic(int);
diff --git a/noncore/settings/sound/soundsettingsbase.ui b/noncore/settings/sound/soundsettingsbase.ui
index 97bea2d..aec55be 100644
--- a/noncore/settings/sound/soundsettingsbase.ui
+++ b/noncore/settings/sound/soundsettingsbase.ui
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>286</width>
- <height>338</height>
+ <width>255</width>
+ <height>301</height>
</rect>
</property>
<property stdset="1">
@@ -34,185 +34,6 @@
<name>spacing</name>
<number>6</number>
</property>
- <widget row="0" column="1" >
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout9</cstring>
- </property>
- <vbox>
- <property stdset="1">
- <name>margin</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout8</cstring>
- </property>
- <vbox>
- <property stdset="1">
- <name>margin</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QGroupBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>GroupBox1</cstring>
- </property>
- <property stdset="1">
- <name>title</name>
- <string>Vmemo</string>
- </property>
- <grid>
- <property stdset="1">
- <name>margin</name>
- <number>11</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget row="0" column="0" >
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout15</cstring>
- </property>
- <vbox>
- <property stdset="1">
- <name>margin</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>sampleRateLabel</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Sample Rate</string>
- </property>
- </widget>
- <widget>
- <class>QComboBox</class>
- <item>
- <property>
- <name>text</name>
- <string>11025</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>22050</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>32000</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>44100</string>
- </property>
- </item>
- <property stdset="1">
- <name>name</name>
- <cstring>sampleRate</cstring>
- </property>
- </widget>
- <widget>
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>stereoCheckBox</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Stereo</string>
- </property>
- </widget>
- <widget>
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>sixteenBitCheckBox</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>16 bit</string>
- </property>
- </widget>
- </vbox>
- </widget>
- </grid>
- </widget>
- <widget>
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>touchsound</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Screen sounds</string>
- </property>
- </widget>
- <widget>
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>keysound</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Keyboard sounds</string>
- </property>
- </widget>
- </vbox>
- </widget>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer10</cstring>
- </property>
- <property stdset="1">
- <name>orientation</name>
- <enum>Vertical</enum>
- </property>
- <property stdset="1">
- <name>sizeType</name>
- <enum>Expanding</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </vbox>
- </widget>
<widget row="0" column="0" >
<class>QGroupBox</class>
<property stdset="1">
@@ -220,6 +41,14 @@
<cstring>GroupBox3</cstring>
</property>
<property stdset="1">
+ <name>frameShape</name>
+ <enum>Box</enum>
+ </property>
+ <property stdset="1">
+ <name>frameShadow</name>
+ <enum>Sunken</enum>
+ </property>
+ <property stdset="1">
<name>title</name>
<string>Levels</string>
</property>
@@ -615,6 +444,196 @@
</widget>
</vbox>
</widget>
+ <widget row="0" column="1" >
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout12</cstring>
+ </property>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>GroupBox1</cstring>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Vmemo</string>
+ </property>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout11</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>5</x>
+ <y>16</y>
+ <width>96</width>
+ <height>169</height>
+ </rect>
+ </property>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>sampleRateLabel</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Sample Rate</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QComboBox</class>
+ <item>
+ <property>
+ <name>text</name>
+ <string>11025</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>22050</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>32000</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>44100</string>
+ </property>
+ </item>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>sampleRate</cstring>
+ </property>
+ </widget>
+ <widget>
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>stereoCheckBox</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Stereo</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>sixteenBitCheckBox</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>16 bit</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>AlertCheckBox</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Visual Alerts</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Location</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QComboBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>LocationComboBox</cstring>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ </widget>
+ <widget>
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>touchsound</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Screen sounds</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>keysound</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Keyboard sounds</string>
+ </property>
+ </widget>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer10</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Vertical</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
+ </widget>
</grid>
</widget>
<images>