summaryrefslogtreecommitdiff
authorjeremy <jeremy>2002-02-11 04:36:18 (UTC)
committer jeremy <jeremy>2002-02-11 04:36:18 (UTC)
commit68d08b102aef5f73f2f1b3c5d693c26647f48c33 (patch) (side-by-side diff)
treef89dac5a0344f2b38f0ea68cae98f58e7bb1816d
parent738f33e4dddf1ce71580bd3651a8457867625501 (diff)
downloadopie-68d08b102aef5f73f2f1b3c5d693c26647f48c33.zip
opie-68d08b102aef5f73f2f1b3c5d693c26647f48c33.tar.gz
opie-68d08b102aef5f73f2f1b3c5d693c26647f48c33.tar.bz2
Added Record Prefs (Sample Rate, Stereo, and Sixteen or Eight Bit
settings. It writes this information to the standad Sound.conf, however under the Record group not System group.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/soundsettings.cpp21
-rw-r--r--noncore/settings/sound/soundsettingsbase.ui499
2 files changed, 325 insertions, 195 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index 1143e82..17dbdc0 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -14,77 +14,92 @@
** 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.
**
**********************************************************************/
#include "soundsettings.h"
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
#include <qapplication.h>
#include <qslider.h>
#include <qcheckbox.h>
#include <qlineedit.h>
SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
: SoundSettingsBase( parent, name, TRUE, fl )
{
Config config( "Sound" );
config.setGroup( "System" );
volume->setValue(100-config.readNumEntry("Volume"));
mic->setValue(100-config.readNumEntry("Mic"));
touchsound->setChecked(config.readBoolEntry("Touch"));
keysound->setChecked(config.readBoolEntry("Key"));
- dblClickRuns->setText(config.readEntry("DblClickVolumeRuns",
- "/opt/QtPalmtop/bin/vmemomanager"));
+
+ config.setGroup("Record");
+ sampleRate->setText(config.readEntry("SampleRate", "11025"));
+ stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
+ sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
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) ) );
}
void SoundSettings::reject()
{
Config config( "Sound" );
config.setGroup( "System" );
setVolume(100-config.readNumEntry("Volume"));
setMic(100-config.readNumEntry("Mic"));
+ config.setGroup("Record");
+ sampleRate->setText(config.readEntry("SampleRate", "11025"));
+ stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
+ sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
+
QDialog::reject();
}
void SoundSettings::accept()
{
Config config( "Sound" );
config.setGroup( "System" );
config.writeEntry("Volume",100-volume->value());
config.writeEntry("Mic",100-mic->value());
config.writeEntry("Touch",touchsound->isChecked());
config.writeEntry("Key",keysound->isChecked());
- config.writeEntry("DblClickVolumeRuns", dblClickRuns->text());
+
setVolume(volume->value());
+ setMic(mic->value());
+
+ config.setGroup("Record");
+ config.writeEntry("SampleRate",sampleRate->text());
+ config.writeEntry("Stereo",stereoCheckBox->isChecked());
+ config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
+
QDialog::accept();
}
void SoundSettings::setVolume(int v)
{
Config config( "Sound" );
config.setGroup( "System" );
config.writeEntry("Volume",100-v);
#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
#endif
}
void SoundSettings::setMic(int m)
{
Config config( "Sound" );
config.setGroup( "System" );
config.writeEntry("Mic",100-m);
#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
QCopEnvelope( "QPE/System", "micChange(bool)" ) << FALSE;
#endif
}
void SoundSettings::volumeChanged( bool )
diff --git a/noncore/settings/sound/soundsettingsbase.ui b/noncore/settings/sound/soundsettingsbase.ui
index 0b2b2be..f47f77e 100644
--- a/noncore/settings/sound/soundsettingsbase.ui
+++ b/noncore/settings/sound/soundsettingsbase.ui
@@ -1,445 +1,560 @@
<!DOCTYPE UI><UI>
<class>SoundSettingsBase</class>
<widget>
<class>QDialog</class>
<property stdset="1">
<name>name</name>
<cstring>SoundSettingsBase</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>376</width>
+ <width>372</width>
<height>441</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Sound Settings</string>
</property>
<property>
<name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
</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>Layout8</cstring>
+ <cstring>Layout30</cstring>
</property>
- <vbox>
+ <hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>keysound</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Keyboard sound</string>
- </property>
- </widget>
- <widget>
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>touchsound</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Screen sound</string>
- </property>
- </widget>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>dblClickLabel</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Double Click Volume runs:</string>
- </property>
- </widget>
- <widget>
- <class>QLineEdit</class>
- <property stdset="1">
- <name>name</name>
- <cstring>dblClickRuns</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string></string>
- </property>
- </widget>
- <widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout14</cstring>
+ <cstring>Layout24</cstring>
</property>
- <hbox>
+ <vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>touchsound</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Screen sound</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 sound</string>
+ </property>
+ </widget>
+ <widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout7</cstring>
+ <cstring>Layout11</cstring>
</property>
- <vbox>
+ <hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer3_2_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</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>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>volLabel</cstring>
+ <cstring>PixmapLabel1_2</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Volume</string>
+ <name>pixmap</name>
+ <pixmap>image0</pixmap>
+ </property>
+ <property stdset="1">
+ <name>scaledContents</name>
+ <bool>false</bool>
</property>
</widget>
<widget>
- <class>QSlider</class>
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>volume</cstring>
+ <cstring>TextLabel1_2</cstring>
</property>
<property stdset="1">
- <name>maxValue</name>
- <number>100</number>
+ <name>text</name>
+ <string>Loud</string>
</property>
- <property stdset="1">
- <name>value</name>
- <number>50</number>
+ </widget>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer3_2</cstring>
</property>
<property stdset="1">
<name>orientation</name>
- <enum>Vertical</enum>
+ <enum>Horizontal</enum>
</property>
<property stdset="1">
- <name>tickmarks</name>
- <enum>Right</enum>
+ <name>sizeType</name>
+ <enum>Expanding</enum>
</property>
- <property stdset="1">
- <name>tickInterval</name>
- <number>5</number>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
- </vbox>
+ </spacer>
+ </hbox>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout13</cstring>
+ <cstring>Layout11</cstring>
</property>
- <vbox>
+ <hbox>
<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>Layout11</cstring>
+ <cstring>Layout7</cstring>
</property>
- <hbox>
+ <vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer3_2_2</cstring>
- </property>
- <property stdset="1">
- <name>orientation</name>
- <enum>Horizontal</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>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>PixmapLabel1_2</cstring>
+ <cstring>volLabel</cstring>
</property>
<property stdset="1">
- <name>pixmap</name>
- <pixmap>image0</pixmap>
- </property>
- <property stdset="1">
- <name>scaledContents</name>
- <bool>false</bool>
+ <name>text</name>
+ <string>Volume</string>
</property>
</widget>
<widget>
- <class>QLabel</class>
+ <class>QSlider</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_2</cstring>
+ <cstring>volume</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Loud</string>
+ <name>maxValue</name>
+ <number>100</number>
</property>
- </widget>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer3_2</cstring>
+ <property stdset="1">
+ <name>value</name>
+ <number>50</number>
</property>
<property stdset="1">
<name>orientation</name>
- <enum>Horizontal</enum>
+ <enum>Vertical</enum>
</property>
<property stdset="1">
- <name>sizeType</name>
- <enum>Expanding</enum>
+ <name>tickmarks</name>
+ <enum>Right</enum>
</property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property stdset="1">
+ <name>tickInterval</name>
+ <number>5</number>
</property>
- </spacer>
- </hbox>
+ </widget>
+ </vbox>
</widget>
<spacer>
<property>
<name>name</name>
<cstring>Spacer5_2</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>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout12</cstring>
+ <cstring>Layout8</cstring>
</property>
- <hbox>
+ <vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer3_2_3</cstring>
- </property>
- <property stdset="1">
- <name>orientation</name>
- <enum>Horizontal</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>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>PixmapLabel2_2</cstring>
- </property>
- <property stdset="1">
- <name>pixmap</name>
- <pixmap>image1</pixmap>
+ <cstring>micLabel</cstring>
</property>
<property stdset="1">
- <name>scaledContents</name>
- <bool>false</bool>
+ <name>text</name>
+ <string>Microphone</string>
</property>
</widget>
<widget>
- <class>QLabel</class>
+ <class>QSlider</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel2_2</cstring>
+ <cstring>mic</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Silent</string>
+ <name>maxValue</name>
+ <number>100</number>
</property>
- </widget>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer2_2</cstring>
+ <property stdset="1">
+ <name>value</name>
+ <number>50</number>
</property>
<property stdset="1">
<name>orientation</name>
- <enum>Horizontal</enum>
+ <enum>Vertical</enum>
</property>
<property stdset="1">
- <name>sizeType</name>
- <enum>Expanding</enum>
+ <name>tickmarks</name>
+ <enum>Right</enum>
</property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property stdset="1">
+ <name>tickInterval</name>
+ <number>5</number>
</property>
- </spacer>
- </hbox>
+ </widget>
+ </vbox>
</widget>
- </vbox>
+ </hbox>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout8</cstring>
+ <cstring>Layout12</cstring>
</property>
- <vbox>
+ <hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer3_2_3</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</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>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>micLabel</cstring>
+ <cstring>PixmapLabel2_2</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Microphone</string>
+ <name>pixmap</name>
+ <pixmap>image1</pixmap>
+ </property>
+ <property stdset="1">
+ <name>scaledContents</name>
+ <bool>false</bool>
</property>
</widget>
<widget>
- <class>QSlider</class>
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>mic</cstring>
+ <cstring>TextLabel2_2</cstring>
</property>
<property stdset="1">
- <name>maxValue</name>
- <number>100</number>
+ <name>text</name>
+ <string>Silent</string>
</property>
- <property stdset="1">
- <name>value</name>
- <number>50</number>
+ </widget>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer2_2</cstring>
</property>
<property stdset="1">
<name>orientation</name>
- <enum>Vertical</enum>
+ <enum>Horizontal</enum>
</property>
<property stdset="1">
- <name>tickmarks</name>
- <enum>Right</enum>
+ <name>sizeType</name>
+ <enum>Expanding</enum>
</property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
+ </vbox>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout29</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>Record Defaults</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>tickInterval</name>
- <number>5</number>
+ <name>name</name>
+ <cstring>Layout28</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>Rate (5k-44k)</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QLineEdit</class>
+ <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>
- </vbox>
+ </grid>
</widget>
- </hbox>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer9</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>
- </vbox>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer10</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</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>
+ </hbox>
</widget>
</grid>
</widget>
<images>
<image>
<name>image0</name>
<data format="XPM.GZ" length="409">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022630543251d2e253d856405bffcbc54103b11c856360003105719c44d4b8371f590803210638829a38b2983115c2c112a8224969808d60716868a2582c440aa94a1628960a00755a5ac8c2aa64c8118c23c6cf6c2dda787e23eb03f602af1fa17395c6aadb9008c9350cb</data>
</image>
<image>
<name>image1</name>
<data format="XPM.GZ" length="409">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022630543251d2e253d856405bffcbc54105b19c856360003103711c44d4b8371f5d000c962ca9862ca9862ca60b1440806bb0a0c80dcc444304616030924a2a983a8d423a80ed93c6cf6e2701f567f100c835a6b2e0025ab4ee4</data>
</image>
</images>
</UI>