author | llornkcor <llornkcor> | 2002-06-23 18:33:17 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-06-23 18:33:17 (UTC) |
commit | b50f663aabaf51821a35a94354237a3387954e79 (patch) (unidiff) | |
tree | c2dc2879fc7d6964aea4201995927e967f3bade3 | |
parent | f0e656b51a2dcee1dec594636cbc1ba8d4b11eef (diff) | |
download | opie-b50f663aabaf51821a35a94354237a3387954e79.zip opie-b50f663aabaf51821a35a94354237a3387954e79.tar.gz opie-b50f663aabaf51821a35a94354237a3387954e79.tar.bz2 |
added recording time limit
-rw-r--r-- | noncore/settings/sound/sound.pro | 2 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 21 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.h | 3 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.cpp | 28 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.h | 1 |
5 files changed, 46 insertions, 9 deletions
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index 28c8b0d..a5c6cea 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro | |||
@@ -1,25 +1,25 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = soundsettings.h soundsettingsbase.h | 4 | HEADERS = soundsettings.h soundsettingsbase.h |
5 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp | 5 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp |
6 | #INTERFACES = soundsettingsbase.ui | 6 | #INTERFACES = soundsettingsbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | TARGET = sound | 10 | TARGET = sound |
11 | 11 | ||
12 | TRANSLATIONS = ../../i18n/pt_BR/sound.ts | 12 | TRANSLATIONS = ../../i18n/pt_BR/sound.ts |
13 | TRANSLATIONS += ../../i18n/es/sound.ts | 13 | TRANSLATIONS += ../../i18n/es/sound.ts |
14 | TRANSLATIONS += ../../i18n/pt/sound.ts | 14 | TRANSLATIONS += ../../i18n/pt/sound.ts |
15 | TRANSLATIONS += ../../i18n/de/sound.ts | 15 | TRANSLATIONS += ../../i18n/de/sound.ts |
16 | TRANSLATIONS += ../../i18n/en/sound.ts | 16 | TRANSLATIONS += ../../i18n/en/sound.ts |
17 | TRANSLATIONS += ../../i18n/hu/sound.ts | 17 | TRANSLATIONS += ../../i18n/hu/sound.ts |
18 | TRANSLATIONS += ../../i18n/sl/sound.ts | 18 | TRANSLATIONS += ../../i18n/sl/sound.ts |
19 | TRANSLATIONS += ../../i18n/pl/sound.ts | 19 | TRANSLATIONS += ../../i18n/pl/sound.ts |
20 | TRANSLATIONS += ../../i18n/ja/sound.ts | 20 | TRANSLATIONS += ../../i18n/ja/sound.ts |
21 | TRANSLATIONS += ../../i18n/ko/sound.ts | 21 | TRANSLATIONS += ../../i18n/ko/sound.ts |
22 | TRANSLATIONS += ../../i18n/no/sound.ts | 22 | TRANSLATIONS += ../../i18n/no/sound.ts |
23 | TRANSLATIONS += ../../i18n/zh_CN/sound.ts | 23 | TRANSLATIONS += ../../i18n/zh_CN/sound.ts |
24 | TRANSLATIONS += ../../i18n/zh_TW/sound.ts | 24 | TRANSLATIONS += ../../i18n/zh_TW/sound.ts |
25 | TRANSLATIONS += ../../i18n/fr/sound.ts | 25 | TRANSLATIONS += ../../i18n/fr/sound.ts |
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index 672548f..3ceaf0c 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp | |||
@@ -1,250 +1,271 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "soundsettings.h" | 21 | #include "soundsettings.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <qpe/config.h> | 24 | #include <qpe/config.h> |
25 | #include <qpe/qcopenvelope_qws.h> | 25 | #include <qpe/qcopenvelope_qws.h> |
26 | #include <qpe/storage.h> | 26 | #include <qpe/storage.h> |
27 | 27 | ||
28 | #include <qapplication.h> | 28 | #include <qapplication.h> |
29 | #include <qslider.h> | 29 | #include <qslider.h> |
30 | #include <qcheckbox.h> | 30 | #include <qcheckbox.h> |
31 | #include <qlineedit.h> | 31 | #include <qlineedit.h> |
32 | #include <qcombobox.h> | 32 | #include <qcombobox.h> |
33 | 33 | ||
34 | #include <sys/utsname.h> | 34 | #include <sys/utsname.h> |
35 | #include <sys/time.h> | 35 | #include <sys/time.h> |
36 | #include <sys/types.h> | 36 | #include <sys/types.h> |
37 | #include <unistd.h> | 37 | #include <unistd.h> |
38 | #include <stdio.h> | 38 | #include <stdio.h> |
39 | #include <sys/stat.h> | 39 | #include <sys/stat.h> |
40 | 40 | ||
41 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | 41 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) |
42 | : SoundSettingsBase( parent, objname, TRUE, fl ) | 42 | : SoundSettingsBase( parent, objname, TRUE, fl ) |
43 | { | 43 | { |
44 | keyReset=FALSE; | 44 | keyReset=FALSE; |
45 | 45 | ||
46 | Config config( "qpe"); | 46 | Config config( "qpe"); |
47 | config.setGroup( "Volume" ); | 47 | config.setGroup( "Volume" ); |
48 | volume->setValue(100-config.readNumEntry("VolumePercent")); | 48 | volume->setValue(100-config.readNumEntry("VolumePercent")); |
49 | mic->setValue(100-config.readNumEntry("Mic")); | 49 | mic->setValue(100-config.readNumEntry("Mic")); |
50 | // touchsound->setChecked(config.readBoolEntry("TouchSound")); | 50 | // touchsound->setChecked(config.readBoolEntry("TouchSound")); |
51 | // keysound->setChecked(config.readBoolEntry("KeySound")); | 51 | // keysound->setChecked(config.readBoolEntry("KeySound")); |
52 | Config cfg("Vmemo"); | 52 | Config cfg("Vmemo"); |
53 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 53 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
54 | AlertCheckBox->setChecked(cfg.readBoolEntry("Alert")); | 54 | AlertCheckBox->setChecked(cfg.readBoolEntry("Alert")); |
55 | 55 | ||
56 | cfg.setGroup("Record"); | 56 | cfg.setGroup("Record"); |
57 | int rate=config.readNumEntry("SampleRate", 22050); | 57 | int rate=config.readNumEntry("SampleRate", 22050); |
58 | if(rate == 8000) | 58 | if(rate == 8000) |
59 | sampleRate->setCurrentItem(0); | 59 | sampleRate->setCurrentItem(0); |
60 | else if(rate == 11025) | 60 | else if(rate == 11025) |
61 | sampleRate->setCurrentItem(1); | 61 | sampleRate->setCurrentItem(1); |
62 | else if(rate == 22050) | 62 | else if(rate == 22050) |
63 | sampleRate->setCurrentItem(2); | 63 | sampleRate->setCurrentItem(2); |
64 | else if(rate == 33075) | 64 | else if(rate == 33075) |
65 | sampleRate->setCurrentItem(3); | 65 | sampleRate->setCurrentItem(3); |
66 | else if(rate==44100) | 66 | else if(rate==44100) |
67 | sampleRate->setCurrentItem(4); | 67 | sampleRate->setCurrentItem(4); |
68 | 68 | ||
69 | stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); //TODO hide if zaurus- mono only | 69 | stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); //TODO hide if zaurus- mono only |
70 | struct utsname name; /* check for embedix kernel running on the zaurus*/ | 70 | struct utsname name; /* check for embedix kernel running on the zaurus*/ |
71 | if (uname(&name) != -1) { | 71 | if (uname(&name) != -1) { |
72 | QString release=name.release; | 72 | QString release=name.release; |
73 | 73 | ||
74 | if( release.find("embedix",0,TRUE) !=-1) | 74 | if( release.find("embedix",0,TRUE) !=-1) |
75 | stereoCheckBox->hide(); | 75 | stereoCheckBox->hide(); |
76 | } | 76 | } |
77 | // else | 77 | // else |
78 | // stereoCheckBox->hide(); | 78 | // stereoCheckBox->hide(); |
79 | int sRate=config.readNumEntry("SizeLimit", 30); | ||
80 | if(sRate ==30) | ||
81 | timeLimitComboBox->setCurrentItem(0); | ||
82 | else if(sRate==20) | ||
83 | timeLimitComboBox->setCurrentItem(1); | ||
84 | else if(sRate == 15) | ||
85 | timeLimitComboBox->setCurrentItem(2); | ||
86 | else if(sRate == 10) | ||
87 | |||
88 | timeLimitComboBox->setCurrentItem(3); | ||
89 | else | ||
90 | timeLimitComboBox->setCurrentItem(4); | ||
79 | 91 | ||
80 | 92 | ||
81 | sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); | 93 | sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); |
82 | 94 | ||
83 | cfg.setGroup("Defaults"); | 95 | cfg.setGroup("Defaults"); |
84 | keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); | 96 | keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); |
85 | 97 | ||
86 | updateStorageCombo(); | 98 | updateStorageCombo(); |
87 | 99 | ||
88 | connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); | 100 | connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); |
89 | connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); | 101 | connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); |
90 | connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); | 102 | connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); |
91 | connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); | 103 | connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); |
92 | connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); | 104 | connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); |
93 | connect( keyComboBox,SIGNAL(activated(const QString &)),this,SLOT(setKeyButton(const QString &))); | 105 | connect( keyComboBox,SIGNAL(activated(const QString &)),this,SLOT(setKeyButton(const QString &))); |
106 | connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT(setSizeLimitButton(const QString &))); | ||
94 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 107 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
95 | } | 108 | } |
96 | 109 | ||
97 | // void SoundSettings::reject() | 110 | // void SoundSettings::reject() |
98 | // { | 111 | // { |
99 | // qDebug("reject"); | 112 | // qDebug("reject"); |
100 | // Config config( "qpe"); | 113 | // Config config( "qpe"); |
101 | // config.setGroup( "Volume"); | 114 | // config.setGroup( "Volume"); |
102 | 115 | ||
103 | // setVolume(100-config.readNumEntry("VolumePercent")); | 116 | // setVolume(100-config.readNumEntry("VolumePercent")); |
104 | // setMic(100-config.readNumEntry("Mic")); | 117 | // setMic(100-config.readNumEntry("Mic")); |
105 | 118 | ||
106 | // // config.setGroup("Record"); | 119 | // // config.setGroup("Record"); |
107 | // // int rate=config.readNumEntry("SampleRate", 11025); | 120 | // // int rate=config.readNumEntry("SampleRate", 11025); |
108 | // // if(rate == 11025) | 121 | // // if(rate == 11025) |
109 | // // sampleRate->setCurrentItem(0); | 122 | // // sampleRate->setCurrentItem(0); |
110 | // // else if(rate == 22050) | 123 | // // else if(rate == 22050) |
111 | // // sampleRate->setCurrentItem(1); | 124 | // // sampleRate->setCurrentItem(1); |
112 | // // else if(rate == 32000) | 125 | // // else if(rate == 32000) |
113 | // // sampleRate->setCurrentItem(2); | 126 | // // sampleRate->setCurrentItem(2); |
114 | // // else if(rate==44100) | 127 | // // else if(rate==44100) |
115 | // // sampleRate->setCurrentItem(3); | 128 | // // sampleRate->setCurrentItem(3); |
116 | // // stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); | 129 | // // stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); |
117 | // // sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); | 130 | // // sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); |
118 | // qDebug("QDialog::reject();"); | 131 | // qDebug("QDialog::reject();"); |
119 | // ::exit(-1); | 132 | // ::exit(-1); |
120 | // } | 133 | // } |
121 | 134 | ||
122 | // void SoundSettings::accept() | 135 | // void SoundSettings::accept() |
123 | // { | 136 | // { |
124 | // qDebug("accept"); | 137 | // qDebug("accept"); |
125 | // Config config( "qpe" ); | 138 | // Config config( "qpe" ); |
126 | // config.setGroup( "Volume" ); | 139 | // config.setGroup( "Volume" ); |
127 | // config.writeEntry("VolumePercent",100-volume->value()); | 140 | // config.writeEntry("VolumePercent",100-volume->value()); |
128 | // config.writeEntry("Mic",100-mic->value()); | 141 | // config.writeEntry("Mic",100-mic->value()); |
129 | // // config.writeEntry("TouchSound",touchsound->isChecked()); | 142 | // // config.writeEntry("TouchSound",touchsound->isChecked()); |
130 | // // config.writeEntry("KeySound",keysound->isChecked()); | 143 | // // config.writeEntry("KeySound",keysound->isChecked()); |
131 | 144 | ||
132 | // Config cfg("Vmemo"); | 145 | // Config cfg("Vmemo"); |
133 | // cfg.writeEntry("Alert",AlertCheckBox->isChecked()); | 146 | // cfg.writeEntry("Alert",AlertCheckBox->isChecked()); |
134 | // setVolume(volume->value()); | 147 | // setVolume(volume->value()); |
135 | // setMic(mic->value()); | 148 | // setMic(mic->value()); |
136 | 149 | ||
137 | // cfg.setGroup("Record"); | 150 | // cfg.setGroup("Record"); |
138 | // cfg.writeEntry("SampleRate",sampleRate->currentText()); | 151 | // cfg.writeEntry("SampleRate",sampleRate->currentText()); |
139 | // cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); | 152 | // cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); |
140 | // cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); | 153 | // cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); |
141 | // // Config cfg( "VMemo" ); | 154 | // // Config cfg( "VMemo" ); |
142 | // // cfg.setGroup( "Defaults" ); | 155 | // // cfg.setGroup( "Defaults" ); |
143 | // // cfg.writeEntry( "hideIcon", HideIcon_CheckBox->isChecked()); | 156 | // // cfg.writeEntry( "hideIcon", HideIcon_CheckBox->isChecked()); |
144 | // qDebug("QDialog::accept();"); | 157 | // qDebug("QDialog::accept();"); |
145 | // ::exit(0); | 158 | // ::exit(0); |
146 | // } | 159 | // } |
147 | 160 | ||
148 | void SoundSettings::setVolume(int v) | 161 | void SoundSettings::setVolume(int v) |
149 | { | 162 | { |
150 | Config config( "qpe" ); | 163 | Config config( "qpe" ); |
151 | config.setGroup( "Volume" ); | 164 | config.setGroup( "Volume" ); |
152 | config.writeEntry("VolumePercent",100-v); | 165 | config.writeEntry("VolumePercent",100-v); |
153 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 166 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
154 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | 167 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; |
155 | #endif | 168 | #endif |
156 | } | 169 | } |
157 | 170 | ||
158 | void SoundSettings::setMic(int m) | 171 | void SoundSettings::setMic(int m) |
159 | { | 172 | { |
160 | Config config( "qpe" ); | 173 | Config config( "qpe" ); |
161 | config.setGroup( "Volume" ); | 174 | config.setGroup( "Volume" ); |
162 | config.writeEntry("Mic",100-m); | 175 | config.writeEntry("Mic",100-m); |
163 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 176 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
164 | QCopEnvelope( "QPE/System", "micChange(bool)" ) << FALSE; | 177 | QCopEnvelope( "QPE/System", "micChange(bool)" ) << FALSE; |
165 | #endif | 178 | #endif |
166 | } | 179 | } |
167 | 180 | ||
168 | void SoundSettings::volumeChanged( bool ) | 181 | void SoundSettings::volumeChanged( bool ) |
169 | { | 182 | { |
170 | Config config( "qpe" ); | 183 | Config config( "qpe" ); |
171 | config.setGroup( "Volume" ); | 184 | config.setGroup( "Volume" ); |
172 | volume->setValue(100-config.readNumEntry("VolumePercent")); | 185 | volume->setValue(100-config.readNumEntry("VolumePercent")); |
173 | } | 186 | } |
174 | 187 | ||
175 | void SoundSettings::micChanged( bool ) | 188 | void SoundSettings::micChanged( bool ) |
176 | { | 189 | { |
177 | Config config( "qpe" ); | 190 | Config config( "qpe" ); |
178 | config.setGroup( "Volume" ); | 191 | config.setGroup( "Volume" ); |
179 | mic->setValue(100-config.readNumEntry("Mic")); | 192 | mic->setValue(100-config.readNumEntry("Mic")); |
180 | } | 193 | } |
181 | 194 | ||
182 | void SoundSettings::updateStorageCombo() { | 195 | void SoundSettings::updateStorageCombo() { |
183 | 196 | ||
184 | Config config( "Vmemo" ); | 197 | Config config( "Vmemo" ); |
185 | config.setGroup( "System" ); | 198 | config.setGroup( "System" ); |
186 | QString loc = config.readEntry("RecLocation","/"); | 199 | QString loc = config.readEntry("RecLocation","/"); |
187 | int i=0; | 200 | int i=0; |
188 | int set=0; | 201 | int set=0; |
189 | StorageInfo storageInfo; | 202 | StorageInfo storageInfo; |
190 | QString sName, sPath; | 203 | QString sName, sPath; |
191 | QStringList list; | 204 | QStringList list; |
192 | const QList<FileSystem> &fs = storageInfo.fileSystems(); | 205 | const QList<FileSystem> &fs = storageInfo.fileSystems(); |
193 | QListIterator<FileSystem> it ( fs ); | 206 | QListIterator<FileSystem> it ( fs ); |
194 | for( ; it.current(); ++it ){ | 207 | for( ; it.current(); ++it ){ |
195 | const QString name = (*it)->name(); | 208 | const QString name = (*it)->name(); |
196 | const QString path = (*it)->path(); | 209 | const QString path = (*it)->path(); |
197 | qDebug("storage name "+name +" storage path is "+path); | 210 | qDebug("storage name "+name +" storage path is "+path); |
198 | list << name + ": " +path; | 211 | list << name + ": " +path; |
199 | if( loc.find( path,0,TRUE) != -1) | 212 | if( loc.find( path,0,TRUE) != -1) |
200 | set = i; | 213 | set = i; |
201 | // if(dit.current()->file().find(path) != -1 ) storage=name; | 214 | // if(dit.current()->file().find(path) != -1 ) storage=name; |
202 | i++; | 215 | i++; |
203 | } | 216 | } |
204 | LocationComboBox->insertStringList(list); | 217 | LocationComboBox->insertStringList(list); |
205 | qDebug("set item %d", set); | 218 | qDebug("set item %d", set); |
206 | LocationComboBox->setCurrentItem(set); | 219 | LocationComboBox->setCurrentItem(set); |
207 | } | 220 | } |
208 | 221 | ||
209 | void SoundSettings::setLocation(const QString & string) { | 222 | void SoundSettings::setLocation(const QString & string) { |
210 | Config config( "Vmemo" ); | 223 | Config config( "Vmemo" ); |
211 | config.setGroup( "System" ); | 224 | config.setGroup( "System" ); |
212 | config.writeEntry("RecLocation",string); | 225 | config.writeEntry("RecLocation",string); |
213 | qDebug("set location "+string); | 226 | qDebug("set location "+string); |
214 | config.write(); | 227 | config.write(); |
215 | } | 228 | } |
216 | 229 | ||
217 | void SoundSettings::cleanUp() { | 230 | void SoundSettings::cleanUp() { |
218 | qDebug("cleanup"); | 231 | qDebug("cleanup"); |
219 | Config config( "qpe" ); | 232 | Config config( "qpe" ); |
220 | config.setGroup( "Volume" ); | 233 | config.setGroup( "Volume" ); |
221 | config.writeEntry("VolumePercent",100-volume->value()); | 234 | config.writeEntry("VolumePercent",100-volume->value()); |
222 | config.writeEntry("Mic",100-mic->value()); | 235 | config.writeEntry("Mic",100-mic->value()); |
223 | // config.writeEntry("TouchSound",touchsound->isChecked()); | 236 | // config.writeEntry("TouchSound",touchsound->isChecked()); |
224 | // config.writeEntry("KeySound",keysound->isChecked()); | 237 | // config.writeEntry("KeySound",keysound->isChecked()); |
225 | 238 | ||
226 | Config cfg("Vmemo"); | 239 | Config cfg("Vmemo"); |
227 | cfg.writeEntry("Alert",AlertCheckBox->isChecked()); | 240 | cfg.writeEntry("Alert",AlertCheckBox->isChecked()); |
228 | setVolume(volume->value()); | 241 | setVolume(volume->value()); |
229 | setMic(mic->value()); | 242 | setMic(mic->value()); |
230 | 243 | ||
231 | cfg.setGroup("Record"); | 244 | cfg.setGroup("Record"); |
232 | cfg.writeEntry("SampleRate",sampleRate->currentText()); | 245 | cfg.writeEntry("SampleRate",sampleRate->currentText()); |
233 | cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); | 246 | cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); |
234 | cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); | 247 | cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); |
235 | 248 | ||
236 | if(keyReset) QCopEnvelope ("QPE/System", "restart()"); | 249 | if(keyReset) QCopEnvelope ("QPE/System", "restart()"); |
237 | 250 | ||
238 | } | 251 | } |
239 | 252 | ||
240 | void SoundSettings::setKeyButton(const QString &name) { | 253 | void SoundSettings::setKeyButton(const QString &name) { |
241 | Config cfg("Vmemo"); | 254 | Config cfg("Vmemo"); |
242 | cfg.setGroup("Defaults"); | 255 | cfg.setGroup("Defaults"); |
243 | cfg.writeEntry( "toggleKey", keyComboBox->currentItem() ); | 256 | cfg.writeEntry( "toggleKey", keyComboBox->currentItem() ); |
244 | keyReset = TRUE; | 257 | keyReset = TRUE; |
245 | cfg.write(); | 258 | cfg.write(); |
246 | } | 259 | } |
247 | 260 | ||
248 | void SoundSettings::updateLocationCombo() { | 261 | void SoundSettings::updateLocationCombo() { |
249 | 262 | ||
250 | } | 263 | } |
264 | |||
265 | void SoundSettings::setSizeLimitButton(const QString &index) { | ||
266 | |||
267 | Config cfg("Vmemo"); | ||
268 | cfg.setGroup("Record"); | ||
269 | cfg.writeEntry("SizeLimit", index); | ||
270 | cfg.write(); | ||
271 | } | ||
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h index 0676e12..94d5d48 100644 --- a/noncore/settings/sound/soundsettings.h +++ b/noncore/settings/sound/soundsettings.h | |||
@@ -1,53 +1,54 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef SOUNDSETTINGS_H | 20 | #ifndef SOUNDSETTINGS_H |
21 | #define SOUNDSETTINGS_H | 21 | #define SOUNDSETTINGS_H |
22 | 22 | ||
23 | 23 | ||
24 | #include "soundsettingsbase.h" | 24 | #include "soundsettingsbase.h" |
25 | 25 | ||
26 | 26 | ||
27 | class SoundSettings : public SoundSettingsBase | 27 | class SoundSettings : public SoundSettingsBase |
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | 30 | ||
31 | public: | 31 | public: |
32 | SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 32 | SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
33 | 33 | ||
34 | protected: | 34 | protected: |
35 | /* void accept(); */ | 35 | /* void accept(); */ |
36 | /* void reject(); */ | 36 | /* void reject(); */ |
37 | void updateStorageCombo(); | 37 | void updateStorageCombo(); |
38 | void updateLocationCombo(); | 38 | void updateLocationCombo(); |
39 | 39 | ||
40 | private slots: | 40 | private slots: |
41 | void setKeyButton(const QString &); | 41 | void setKeyButton(const QString &); |
42 | void setSizeLimitButton(const QString &); | ||
42 | void setLocation(const QString &); | 43 | void setLocation(const QString &); |
43 | void cleanUp(); | 44 | void cleanUp(); |
44 | void setVolume(int); | 45 | void setVolume(int); |
45 | void setMic(int); | 46 | void setMic(int); |
46 | 47 | ||
47 | void volumeChanged( bool muted ); | 48 | void volumeChanged( bool muted ); |
48 | void micChanged( bool muted ); | 49 | void micChanged( bool muted ); |
49 | }; | 50 | }; |
50 | 51 | ||
51 | 52 | ||
52 | #endif // SOUNDSETTINGS_H | 53 | #endif // SOUNDSETTINGS_H |
53 | 54 | ||
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp index 6cb4f89..8be1b3d 100644 --- a/noncore/settings/sound/soundsettingsbase.cpp +++ b/noncore/settings/sound/soundsettingsbase.cpp | |||
@@ -102,176 +102,190 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
102 | GroupBox3Layout->setSpacing( 2 ); | 102 | GroupBox3Layout->setSpacing( 2 ); |
103 | GroupBox3Layout->setMargin( 2 ); | 103 | GroupBox3Layout->setMargin( 2 ); |
104 | 104 | ||
105 | Layout10 = new QVBoxLayout; | 105 | Layout10 = new QVBoxLayout; |
106 | Layout10->setSpacing( 2 ); | 106 | Layout10->setSpacing( 2 ); |
107 | Layout10->setMargin( 2 ); | 107 | Layout10->setMargin( 2 ); |
108 | 108 | ||
109 | Layout16 = new QHBoxLayout; | 109 | Layout16 = new QHBoxLayout; |
110 | Layout16->setSpacing( 2 ); | 110 | Layout16->setSpacing( 2 ); |
111 | Layout16->setMargin( 2 ); | 111 | Layout16->setMargin( 2 ); |
112 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | 112 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); |
113 | Layout16->addItem( spacer ); | 113 | Layout16->addItem( spacer ); |
114 | 114 | ||
115 | PixmapLabel1_2 = new QLabel( GroupBox3, "PixmapLabel1_2" ); | 115 | PixmapLabel1_2 = new QLabel( GroupBox3, "PixmapLabel1_2" ); |
116 | PixmapLabel1_2->setPixmap( image0 ); | 116 | PixmapLabel1_2->setPixmap( image0 ); |
117 | PixmapLabel1_2->setScaledContents( FALSE ); | 117 | PixmapLabel1_2->setScaledContents( FALSE ); |
118 | Layout16->addWidget( PixmapLabel1_2 ); | 118 | Layout16->addWidget( PixmapLabel1_2 ); |
119 | 119 | ||
120 | TextLabel1_2 = new QLabel( GroupBox3, "TextLabel1_2" ); | 120 | TextLabel1_2 = new QLabel( GroupBox3, "TextLabel1_2" ); |
121 | TextLabel1_2->setText( tr( "Loud" ) ); | 121 | TextLabel1_2->setText( tr( "Loud" ) ); |
122 | Layout16->addWidget( TextLabel1_2 ); | 122 | Layout16->addWidget( TextLabel1_2 ); |
123 | QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | 123 | QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); |
124 | Layout16->addItem( spacer_2 ); | 124 | Layout16->addItem( spacer_2 ); |
125 | Layout10->addLayout( Layout16 ); | 125 | Layout10->addLayout( Layout16 ); |
126 | 126 | ||
127 | Layout13 = new QHBoxLayout; | 127 | Layout13 = new QHBoxLayout; |
128 | Layout13->setSpacing( 2 ); | 128 | Layout13->setSpacing( 2 ); |
129 | Layout13->setMargin( 2 ); | 129 | Layout13->setMargin( 2 ); |
130 | 130 | ||
131 | volLabel = new QLabel( GroupBox3, "volLabel" ); | 131 | volLabel = new QLabel( GroupBox3, "volLabel" ); |
132 | volLabel->setText( tr( "Output" ) ); | 132 | volLabel->setText( tr( "Output" ) ); |
133 | Layout13->addWidget( volLabel ); | 133 | Layout13->addWidget( volLabel ); |
134 | QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | 134 | QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); |
135 | Layout13->addItem( spacer_3 ); | 135 | Layout13->addItem( spacer_3 ); |
136 | 136 | ||
137 | micLabel = new QLabel( GroupBox3, "micLabel" ); | 137 | micLabel = new QLabel( GroupBox3, "micLabel" ); |
138 | micLabel->setText( tr( "Mic" ) ); | 138 | micLabel->setText( tr( "Mic" ) ); |
139 | Layout13->addWidget( micLabel ); | 139 | Layout13->addWidget( micLabel ); |
140 | QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | 140 | QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); |
141 | Layout13->addItem( spacer_4 ); | 141 | Layout13->addItem( spacer_4 ); |
142 | Layout10->addLayout( Layout13 ); | 142 | Layout10->addLayout( Layout13 ); |
143 | 143 | ||
144 | Layout12 = new QHBoxLayout; | 144 | Layout12 = new QHBoxLayout; |
145 | Layout12->setSpacing( 2 ); | 145 | Layout12->setSpacing( 2 ); |
146 | Layout12->setMargin( 2 ); | 146 | Layout12->setMargin( 2 ); |
147 | 147 | ||
148 | volume = new QSlider( GroupBox3, "volume" ); | 148 | volume = new QSlider( GroupBox3, "volume" ); |
149 | volume->setMaxValue( 100 ); | 149 | volume->setMaxValue( 100 ); |
150 | volume->setValue( 50 ); | 150 | volume->setValue( 50 ); |
151 | volume->setOrientation( QSlider::Vertical ); | 151 | volume->setOrientation( QSlider::Vertical ); |
152 | volume->setTickmarks( QSlider::Right ); | 152 | volume->setTickmarks( QSlider::Right ); |
153 | volume->setTickInterval( 5 ); | 153 | volume->setTickInterval( 5 ); |
154 | Layout12->addWidget( volume ); | 154 | Layout12->addWidget( volume ); |
155 | QSpacerItem* spacer_5 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | 155 | QSpacerItem* spacer_5 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); |
156 | Layout12->addItem( spacer_5 ); | 156 | Layout12->addItem( spacer_5 ); |
157 | 157 | ||
158 | mic = new QSlider( GroupBox3, "mic" ); | 158 | mic = new QSlider( GroupBox3, "mic" ); |
159 | mic->setMaxValue( 100 ); | 159 | mic->setMaxValue( 100 ); |
160 | mic->setValue( 50 ); | 160 | mic->setValue( 50 ); |
161 | mic->setOrientation( QSlider::Vertical ); | 161 | mic->setOrientation( QSlider::Vertical ); |
162 | mic->setTickmarks( QSlider::Right ); | 162 | mic->setTickmarks( QSlider::Right ); |
163 | mic->setTickInterval( 5 ); | 163 | mic->setTickInterval( 5 ); |
164 | Layout12->addWidget( mic ); | 164 | Layout12->addWidget( mic ); |
165 | QSpacerItem* spacer_6 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | 165 | QSpacerItem* spacer_6 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); |
166 | Layout12->addItem( spacer_6 ); | 166 | Layout12->addItem( spacer_6 ); |
167 | Layout10->addLayout( Layout12 ); | 167 | Layout10->addLayout( Layout12 ); |
168 | 168 | ||
169 | Layout17 = new QHBoxLayout; | 169 | Layout17 = new QHBoxLayout; |
170 | Layout17->setSpacing( 2 ); | 170 | Layout17->setSpacing( 2 ); |
171 | Layout17->setMargin( 2 ); | 171 | Layout17->setMargin( 2 ); |
172 | QSpacerItem* spacer_7 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | 172 | QSpacerItem* spacer_7 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); |
173 | Layout17->addItem( spacer_7 ); | 173 | Layout17->addItem( spacer_7 ); |
174 | 174 | ||
175 | PixmapLabel2_2 = new QLabel( GroupBox3, "PixmapLabel2_2" ); | 175 | PixmapLabel2_2 = new QLabel( GroupBox3, "PixmapLabel2_2" ); |
176 | PixmapLabel2_2->setPixmap( image1 ); | 176 | PixmapLabel2_2->setPixmap( image1 ); |
177 | PixmapLabel2_2->setScaledContents( FALSE ); | 177 | PixmapLabel2_2->setScaledContents( FALSE ); |
178 | Layout17->addWidget( PixmapLabel2_2 ); | 178 | Layout17->addWidget( PixmapLabel2_2 ); |
179 | 179 | ||
180 | TextLabel2_2 = new QLabel( GroupBox3, "TextLabel2_2" ); | 180 | TextLabel2_2 = new QLabel( GroupBox3, "TextLabel2_2" ); |
181 | TextLabel2_2->setText( tr( "Silent" ) ); | 181 | TextLabel2_2->setText( tr( "Silent" ) ); |
182 | Layout17->addWidget( TextLabel2_2 ); | 182 | Layout17->addWidget( TextLabel2_2 ); |
183 | QSpacerItem* spacer_8 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | 183 | QSpacerItem* spacer_8 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); |
184 | Layout17->addItem( spacer_8 ); | 184 | Layout17->addItem( spacer_8 ); |
185 | Layout10->addLayout( Layout17 ); | 185 | Layout10->addLayout( Layout17 ); |
186 | GroupBox3Layout->addLayout( Layout10 ); | 186 | GroupBox3Layout->addLayout( Layout10 ); |
187 | 187 | ||
188 | SoundSettingsBaseLayout->addWidget( GroupBox3, 0, 0 ); | 188 | SoundSettingsBaseLayout->addWidget( GroupBox3, 0, 0 ); |
189 | 189 | ||
190 | Layout12_2 = new QVBoxLayout; | 190 | Layout12_2 = new QVBoxLayout; |
191 | Layout12_2->setSpacing( 2 ); | 191 | Layout12_2->setSpacing( 2 ); |
192 | Layout12_2->setMargin( 2 ); | 192 | Layout12_2->setMargin( 2 ); |
193 | 193 | ||
194 | GroupBox1 = new QGroupBox( this, "GroupBox1" ); | 194 | GroupBox1 = new QGroupBox( this, "GroupBox1" ); |
195 | GroupBox1->setTitle( tr( "Vmemo" ) ); | 195 | GroupBox1->setTitle( tr( "Vmemo" ) ); |
196 | 196 | ||
197 | QWidget* privateLayoutWidget = new QWidget( GroupBox1, "Layout11" ); | 197 | QWidget* privateLayoutWidget = new QWidget( GroupBox1, "Layout11" ); |
198 | privateLayoutWidget->setGeometry( QRect( 5, 16, 96, 169 ) ); | 198 | privateLayoutWidget->setGeometry( QRect( 5, 16, 96, 230 ) ); |
199 | |||
199 | Layout11 = new QVBoxLayout( privateLayoutWidget ); | 200 | Layout11 = new QVBoxLayout( privateLayoutWidget ); |
200 | Layout11->setSpacing( 2 ); | 201 | Layout11->setSpacing( 2 ); |
201 | Layout11->setMargin( 0 ); | 202 | Layout11->setMargin( 0 ); |
202 | 203 | ||
203 | sampleRateLabel = new QLabel( privateLayoutWidget, "sampleRateLabel" ); | 204 | sampleRateLabel = new QLabel( privateLayoutWidget, "sampleRateLabel" ); |
204 | sampleRateLabel->setText( tr( "Sample Rate" ) ); | 205 | sampleRateLabel->setText( tr( "Sample Rate" ) ); |
205 | Layout11->addWidget( sampleRateLabel ); | 206 | Layout11->addWidget( sampleRateLabel ); |
206 | 207 | ||
207 | sampleRate = new QComboBox( FALSE, privateLayoutWidget, "sampleRate" ); | 208 | sampleRate = new QComboBox( FALSE, privateLayoutWidget, "sampleRate" ); |
208 | sampleRate->insertItem( tr( "8000" ) ); | 209 | sampleRate->insertItem( tr( "8000" ) ); |
209 | sampleRate->insertItem( tr( "11025" ) ); | 210 | sampleRate->insertItem( tr( "11025" ) ); |
210 | sampleRate->insertItem( tr( "22050" ) ); | 211 | sampleRate->insertItem( tr( "22050" ) ); |
211 | sampleRate->insertItem( tr( "33075" ) ); | 212 | sampleRate->insertItem( tr( "33075" ) ); |
212 | sampleRate->insertItem( tr( "44100" ) ); | 213 | sampleRate->insertItem( tr( "44100" ) ); |
213 | sampleRate->setFixedWidth(90); | 214 | sampleRate->setFixedWidth(90); |
214 | Layout11->addWidget( sampleRate ); | 215 | Layout11->addWidget( sampleRate ); |
215 | 216 | ||
216 | stereoCheckBox = new QCheckBox( privateLayoutWidget, "stereoCheckBox" ); | 217 | stereoCheckBox = new QCheckBox( privateLayoutWidget, "stereoCheckBox" ); |
217 | stereoCheckBox->setText( tr( "Stereo" ) ); | 218 | stereoCheckBox->setText( tr( "Stereo" ) ); |
218 | Layout11->addWidget( stereoCheckBox ); | 219 | Layout11->addWidget( stereoCheckBox ); |
219 | 220 | ||
220 | sixteenBitCheckBox = new QCheckBox( privateLayoutWidget, "sixteenBitCheckBox" ); | 221 | sixteenBitCheckBox = new QCheckBox( privateLayoutWidget, "sixteenBitCheckBox" ); |
221 | sixteenBitCheckBox->setText( tr( "16 bit" ) ); | 222 | sixteenBitCheckBox->setText( tr( "16 bit" ) ); |
222 | Layout11->addWidget( sixteenBitCheckBox ); | 223 | Layout11->addWidget( sixteenBitCheckBox ); |
223 | 224 | ||
224 | AlertCheckBox = new QCheckBox( privateLayoutWidget, "AlertCheckBox" ); | 225 | AlertCheckBox = new QCheckBox( privateLayoutWidget, "AlertCheckBox" ); |
225 | AlertCheckBox->setText( tr( "Visual Alerts" ) ); | 226 | AlertCheckBox->setText( tr( "Visual Alerts" ) ); |
226 | Layout11->addWidget( AlertCheckBox ); | 227 | Layout11->addWidget( AlertCheckBox ); |
227 | 228 | ||
228 | TextLabel1 = new QLabel( privateLayoutWidget, "TextLabel1" ); | 229 | TextLabel1 = new QLabel( privateLayoutWidget, "TextLabel1" ); |
229 | TextLabel1->setText( tr( "Location:" ) ); | 230 | TextLabel1->setText( tr( "Location:" ) ); |
230 | Layout11->addWidget( TextLabel1 ); | 231 | Layout11->addWidget( TextLabel1 ); |
231 | 232 | ||
232 | 233 | ||
233 | LocationComboBox = new QComboBox( FALSE, privateLayoutWidget, "LocationComboBox" ); | 234 | LocationComboBox = new QComboBox( FALSE, privateLayoutWidget, "LocationComboBox" ); |
234 | Layout11->addWidget( LocationComboBox ); | 235 | Layout11->addWidget( LocationComboBox ); |
235 | 236 | ||
236 | QLabel *TextLabelKey; | 237 | QLabel *TextLabelKey; |
237 | TextLabelKey = new QLabel( privateLayoutWidget, "TextLabelKey" ); | 238 | TextLabelKey = new QLabel( privateLayoutWidget, "TextLabelKey" ); |
238 | TextLabelKey->setText( tr( "Record Key:" ) ); | 239 | TextLabelKey->setText( tr( "Record Key:" ) ); |
240 | Layout11->addWidget( TextLabelKey ); | ||
239 | 241 | ||
240 | keyComboBox = new QComboBox( FALSE, privateLayoutWidget, "keyComboBox" ); | 242 | keyComboBox = new QComboBox( FALSE, privateLayoutWidget, "keyComboBox" ); |
241 | keyComboBox->insertItem( tr( "" ) ); | 243 | keyComboBox->insertItem( tr( "" ) ); |
242 | keyComboBox->insertItem( tr( "Taskbar Icon" ) ); | 244 | keyComboBox->insertItem( tr( "Taskbar Icon" ) ); |
243 | keyComboBox->insertItem( tr( "Key_Escape" ) ); | 245 | keyComboBox->insertItem( tr( "Key_Escape" ) ); |
244 | keyComboBox->insertItem( tr( "Key_Space" ) ); | 246 | keyComboBox->insertItem( tr( "Key_Space" ) ); |
245 | keyComboBox->insertItem( tr( "Key_Home" ) ); | 247 | keyComboBox->insertItem( tr( "Key_Home" ) ); |
246 | keyComboBox->insertItem( tr( "Key_Calender" ) ); | 248 | keyComboBox->insertItem( tr( "Key_Calender" ) ); |
247 | keyComboBox->insertItem( tr( "Key_Contacts" ) ); | 249 | keyComboBox->insertItem( tr( "Key_Contacts" ) ); |
248 | keyComboBox->insertItem( tr( "Key_Menu" ) ); | 250 | keyComboBox->insertItem( tr( "Key_Menu" ) ); |
249 | keyComboBox->insertItem( tr( "Key_Mail" ) ); | 251 | keyComboBox->insertItem( tr( "Key_Mail" ) ); |
250 | 252 | ||
251 | Layout11->addWidget( TextLabelKey ); | ||
252 | |||
253 | Layout11->addWidget( keyComboBox ); | 253 | Layout11->addWidget( keyComboBox ); |
254 | 254 | ||
255 | QSpacerItem* spacer_9 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | 255 | QLabel *timeLimitLabel; |
256 | Layout11->addItem( spacer_9 ); | 256 | timeLimitLabel= new QLabel( privateLayoutWidget, "timeLimitLabel" ); |
257 | 257 | timeLimitLabel->setText( tr( "Recording Limit:" ) ); | |
258 | 258 | Layout11->addWidget( timeLimitLabel ); | |
259 | |||
260 | timeLimitComboBox = new QComboBox( FALSE, privateLayoutWidget, "timeLimitComboBox" ); | ||
261 | timeLimitComboBox->insertItem( tr( "30" ) ); | ||
262 | timeLimitComboBox->insertItem( tr( "20" ) ); | ||
263 | timeLimitComboBox->insertItem( tr( "15" ) ); | ||
264 | timeLimitComboBox->insertItem( tr( "10" ) ); | ||
265 | timeLimitComboBox->insertItem( tr( "5" ) ); | ||
266 | |||
267 | Layout11->addWidget(timeLimitComboBox); | ||
268 | QLabel *timeLimitLabel2; | ||
269 | timeLimitLabel2= new QLabel( privateLayoutWidget, "timeLimitLabel2" ); | ||
270 | timeLimitLabel2->setText( tr( "seconds" ) ); | ||
271 | Layout11->addWidget( timeLimitLabel2 ); | ||
272 | |||
259 | Layout12_2->addWidget( GroupBox1 ); | 273 | Layout12_2->addWidget( GroupBox1 ); |
260 | // // touchsound = new QCheckBox( this, "touchsound" ); | 274 | // // touchsound = new QCheckBox( this, "touchsound" ); |
261 | // // touchsound->setText( tr( "Screen sounds" ) ); | 275 | // // touchsound->setText( tr( "Screen sounds" ) ); |
262 | // // Layout12_2->addWidget( touchsound ); | 276 | // // Layout12_2->addWidget( touchsound ); |
263 | 277 | ||
264 | // // keysound = new QCheckBox( this, "keysound" ); | 278 | // // keysound = new QCheckBox( this, "keysound" ); |
265 | // // keysound->setText( tr( "Keyboard sounds" ) ); | 279 | // // keysound->setText( tr( "Keyboard sounds" ) ); |
266 | // // Layout12_2->addWidget( keysound ); | 280 | // // Layout12_2->addWidget( keysound ); |
267 | 281 | ||
268 | SoundSettingsBaseLayout->addLayout( Layout12_2, 0, 1 ); | 282 | SoundSettingsBaseLayout->addLayout( Layout12_2, 0, 1 ); |
269 | } | 283 | } |
270 | 284 | ||
271 | /* | 285 | /* |
272 | * Destroys the object and frees any allocated resources | 286 | * Destroys the object and frees any allocated resources |
273 | */ | 287 | */ |
274 | SoundSettingsBase::~SoundSettingsBase() | 288 | SoundSettingsBase::~SoundSettingsBase() |
275 | { | 289 | { |
276 | // no need to delete child widgets, Qt does it all for us | 290 | // no need to delete child widgets, Qt does it all for us |
277 | } | 291 | } |
diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h index 20d1c2c..5622b70 100644 --- a/noncore/settings/sound/soundsettingsbase.h +++ b/noncore/settings/sound/soundsettingsbase.h | |||
@@ -1,66 +1,67 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** Form interface generated from reading ui file 'soundsettingsbase.ui' | 2 | ** Form interface generated from reading ui file 'soundsettingsbase.ui' |
3 | ** | 3 | ** |
4 | ** Created: Thu May 23 11:23:38 2002 | 4 | ** Created: Thu May 23 11:23:38 2002 |
5 | ** by: The User Interface Compiler (uic) | 5 | ** by: The User Interface Compiler (uic) |
6 | ** | 6 | ** |
7 | ** WARNING! All changes made in this file will be lost! | 7 | ** WARNING! All changes made in this file will be lost! |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | #ifndef SOUNDSETTINGSBASE_H | 9 | #ifndef SOUNDSETTINGSBASE_H |
10 | #define SOUNDSETTINGSBASE_H | 10 | #define SOUNDSETTINGSBASE_H |
11 | 11 | ||
12 | #include <qvariant.h> | 12 | #include <qvariant.h> |
13 | #include <qdialog.h> | 13 | #include <qdialog.h> |
14 | #include <qmainwindow.h> | 14 | #include <qmainwindow.h> |
15 | 15 | ||
16 | class QVBoxLayout; | 16 | class QVBoxLayout; |
17 | class QHBoxLayout; | 17 | class QHBoxLayout; |
18 | class QGridLayout; | 18 | class QGridLayout; |
19 | class QCheckBox; | 19 | class QCheckBox; |
20 | class QComboBox; | 20 | class QComboBox; |
21 | class QGroupBox; | 21 | class QGroupBox; |
22 | class QLabel; | 22 | class QLabel; |
23 | class QSlider; | 23 | class QSlider; |
24 | 24 | ||
25 | class SoundSettingsBase : public QMainWindow | 25 | class SoundSettingsBase : public QMainWindow |
26 | { | 26 | { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | 28 | ||
29 | public: | 29 | public: |
30 | SoundSettingsBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | 30 | SoundSettingsBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); |
31 | ~SoundSettingsBase(); | 31 | ~SoundSettingsBase(); |
32 | 32 | ||
33 | QGroupBox* GroupBox3; | 33 | QGroupBox* GroupBox3; |
34 | QLabel* PixmapLabel1_2; | 34 | QLabel* PixmapLabel1_2; |
35 | QLabel* TextLabel1_2; | 35 | QLabel* TextLabel1_2; |
36 | QLabel* volLabel; | 36 | QLabel* volLabel; |
37 | QLabel* micLabel; | 37 | QLabel* micLabel; |
38 | QSlider* volume; | 38 | QSlider* volume; |
39 | QSlider* mic; | 39 | QSlider* mic; |
40 | QLabel* PixmapLabel2_2; | 40 | QLabel* PixmapLabel2_2; |
41 | QLabel* TextLabel2_2; | 41 | QLabel* TextLabel2_2; |
42 | QGroupBox* GroupBox1; | 42 | QGroupBox* GroupBox1; |
43 | QLabel* sampleRateLabel; | 43 | QLabel* sampleRateLabel; |
44 | QComboBox* sampleRate; | 44 | QComboBox* sampleRate; |
45 | QCheckBox* stereoCheckBox; | 45 | QCheckBox* stereoCheckBox; |
46 | QCheckBox* sixteenBitCheckBox; | 46 | QCheckBox* sixteenBitCheckBox; |
47 | QCheckBox* AlertCheckBox; | 47 | QCheckBox* AlertCheckBox; |
48 | QLabel* TextLabel1; | 48 | QLabel* TextLabel1; |
49 | QComboBox* LocationComboBox; | 49 | QComboBox* LocationComboBox; |
50 | QComboBox* keyComboBox; | 50 | QComboBox* keyComboBox; |
51 | QComboBox* timeLimitComboBox; | ||
51 | bool keyReset; | 52 | bool keyReset; |
52 | protected: | 53 | protected: |
53 | QGridLayout* SoundSettingsBaseLayout; | 54 | QGridLayout* SoundSettingsBaseLayout; |
54 | QVBoxLayout* GroupBox3Layout; | 55 | QVBoxLayout* GroupBox3Layout; |
55 | QVBoxLayout* Layout10; | 56 | QVBoxLayout* Layout10; |
56 | QHBoxLayout* Layout16; | 57 | QHBoxLayout* Layout16; |
57 | QHBoxLayout* Layout13; | 58 | QHBoxLayout* Layout13; |
58 | QHBoxLayout* Layout12; | 59 | QHBoxLayout* Layout12; |
59 | QHBoxLayout* Layout17; | 60 | QHBoxLayout* Layout17; |
60 | QVBoxLayout* Layout12_2; | 61 | QVBoxLayout* Layout12_2; |
61 | QVBoxLayout* Layout11; | 62 | QVBoxLayout* Layout11; |
62 | protected slots: | 63 | protected slots: |
63 | 64 | ||
64 | }; | 65 | }; |
65 | 66 | ||
66 | #endif // SOUNDSETTINGSBASE_H | 67 | #endif // SOUNDSETTINGSBASE_H |