author | llornkcor <llornkcor> | 2002-03-17 13:08:37 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-17 13:08:37 (UTC) |
commit | 2f18edca6cc3539298deccee89e6f4dd7a2570a2 (patch) (side-by-side diff) | |
tree | 58eefa2b254a4c30a266681bd077e0e8029384e3 /noncore/settings | |
parent | 578725ca25862c0b06b1991a7bc8ffc2ad8ae13e (diff) | |
download | opie-2f18edca6cc3539298deccee89e6f4dd7a2570a2.zip opie-2f18edca6cc3539298deccee89e6f4dd7a2570a2.tar.gz opie-2f18edca6cc3539298deccee89e6f4dd7a2570a2.tar.bz2 |
changed line edit to combo, and changed labels and layout
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 51 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.ui | 566 |
2 files changed, 348 insertions, 269 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index 17dbdc0..c2bf405 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp @@ -26,4 +26,6 @@ #include <qcheckbox.h> #include <qlineedit.h> +#include <qcombobox.h> + SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) @@ -33,17 +35,24 @@ SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) config.setGroup( "System" ); volume->setValue(100-config.readNumEntry("Volume")); - mic->setValue(100-config.readNumEntry("Mic")); + mic->setValue(100-config.readNumEntry("Mic")); touchsound->setChecked(config.readBoolEntry("Touch")); keysound->setChecked(config.readBoolEntry("Key")); - config.setGroup("Record"); - sampleRate->setText(config.readEntry("SampleRate", "11025")); - stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); - sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); + 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==44100) + sampleRate->setCurrentItem(2); + + 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) ) ); + connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); } @@ -53,10 +62,16 @@ void SoundSettings::reject() config.setGroup( "System" ); setVolume(100-config.readNumEntry("Volume")); - setMic(100-config.readNumEntry("Mic")); + 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)); + 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==44100) + sampleRate->setCurrentItem(2); + stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); + sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); QDialog::reject(); @@ -73,11 +88,11 @@ void SoundSettings::accept() setVolume(volume->value()); - setMic(mic->value()); + setMic(mic->value()); - config.setGroup("Record"); - config.writeEntry("SampleRate",sampleRate->text()); - 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(); } @@ -89,5 +104,5 @@ void SoundSettings::setVolume(int v) config.writeEntry("Volume",100-v); #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) - QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; + QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; #endif } diff --git a/noncore/settings/sound/soundsettingsbase.ui b/noncore/settings/sound/soundsettingsbase.ui index f47f77e..0351fd8 100644 --- a/noncore/settings/sound/soundsettingsbase.ui +++ b/noncore/settings/sound/soundsettingsbase.ui @@ -12,6 +12,6 @@ <x>0</x> <y>0</y> - <width>372</width> - <height>441</height> + <width>286</width> + <height>338</height> </rect> </property> @@ -35,11 +35,11 @@ <number>6</number> </property> - <widget row="0" column="0" > + <widget row="0" column="1" > <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout30</cstring> + <cstring>Layout9</cstring> </property> - <hbox> + <vbox> <property stdset="1"> <name>margin</name> @@ -54,5 +54,5 @@ <property stdset="1"> <name>name</name> - <cstring>Layout24</cstring> + <cstring>Layout8</cstring> </property> <vbox> @@ -66,4 +66,100 @@ </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>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"> @@ -73,5 +169,5 @@ <property stdset="1"> <name>text</name> - <string>Screen sound</string> + <string>Screen sounds</string> </property> </widget> @@ -84,12 +180,71 @@ <property stdset="1"> <name>text</name> - <string>Keyboard sound</string> + <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"> + <name>name</name> + <cstring>GroupBox3</cstring> + </property> + <property stdset="1"> + <name>title</name> + <string>Levels</string> + </property> + <vbox> + <property stdset="1"> + <name>margin</name> + <number>11</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget> + <class>QLayoutWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>Layout10</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>Layout11</cstring> + <cstring>Layout16</cstring> </property> <hbox> @@ -105,5 +260,5 @@ <property> <name>name</name> - <cstring>Spacer3_2_2</cstring> + <cstring>Spacer37</cstring> </property> <property stdset="1"> @@ -152,5 +307,5 @@ <property> <name>name</name> - <cstring>Spacer3_2</cstring> + <cstring>Spacer7</cstring> </property> <property stdset="1"> @@ -176,5 +331,5 @@ <property stdset="1"> <name>name</name> - <cstring>Layout11</cstring> + <cstring>Layout13</cstring> </property> <hbox> @@ -188,66 +343,22 @@ </property> <widget> - <class>QLayoutWidget</class> + <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>Layout7</cstring> + <cstring>volLabel</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Output</string> </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>volLabel</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Volume</string> - </property> - </widget> - <widget> - <class>QSlider</class> - <property stdset="1"> - <name>name</name> - <cstring>volume</cstring> - </property> - <property stdset="1"> - <name>maxValue</name> - <number>100</number> - </property> - <property stdset="1"> - <name>value</name> - <number>50</number> - </property> - <property stdset="1"> - <name>orientation</name> - <enum>Vertical</enum> - </property> - <property stdset="1"> - <name>tickmarks</name> - <enum>Right</enum> - </property> - <property stdset="1"> - <name>tickInterval</name> - <number>5</number> - </property> - </widget> - </vbox> </widget> <spacer> <property> <name>name</name> - <cstring>Spacer5_2</cstring> + <cstring>Spacer20</cstring> </property> <property stdset="1"> <name>orientation</name> - <enum>Vertical</enum> + <enum>Horizontal</enum> </property> <property stdset="1"> @@ -264,58 +375,35 @@ </spacer> <widget> - <class>QLayoutWidget</class> + <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>Layout8</cstring> + <cstring>micLabel</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Mic</string> </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>micLabel</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Microphone</string> - </property> - </widget> - <widget> - <class>QSlider</class> - <property stdset="1"> - <name>name</name> - <cstring>mic</cstring> - </property> - <property stdset="1"> - <name>maxValue</name> - <number>100</number> - </property> - <property stdset="1"> - <name>value</name> - <number>50</number> - </property> - <property stdset="1"> - <name>orientation</name> - <enum>Vertical</enum> - </property> - <property stdset="1"> - <name>tickmarks</name> - <enum>Right</enum> - </property> - <property stdset="1"> - <name>tickInterval</name> - <number>5</number> - </property> - </widget> - </vbox> </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer17</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> @@ -335,8 +423,35 @@ <number>6</number> </property> + <widget> + <class>QSlider</class> + <property stdset="1"> + <name>name</name> + <cstring>volume</cstring> + </property> + <property stdset="1"> + <name>maxValue</name> + <number>100</number> + </property> + <property stdset="1"> + <name>value</name> + <number>50</number> + </property> + <property stdset="1"> + <name>orientation</name> + <enum>Vertical</enum> + </property> + <property stdset="1"> + <name>tickmarks</name> + <enum>Right</enum> + </property> + <property stdset="1"> + <name>tickInterval</name> + <number>5</number> + </property> + </widget> <spacer> <property> <name>name</name> - <cstring>Spacer3_2_3</cstring> + <cstring>Spacer19</cstring> </property> <property stdset="1"> @@ -357,27 +472,28 @@ </spacer> <widget> - <class>QLabel</class> + <class>QSlider</class> <property stdset="1"> <name>name</name> - <cstring>PixmapLabel2_2</cstring> + <cstring>mic</cstring> </property> <property stdset="1"> - <name>pixmap</name> - <pixmap>image1</pixmap> + <name>maxValue</name> + <number>100</number> </property> <property stdset="1"> - <name>scaledContents</name> - <bool>false</bool> + <name>value</name> + <number>50</number> </property> - </widget> - <widget> - <class>QLabel</class> <property stdset="1"> - <name>name</name> - <cstring>TextLabel2_2</cstring> + <name>orientation</name> + <enum>Vertical</enum> </property> <property stdset="1"> - <name>text</name> - <string>Silent</string> + <name>tickmarks</name> + <enum>Right</enum> + </property> + <property stdset="1"> + <name>tickInterval</name> + <number>5</number> </property> </widget> @@ -385,5 +501,5 @@ <property> <name>name</name> - <cstring>Spacer2_2</cstring> + <cstring>Spacer18</cstring> </property> <property stdset="1"> @@ -405,35 +521,14 @@ </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> + <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>GroupBox1</cstring> - </property> - <property stdset="1"> - <name>title</name> - <string>Record Defaults</string> + <cstring>Layout17</cstring> </property> - <grid> + <hbox> <property stdset="1"> <name>margin</name> - <number>11</number> + <number>0</number> </property> <property stdset="1"> @@ -441,108 +536,77 @@ <number>6</number> </property> - <widget row="0" column="0" > - <class>QLayoutWidget</class> + <spacer> + <property> + <name>name</name> + <cstring>Spacer38</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>Layout28</cstring> + <cstring>PixmapLabel2_2</cstring> + </property> + <property stdset="1"> + <name>pixmap</name> + <pixmap>image1</pixmap> + </property> + <property stdset="1"> + <name>scaledContents</name> + <bool>false</bool> </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> - </grid> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel2_2</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Silent</string> + </property> + </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer8</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> - <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> - <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> + </vbox> </widget> </grid> |