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 | 21 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.ui | 416 |
2 files changed, 258 insertions, 179 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 @@ -27,2 +27,4 @@ #include <qlineedit.h> +#include <qcombobox.h> + @@ -39,3 +41,10 @@ SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) config.setGroup("Record"); - sampleRate->setText(config.readEntry("SampleRate", "11025")); + 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)); @@ -57,3 +66,9 @@ void SoundSettings::reject() config.setGroup("Record"); - sampleRate->setText(config.readEntry("SampleRate", "11025")); + 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)); @@ -77,3 +92,3 @@ void SoundSettings::accept() config.setGroup("Record"); - config.writeEntry("SampleRate",sampleRate->text()); + config.writeEntry("SampleRate",sampleRate->currentText()); config.writeEntry("Stereo",stereoCheckBox->isChecked()); 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 @@ -13,4 +13,4 @@ <y>0</y> - <width>372</width> - <height>441</height> + <width>286</width> + <height>338</height> </rect> @@ -36,3 +36,3 @@ </property> - <widget row="0" column="0" > + <widget row="0" column="1" > <class>QLayoutWidget</class> @@ -40,5 +40,5 @@ <name>name</name> - <cstring>Layout30</cstring> + <cstring>Layout9</cstring> </property> - <hbox> + <vbox> <property stdset="1"> @@ -55,3 +55,3 @@ <name>name</name> - <cstring>Layout24</cstring> + <cstring>Layout8</cstring> </property> @@ -67,2 +67,98 @@ <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> @@ -74,3 +170,3 @@ <name>text</name> - <string>Screen sound</string> + <string>Screen sounds</string> </property> @@ -85,5 +181,64 @@ <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> @@ -92,3 +247,3 @@ <name>name</name> - <cstring>Layout11</cstring> + <cstring>Layout16</cstring> </property> @@ -106,3 +261,3 @@ <name>name</name> - <cstring>Spacer3_2_2</cstring> + <cstring>Spacer37</cstring> </property> @@ -153,3 +308,3 @@ <name>name</name> - <cstring>Spacer3_2</cstring> + <cstring>Spacer7</cstring> </property> @@ -177,3 +332,3 @@ <name>name</name> - <cstring>Layout11</cstring> + <cstring>Layout13</cstring> </property> @@ -189,17 +344,2 @@ <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout7</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> @@ -211,34 +351,37 @@ <name>text</name> - <string>Volume</string> + <string>Output</string> </property> </widget> - <widget> - <class>QSlider</class> - <property stdset="1"> + <spacer> + <property> <name>name</name> - <cstring>volume</cstring> + <cstring>Spacer20</cstring> </property> <property stdset="1"> - <name>maxValue</name> - <number>100</number> + <name>orientation</name> + <enum>Horizontal</enum> </property> <property stdset="1"> - <name>value</name> - <number>50</number> + <name>sizeType</name> + <enum>Expanding</enum> </property> - <property stdset="1"> - <name>orientation</name> - <enum>Vertical</enum> + <property> + <name>sizeHint</name> + <size> + <width>20</width> + <height>20</height> + </size> </property> + </spacer> + <widget> + <class>QLabel</class> <property stdset="1"> - <name>tickmarks</name> - <enum>Right</enum> + <name>name</name> + <cstring>micLabel</cstring> </property> <property stdset="1"> - <name>tickInterval</name> - <number>5</number> + <name>text</name> + <string>Mic</string> </property> </widget> - </vbox> - </widget> <spacer> @@ -246,3 +389,3 @@ <name>name</name> - <cstring>Spacer5_2</cstring> + <cstring>Spacer17</cstring> </property> @@ -250,3 +393,3 @@ <name>orientation</name> - <enum>Vertical</enum> + <enum>Horizontal</enum> </property> @@ -264,2 +407,4 @@ </spacer> + </hbox> + </widget> <widget> @@ -268,5 +413,5 @@ <name>name</name> - <cstring>Layout8</cstring> + <cstring>Layout12</cstring> </property> - <vbox> + <hbox> <property stdset="1"> @@ -280,13 +425,2 @@ <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> @@ -294,3 +428,3 @@ <name>name</name> - <cstring>mic</cstring> + <cstring>volume</cstring> </property> @@ -317,21 +451,2 @@ </widget> - </vbox> - </widget> - </hbox> - </widget> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout12</cstring> - </property> - <hbox> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> <spacer> @@ -339,3 +454,3 @@ <name>name</name> - <cstring>Spacer3_2_3</cstring> + <cstring>Spacer19</cstring> </property> @@ -358,25 +473,26 @@ <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> @@ -386,3 +502,3 @@ <name>name</name> - <cstring>Spacer2_2</cstring> + <cstring>Spacer18</cstring> </property> @@ -406,4 +522,2 @@ </widget> - </vbox> - </widget> <widget> @@ -412,5 +526,5 @@ <name>name</name> - <cstring>Layout29</cstring> + <cstring>Layout17</cstring> </property> - <vbox> + <hbox> <property stdset="1"> @@ -423,36 +537,23 @@ </property> - <widget> - <class>QGroupBox</class> - <property stdset="1"> + <spacer> + <property> <name>name</name> - <cstring>GroupBox1</cstring> + <cstring>Spacer38</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>name</name> - <cstring>Layout28</cstring> + <name>orientation</name> + <enum>Horizontal</enum> </property> - <vbox> <property stdset="1"> - <name>margin</name> - <number>0</number> + <name>sizeType</name> + <enum>Expanding</enum> </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> + <property> + <name>sizeHint</name> + <size> + <width>20</width> + <height>20</height> + </size> </property> + </spacer> <widget> @@ -461,25 +562,11 @@ <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> + <cstring>PixmapLabel2_2</cstring> </property> - </widget> - <widget> - <class>QCheckBox</class> <property stdset="1"> - <name>name</name> - <cstring>stereoCheckBox</cstring> + <name>pixmap</name> + <pixmap>image1</pixmap> </property> <property stdset="1"> - <name>text</name> - <string>Stereo</string> + <name>scaledContents</name> + <bool>false</bool> </property> @@ -487,6 +574,6 @@ <widget> - <class>QCheckBox</class> + <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>sixteenBitCheckBox</cstring> + <cstring>TextLabel2_2</cstring> </property> @@ -494,31 +581,4 @@ <name>text</name> - <string>16 bit</string> - </property> - </widget> - </vbox> - </widget> - </grid> - </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> + <string>Silent</string> </property> - </spacer> - </vbox> </widget> @@ -527,3 +587,3 @@ <name>name</name> - <cstring>Spacer10</cstring> + <cstring>Spacer8</cstring> </property> @@ -547,2 +607,6 @@ </widget> + </vbox> + </widget> + </vbox> + </widget> </grid> |