author | llornkcor <llornkcor> | 2002-07-13 18:11:09 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-07-13 18:11:09 (UTC) |
commit | c458ba7f91acf0eb84cb1e414f77dbde0581b905 (patch) (unidiff) | |
tree | 637d7aceb0ce2717f7631c396c5fcdff73137d1f /noncore | |
parent | f0421434c11a7781040340714fa01b6db2266a0b (diff) | |
download | opie-c458ba7f91acf0eb84cb1e414f77dbde0581b905.zip opie-c458ba7f91acf0eb84cb1e414f77dbde0581b905.tar.gz opie-c458ba7f91acf0eb84cb1e414f77dbde0581b905.tar.bz2 |
remove volume controls as they are handled by volume applet, made into a more flexible layout
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 107 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.h | 5 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.cpp | 201 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.h | 23 |
4 files changed, 53 insertions, 283 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index a163d38..99fccf7 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp | |||
@@ -47,6 +47,2 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
47 | config.setGroup( "Volume" ); | 47 | config.setGroup( "Volume" ); |
48 | volume->setValue(100-config.readNumEntry("VolumePercent")); | ||
49 | mic->setValue(100-config.readNumEntry("Mic")); | ||
50 | // touchsound->setChecked(config.readBoolEntry("TouchSound")); | ||
51 | // keysound->setChecked(config.readBoolEntry("KeySound")); | ||
52 | Config cfg("Vmemo"); | 48 | Config cfg("Vmemo"); |
@@ -102,3 +98,2 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
102 | 98 | ||
103 | |||
104 | sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); | 99 | sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); |
@@ -109,8 +104,2 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
109 | updateStorageCombo(); | 104 | updateStorageCombo(); |
110 | |||
111 | connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); | ||
112 | connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); | ||
113 | connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); | ||
114 | connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); | ||
115 | |||
116 | connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); | 105 | connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); |
@@ -120,88 +109,2 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
120 | } | 109 | } |
121 | |||
122 | // void SoundSettings::reject() | ||
123 | // { | ||
124 | // qDebug("reject"); | ||
125 | // Config config( "qpe"); | ||
126 | // config.setGroup( "Volume"); | ||
127 | |||
128 | // setVolume(100-config.readNumEntry("VolumePercent")); | ||
129 | // setMic(100-config.readNumEntry("Mic")); | ||
130 | |||
131 | // // config.setGroup("Record"); | ||
132 | // // int rate=config.readNumEntry("SampleRate", 11025); | ||
133 | // // if(rate == 11025) | ||
134 | // // sampleRate->setCurrentItem(0); | ||
135 | // // else if(rate == 22050) | ||
136 | // // sampleRate->setCurrentItem(1); | ||
137 | // // else if(rate == 32000) | ||
138 | // // sampleRate->setCurrentItem(2); | ||
139 | // // else if(rate==44100) | ||
140 | // // sampleRate->setCurrentItem(3); | ||
141 | // // stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); | ||
142 | // // sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); | ||
143 | // qDebug("QDialog::reject();"); | ||
144 | // ::exit(-1); | ||
145 | // } | ||
146 | |||
147 | // void SoundSettings::accept() | ||
148 | // { | ||
149 | // qDebug("accept"); | ||
150 | // Config config( "qpe" ); | ||
151 | // config.setGroup( "Volume" ); | ||
152 | // config.writeEntry("VolumePercent",100-volume->value()); | ||
153 | // config.writeEntry("Mic",100-mic->value()); | ||
154 | // // config.writeEntry("TouchSound",touchsound->isChecked()); | ||
155 | // // config.writeEntry("KeySound",keysound->isChecked()); | ||
156 | |||
157 | // Config cfg("Vmemo"); | ||
158 | // cfg.writeEntry("Alert",AlertCheckBox->isChecked()); | ||
159 | // setVolume(volume->value()); | ||
160 | // setMic(mic->value()); | ||
161 | |||
162 | // cfg.setGroup("Record"); | ||
163 | // cfg.writeEntry("SampleRate",sampleRate->currentText()); | ||
164 | // cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); | ||
165 | // cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); | ||
166 | // // Config cfg( "VMemo" ); | ||
167 | // // cfg.setGroup( "Defaults" ); | ||
168 | // // cfg.writeEntry( "hideIcon", HideIcon_CheckBox->isChecked()); | ||
169 | // qDebug("QDialog::accept();"); | ||
170 | // ::exit(0); | ||
171 | // } | ||
172 | |||
173 | void SoundSettings::setVolume(int v) | ||
174 | { | ||
175 | Config config( "qpe" ); | ||
176 | config.setGroup( "Volume" ); | ||
177 | config.writeEntry("VolumePercent",100-v); | ||
178 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | ||
179 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | ||
180 | #endif | ||
181 | } | ||
182 | |||
183 | void SoundSettings::setMic(int m) | ||
184 | { | ||
185 | Config config( "qpe" ); | ||
186 | config.setGroup( "Volume" ); | ||
187 | config.writeEntry("Mic",100-m); | ||
188 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | ||
189 | QCopEnvelope( "QPE/System", "micChange(bool)" ) << FALSE; | ||
190 | #endif | ||
191 | } | ||
192 | |||
193 | void SoundSettings::volumeChanged( bool ) | ||
194 | { | ||
195 | Config config( "qpe" ); | ||
196 | config.setGroup( "Volume" ); | ||
197 | volume->setValue(100-config.readNumEntry("VolumePercent")); | ||
198 | } | ||
199 | |||
200 | void SoundSettings::micChanged( bool ) | ||
201 | { | ||
202 | Config config( "qpe" ); | ||
203 | config.setGroup( "Volume" ); | ||
204 | mic->setValue(100-config.readNumEntry("Mic")); | ||
205 | } | ||
206 | |||
207 | void SoundSettings::updateStorageCombo() { | 110 | void SoundSettings::updateStorageCombo() { |
@@ -246,14 +149,4 @@ void SoundSettings::setLocation(const QString & string) { | |||
246 | void SoundSettings::cleanUp() { | 149 | void SoundSettings::cleanUp() { |
247 | qDebug("cleanup"); | ||
248 | Config config( "qpe" ); | ||
249 | config.setGroup( "Volume" ); | ||
250 | config.writeEntry("VolumePercent",100-volume->value()); | ||
251 | config.writeEntry("Mic",100-mic->value()); | ||
252 | // config.writeEntry("TouchSound",touchsound->isChecked()); | ||
253 | // config.writeEntry("KeySound",keysound->isChecked()); | ||
254 | |||
255 | Config cfg("Vmemo"); | 150 | Config cfg("Vmemo"); |
256 | cfg.writeEntry("Alert",AlertCheckBox->isChecked()); | 151 | cfg.writeEntry("Alert",AlertCheckBox->isChecked()); |
257 | setVolume(volume->value()); | ||
258 | setMic(mic->value()); | ||
259 | 152 | ||
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h index 94d5d48..6b8b835 100644 --- a/noncore/settings/sound/soundsettings.h +++ b/noncore/settings/sound/soundsettings.h | |||
@@ -44,7 +44,2 @@ private slots: | |||
44 | void cleanUp(); | 44 | void cleanUp(); |
45 | void setVolume(int); | ||
46 | void setMic(int); | ||
47 | |||
48 | void volumeChanged( bool muted ); | ||
49 | void micChanged( bool muted ); | ||
50 | }; | 45 | }; |
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp index 8be1b3d..4c28ae9 100644 --- a/noncore/settings/sound/soundsettingsbase.cpp +++ b/noncore/settings/sound/soundsettingsbase.cpp | |||
@@ -85,3 +85,2 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
85 | setName( "SoundSettingsBase" ); | 85 | setName( "SoundSettingsBase" ); |
86 | resize( 255, 301 ); | ||
87 | setCaption( tr( "Vmemo Settings" ) ); | 86 | setCaption( tr( "Vmemo Settings" ) ); |
@@ -89,121 +88,25 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
89 | SoundSettingsBaseLayout = new QGridLayout( this ); | 88 | SoundSettingsBaseLayout = new QGridLayout( this ); |
90 | SoundSettingsBaseLayout->setSpacing( 6 ); | 89 | SoundSettingsBaseLayout->setSpacing( 4 ); |
91 | SoundSettingsBaseLayout->setMargin( 11 ); | 90 | SoundSettingsBaseLayout->setMargin( 6 ); |
92 | 91 | ||
93 | GroupBox3 = new QGroupBox( this, "GroupBox3" ); | 92 | stereoCheckBox = new QCheckBox( this, "stereoCheckBox" ); |
94 | GroupBox3->setFrameShape( QGroupBox::Box ); | 93 | stereoCheckBox->setText( tr( "Stereo" ) ); |
95 | GroupBox3->setFrameShadow( QGroupBox::Sunken ); | 94 | SoundSettingsBaseLayout->addMultiCellWidget(stereoCheckBox , 0, 0, 0, 0 ); |
96 | GroupBox3->setTitle( tr( "Levels" ) ); | ||
97 | GroupBox3->setColumnLayout(0, Qt::Vertical ); | ||
98 | GroupBox3->layout()->setSpacing( 0 ); | ||
99 | GroupBox3->layout()->setMargin( 0 ); | ||
100 | GroupBox3Layout = new QVBoxLayout( GroupBox3->layout() ); | ||
101 | GroupBox3Layout->setAlignment( Qt::AlignTop ); | ||
102 | GroupBox3Layout->setSpacing( 2 ); | ||
103 | GroupBox3Layout->setMargin( 2 ); | ||
104 | |||
105 | Layout10 = new QVBoxLayout; | ||
106 | Layout10->setSpacing( 2 ); | ||
107 | Layout10->setMargin( 2 ); | ||
108 | |||
109 | Layout16 = new QHBoxLayout; | ||
110 | Layout16->setSpacing( 2 ); | ||
111 | Layout16->setMargin( 2 ); | ||
112 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | ||
113 | Layout16->addItem( spacer ); | ||
114 | |||
115 | PixmapLabel1_2 = new QLabel( GroupBox3, "PixmapLabel1_2" ); | ||
116 | PixmapLabel1_2->setPixmap( image0 ); | ||
117 | PixmapLabel1_2->setScaledContents( FALSE ); | ||
118 | Layout16->addWidget( PixmapLabel1_2 ); | ||
119 | |||
120 | TextLabel1_2 = new QLabel( GroupBox3, "TextLabel1_2" ); | ||
121 | TextLabel1_2->setText( tr( "Loud" ) ); | ||
122 | Layout16->addWidget( TextLabel1_2 ); | ||
123 | QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | ||
124 | Layout16->addItem( spacer_2 ); | ||
125 | Layout10->addLayout( Layout16 ); | ||
126 | |||
127 | Layout13 = new QHBoxLayout; | ||
128 | Layout13->setSpacing( 2 ); | ||
129 | Layout13->setMargin( 2 ); | ||
130 | |||
131 | volLabel = new QLabel( GroupBox3, "volLabel" ); | ||
132 | volLabel->setText( tr( "Output" ) ); | ||
133 | Layout13->addWidget( volLabel ); | ||
134 | QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | ||
135 | Layout13->addItem( spacer_3 ); | ||
136 | |||
137 | micLabel = new QLabel( GroupBox3, "micLabel" ); | ||
138 | micLabel->setText( tr( "Mic" ) ); | ||
139 | Layout13->addWidget( micLabel ); | ||
140 | QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | ||
141 | Layout13->addItem( spacer_4 ); | ||
142 | Layout10->addLayout( Layout13 ); | ||
143 | |||
144 | Layout12 = new QHBoxLayout; | ||
145 | Layout12->setSpacing( 2 ); | ||
146 | Layout12->setMargin( 2 ); | ||
147 | |||
148 | volume = new QSlider( GroupBox3, "volume" ); | ||
149 | volume->setMaxValue( 100 ); | ||
150 | volume->setValue( 50 ); | ||
151 | volume->setOrientation( QSlider::Vertical ); | ||
152 | volume->setTickmarks( QSlider::Right ); | ||
153 | volume->setTickInterval( 5 ); | ||
154 | Layout12->addWidget( volume ); | ||
155 | QSpacerItem* spacer_5 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | ||
156 | Layout12->addItem( spacer_5 ); | ||
157 | |||
158 | mic = new QSlider( GroupBox3, "mic" ); | ||
159 | mic->setMaxValue( 100 ); | ||
160 | mic->setValue( 50 ); | ||
161 | mic->setOrientation( QSlider::Vertical ); | ||
162 | mic->setTickmarks( QSlider::Right ); | ||
163 | mic->setTickInterval( 5 ); | ||
164 | Layout12->addWidget( mic ); | ||
165 | QSpacerItem* spacer_6 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | ||
166 | Layout12->addItem( spacer_6 ); | ||
167 | Layout10->addLayout( Layout12 ); | ||
168 | |||
169 | Layout17 = new QHBoxLayout; | ||
170 | Layout17->setSpacing( 2 ); | ||
171 | Layout17->setMargin( 2 ); | ||
172 | QSpacerItem* spacer_7 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | ||
173 | Layout17->addItem( spacer_7 ); | ||
174 | |||
175 | PixmapLabel2_2 = new QLabel( GroupBox3, "PixmapLabel2_2" ); | ||
176 | PixmapLabel2_2->setPixmap( image1 ); | ||
177 | PixmapLabel2_2->setScaledContents( FALSE ); | ||
178 | Layout17->addWidget( PixmapLabel2_2 ); | ||
179 | |||
180 | TextLabel2_2 = new QLabel( GroupBox3, "TextLabel2_2" ); | ||
181 | TextLabel2_2->setText( tr( "Silent" ) ); | ||
182 | Layout17->addWidget( TextLabel2_2 ); | ||
183 | QSpacerItem* spacer_8 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | ||
184 | Layout17->addItem( spacer_8 ); | ||
185 | Layout10->addLayout( Layout17 ); | ||
186 | GroupBox3Layout->addLayout( Layout10 ); | ||
187 | |||
188 | SoundSettingsBaseLayout->addWidget( GroupBox3, 0, 0 ); | ||
189 | |||
190 | Layout12_2 = new QVBoxLayout; | ||
191 | Layout12_2->setSpacing( 2 ); | ||
192 | Layout12_2->setMargin( 2 ); | ||
193 | |||
194 | GroupBox1 = new QGroupBox( this, "GroupBox1" ); | ||
195 | GroupBox1->setTitle( tr( "Vmemo" ) ); | ||
196 | 95 | ||
197 | QWidget* privateLayoutWidget = new QWidget( GroupBox1, "Layout11" ); | 96 | sixteenBitCheckBox = new QCheckBox( this, "sixteenBitCheckBox" ); |
198 | privateLayoutWidget->setGeometry( QRect( 5, 16, 96, 230 ) ); | 97 | sixteenBitCheckBox->setText( tr( "16 bit" ) ); |
98 | SoundSettingsBaseLayout->addMultiCellWidget( sixteenBitCheckBox , 0, 0, 1, 1 ); | ||
199 | 99 | ||
200 | Layout11 = new QVBoxLayout( privateLayoutWidget ); | 100 | AlertCheckBox = new QCheckBox( this, "AlertCheckBox" ); |
201 | Layout11->setSpacing( 2 ); | 101 | AlertCheckBox->setText( tr( "Visual Alerts" ) ); |
202 | Layout11->setMargin( 0 ); | 102 | SoundSettingsBaseLayout->addMultiCellWidget( AlertCheckBox , 0, 0, 2, 2 ); |
203 | 103 | ||
204 | sampleRateLabel = new QLabel( privateLayoutWidget, "sampleRateLabel" ); | 104 | QSpacerItem* spacer0 = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding ); |
205 | sampleRateLabel->setText( tr( "Sample Rate" ) ); | 105 | SoundSettingsBaseLayout->addItem( spacer0, 0, 3 ); |
206 | Layout11->addWidget( sampleRateLabel ); | 106 | |
107 | sampleRateLabel = new QLabel(this, "sampleRateLabel" ); | ||
108 | sampleRateLabel->setText( tr( "Sample Rate:" ) ); | ||
109 | SoundSettingsBaseLayout->addMultiCellWidget( sampleRateLabel , 1, 1, 0, 0 ); | ||
207 | 110 | ||
208 | sampleRate = new QComboBox( FALSE, privateLayoutWidget, "sampleRate" ); | 111 | sampleRate = new QComboBox( FALSE,this, "sampleRate" ); |
209 | sampleRate->insertItem( tr( "8000" ) ); | 112 | sampleRate->insertItem( tr( "8000" ) ); |
@@ -213,31 +116,25 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
213 | sampleRate->insertItem( tr( "44100" ) ); | 116 | sampleRate->insertItem( tr( "44100" ) ); |
214 | sampleRate->setFixedWidth(90); | 117 | // sampleRate->setFixedWidth(90); |
215 | Layout11->addWidget( sampleRate ); | 118 | SoundSettingsBaseLayout->addMultiCellWidget( sampleRate, 2, 2, 0, 2 ); |
216 | |||
217 | stereoCheckBox = new QCheckBox( privateLayoutWidget, "stereoCheckBox" ); | ||
218 | stereoCheckBox->setText( tr( "Stereo" ) ); | ||
219 | Layout11->addWidget( stereoCheckBox ); | ||
220 | 119 | ||
221 | sixteenBitCheckBox = new QCheckBox( privateLayoutWidget, "sixteenBitCheckBox" ); | 120 | // QSpacerItem* spacer = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding ); |
222 | sixteenBitCheckBox->setText( tr( "16 bit" ) ); | 121 | // SoundSettingsBaseLayout->addItem( spacer, 1, 3 ); |
223 | Layout11->addWidget( sixteenBitCheckBox ); | ||
224 | 122 | ||
225 | AlertCheckBox = new QCheckBox( privateLayoutWidget, "AlertCheckBox" ); | 123 | TextLabel1 = new QLabel( this, "TextLabel1" ); |
226 | AlertCheckBox->setText( tr( "Visual Alerts" ) ); | 124 | TextLabel1->setText( tr( "Recording Directory:" ) ); |
227 | Layout11->addWidget( AlertCheckBox ); | 125 | SoundSettingsBaseLayout->addMultiCellWidget( TextLabel1, 3, 3, 0, 0 ); |
228 | 126 | ||
229 | TextLabel1 = new QLabel( privateLayoutWidget, "TextLabel1" ); | ||
230 | TextLabel1->setText( tr( "Location:" ) ); | ||
231 | Layout11->addWidget( TextLabel1 ); | ||
232 | 127 | ||
128 | LocationComboBox = new QComboBox( FALSE, this, "LocationComboBox" ); | ||
129 | SoundSettingsBaseLayout->addMultiCellWidget( LocationComboBox, 4, 4, 0, 2 ); | ||
233 | 130 | ||
234 | LocationComboBox = new QComboBox( FALSE, privateLayoutWidget, "LocationComboBox" ); | 131 | // QSpacerItem* spacer1 = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding ); |
235 | Layout11->addWidget( LocationComboBox ); | 132 | // SoundSettingsBaseLayout->addItem( spacer1, 2, 3 ); |
236 | 133 | ||
237 | QLabel *TextLabelKey; | 134 | QLabel *TextLabelKey; |
238 | TextLabelKey = new QLabel( privateLayoutWidget, "TextLabelKey" ); | 135 | TextLabelKey = new QLabel( this, "TextLabelKey" ); |
239 | TextLabelKey->setText( tr( "Record Key:" ) ); | 136 | TextLabelKey->setText( tr( "Recording Key:" ) ); |
240 | Layout11->addWidget( TextLabelKey ); | 137 | SoundSettingsBaseLayout->addMultiCellWidget(TextLabelKey , 5, 5, 0, 0 ); |
241 | 138 | ||
242 | keyComboBox = new QComboBox( FALSE, privateLayoutWidget, "keyComboBox" ); | 139 | keyComboBox = new QComboBox( FALSE, this, "keyComboBox" ); |
243 | keyComboBox->insertItem( tr( "" ) ); | 140 | keyComboBox->insertItem( tr( "" ) ); |
@@ -251,11 +148,13 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
251 | keyComboBox->insertItem( tr( "Key_Mail" ) ); | 148 | keyComboBox->insertItem( tr( "Key_Mail" ) ); |
149 | SoundSettingsBaseLayout->addMultiCellWidget( keyComboBox , 6, 6, 0, 2 ); | ||
252 | 150 | ||
253 | Layout11->addWidget( keyComboBox ); | 151 | // QSpacerItem* spacer2 = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding ); |
152 | // SoundSettingsBaseLayout->addItem( spacer2, 3, 3 ); | ||
254 | 153 | ||
255 | QLabel *timeLimitLabel; | 154 | QLabel *timeLimitLabel; |
256 | timeLimitLabel= new QLabel( privateLayoutWidget, "timeLimitLabel" ); | 155 | timeLimitLabel= new QLabel( this, "timeLimitLabel" ); |
257 | timeLimitLabel->setText( tr( "Recording Limit:" ) ); | 156 | timeLimitLabel->setText( tr( "Recording Limit in seconds:" ) ); |
258 | Layout11->addWidget( timeLimitLabel ); | 157 | SoundSettingsBaseLayout->addMultiCellWidget( timeLimitLabel , 7, 7, 0, 0 ); |
259 | 158 | ||
260 | timeLimitComboBox = new QComboBox( FALSE, privateLayoutWidget, "timeLimitComboBox" ); | 159 | timeLimitComboBox = new QComboBox( FALSE, this, "timeLimitComboBox" ); |
261 | timeLimitComboBox->insertItem( tr( "30" ) ); | 160 | timeLimitComboBox->insertItem( tr( "30" ) ); |
@@ -265,19 +164,11 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
265 | timeLimitComboBox->insertItem( tr( "5" ) ); | 164 | timeLimitComboBox->insertItem( tr( "5" ) ); |
165 | timeLimitComboBox->insertItem( tr( "Unlimited" ) ); | ||
266 | 166 | ||
267 | Layout11->addWidget(timeLimitComboBox); | 167 | SoundSettingsBaseLayout->addMultiCellWidget(timeLimitComboBox , 8, 8, 0, 2); |
268 | QLabel *timeLimitLabel2; | ||
269 | timeLimitLabel2= new QLabel( privateLayoutWidget, "timeLimitLabel2" ); | ||
270 | timeLimitLabel2->setText( tr( "seconds" ) ); | ||
271 | Layout11->addWidget( timeLimitLabel2 ); | ||
272 | |||
273 | Layout12_2->addWidget( GroupBox1 ); | ||
274 | // // touchsound = new QCheckBox( this, "touchsound" ); | ||
275 | // // touchsound->setText( tr( "Screen sounds" ) ); | ||
276 | // // Layout12_2->addWidget( touchsound ); | ||
277 | 168 | ||
278 | // // keysound = new QCheckBox( this, "keysound" ); | 169 | // QSpacerItem* spacer3 = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding ); |
279 | // // keysound->setText( tr( "Keyboard sounds" ) ); | 170 | // SoundSettingsBaseLayout->addItem( spacer3, 4, 3 ); |
280 | // // Layout12_2->addWidget( keysound ); | ||
281 | 171 | ||
282 | SoundSettingsBaseLayout->addLayout( Layout12_2, 0, 1 ); | 172 | QSpacerItem* spacer4 = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding ); |
173 | SoundSettingsBaseLayout->addItem( spacer4, 9, 0 ); | ||
283 | } | 174 | } |
diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h index 5622b70..30f32ca 100644 --- a/noncore/settings/sound/soundsettingsbase.h +++ b/noncore/settings/sound/soundsettingsbase.h | |||
@@ -32,12 +32,11 @@ public: | |||
32 | 32 | ||
33 | QGroupBox* GroupBox3; | ||
34 | QLabel* PixmapLabel1_2; | 33 | QLabel* PixmapLabel1_2; |
35 | QLabel* TextLabel1_2; | 34 | QLabel* TextLabel1_2; |
36 | QLabel* volLabel; | 35 | /* QLabel* volLabel; */ |
37 | QLabel* micLabel; | 36 | /* QLabel* micLabel; */ |
38 | QSlider* volume; | 37 | /* QSlider* volume; */ |
39 | QSlider* mic; | 38 | /* QSlider* mic; */ |
40 | QLabel* PixmapLabel2_2; | 39 | /* QLabel* PixmapLabel2_2; */ |
41 | QLabel* TextLabel2_2; | 40 | /* QLabel* TextLabel2_2; */ |
42 | QGroupBox* GroupBox1; | 41 | /* QGroupBox* GroupBox1; */ |
43 | QLabel* sampleRateLabel; | 42 | QLabel* sampleRateLabel; |
@@ -54,10 +53,2 @@ protected: | |||
54 | QGridLayout* SoundSettingsBaseLayout; | 53 | QGridLayout* SoundSettingsBaseLayout; |
55 | QVBoxLayout* GroupBox3Layout; | ||
56 | QVBoxLayout* Layout10; | ||
57 | QHBoxLayout* Layout16; | ||
58 | QHBoxLayout* Layout13; | ||
59 | QHBoxLayout* Layout12; | ||
60 | QHBoxLayout* Layout17; | ||
61 | QVBoxLayout* Layout12_2; | ||
62 | QVBoxLayout* Layout11; | ||
63 | protected slots: | 54 | protected slots: |