author | zautrix <zautrix> | 2005-08-10 12:07:33 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-10 12:07:33 (UTC) |
commit | a238b7709a6abcf39dc5f79c26270d04bf18f00c (patch) (unidiff) | |
tree | 7e87a8bcdfbc65f1e7fbfe1690a5f2ac36f69815 | |
parent | 722a463b47ba8fe2dbf52329fec27af4125d530b (diff) | |
download | kdepimpi-a238b7709a6abcf39dc5f79c26270d04bf18f00c.zip kdepimpi-a238b7709a6abcf39dc5f79c26270d04bf18f00c.tar.gz kdepimpi-a238b7709a6abcf39dc5f79c26270d04bf18f00c.tar.bz2 |
fixx
-rw-r--r-- | kaddressbook/addresseeeditorwidget.cpp | 32 | ||||
-rw-r--r-- | kaddressbook/addresseeeditorwidget.h | 2 |
2 files changed, 28 insertions, 6 deletions
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 29abd6f..310d628 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp | |||
@@ -143,111 +143,115 @@ void AddresseeEditorWidget::initGUI() | |||
143 | setupTab3_1(); | 143 | setupTab3_1(); |
144 | 144 | ||
145 | mNameEdit->setFocus(); | 145 | mNameEdit->setFocus(); |
146 | 146 | ||
147 | connect( mTabWidget, SIGNAL( currentChanged(QWidget*) ), | 147 | connect( mTabWidget, SIGNAL( currentChanged(QWidget*) ), |
148 | SLOT( pageChanged(QWidget*) ) ); | 148 | SLOT( pageChanged(QWidget*) ) ); |
149 | } | 149 | } |
150 | 150 | ||
151 | void AddresseeEditorWidget::setupTab1() | 151 | void AddresseeEditorWidget::setupTab1() |
152 | { | 152 | { |
153 | // This is the General tab | 153 | // This is the General tab |
154 | QWidget *tab1 = new QWidget( mTabWidget ); | 154 | QWidget *tab1 = new QWidget( mTabWidget ); |
155 | 155 | ||
156 | //US QGridLayout *layout = new QGridLayout( tab1, 11, 7 ); | 156 | //US QGridLayout *layout = new QGridLayout( tab1, 11, 7 ); |
157 | QGridLayout *layout = new QGridLayout( tab1, 7, 1 ); | 157 | QGridLayout *layout = new QGridLayout( tab1, 7, 1 ); |
158 | layout->setMargin( KDialogBase::marginHintSmall() ); | 158 | layout->setMargin( KDialogBase::marginHintSmall() ); |
159 | layout->setSpacing( KDialogBase::spacingHintSmall() ); | 159 | layout->setSpacing( KDialogBase::spacingHintSmall() ); |
160 | 160 | ||
161 | QLabel *label; | 161 | QLabel *label; |
162 | KSeparator* bar; | 162 | KSeparator* bar; |
163 | QPushButton *button; | 163 | QPushButton *button; |
164 | 164 | ||
165 | ////////////////////////////////// | 165 | ////////////////////////////////// |
166 | // Upper left group (person info) | 166 | // Upper left group (person info) |
167 | 167 | ||
168 | // Person icon | 168 | // Person icon |
169 | /* LR | 169 | /* LR |
170 | label = new QLabel( tab1 ); | 170 | label = new QLabel( tab1 ); |
171 | //US ambiguous call. Add one more parameter | 171 | //US ambiguous call. Add one more parameter |
172 | //US label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) ); | 172 | //US label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) ); |
173 | label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) ); | 173 | label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) ); |
174 | layout->addMultiCellWidget( label, 0, 1, 0, 0 ); | 174 | layout->addMultiCellWidget( label, 0, 1, 0, 0 ); |
175 | */ | 175 | */ |
176 | // First name | 176 | // First name |
177 | button = new QPushButton( i18n( "Name..." ), tab1 ); | 177 | button = new QPushButton( i18n( "Name..." ), tab1 ); |
178 | //US QToolTip::add( button, i18n( "Edit the contact's name" ) ); | 178 | //US QToolTip::add( button, i18n( "Edit the contact's name" ) ); |
179 | mNameEdit = new KLineEdit( tab1, "mNameEdit" ); | 179 | mNameEdit = new KLineEdit( tab1, "mNameEdit" ); |
180 | connect( mNameEdit, SIGNAL( textChanged( const QString& ) ), | 180 | connect( mNameEdit, SIGNAL( textChanged( const QString& ) ), |
181 | SLOT( nameTextChanged( const QString& ) ) ); | 181 | SLOT( nameTextChanged( const QString& ) ) ); |
182 | connect( button, SIGNAL( clicked() ), SLOT( nameButtonClicked() ) ); | 182 | connect( button, SIGNAL( clicked() ), SLOT( nameButtonClicked() ) ); |
183 | 183 | ||
184 | mNameLabel = new KSqueezedTextLabel( tab1 ); | 184 | mNameLabel = new KSqueezedTextLabel( tab1 ); |
185 | mNameLabel->hide(); | 185 | mNameLabel->hide(); |
186 | 186 | ||
187 | layout->addWidget( button, 0, 0 ); | 187 | layout->addWidget( button, 0, 0 ); |
188 | layout->addWidget( mNameEdit, 0, 1 ); | 188 | layout->addWidget( mNameEdit, 0, 1 ); |
189 | layout->addWidget( mNameLabel, 0, 1 ); | 189 | layout->addWidget( mNameLabel, 0, 1 ); |
190 | 190 | ||
191 | label = new QLabel( i18n( "Role:" ), tab1 ); | 191 | button = new QPushButton( i18n( "Role:" ), tab1 ); |
192 | connect( button, SIGNAL( clicked() ), SLOT( setRole2FN() ) ); | ||
193 | //label = new QLabel( i18n( "Role:" ), tab1 ); | ||
192 | mRoleEdit = new KLineEdit( tab1 ); | 194 | mRoleEdit = new KLineEdit( tab1 ); |
193 | connect( mRoleEdit, SIGNAL( textChanged( const QString& ) ), | 195 | connect( mRoleEdit, SIGNAL( textChanged( const QString& ) ), |
194 | SLOT( textChanged( const QString& ) ) ); | 196 | SLOT( textChanged( const QString& ) ) ); |
195 | label->setBuddy( mRoleEdit ); | 197 | //label->setBuddy( mRoleEdit ); |
196 | layout->addWidget( label, 1, 0 ); | 198 | layout->addWidget( button, 1, 0 ); |
197 | layout->addWidget( mRoleEdit, 1, 1 ); | 199 | layout->addWidget( mRoleEdit, 1, 1 ); |
198 | 200 | ||
199 | // Organization | 201 | // Organization |
200 | label = new QLabel( i18n( "Organization:" ), tab1 ); | 202 | button = new QPushButton( i18n( "Organization:" ), tab1 ); |
203 | connect( button, SIGNAL( clicked() ), SLOT( setCompany2FN() ) ); | ||
204 | //label = new QLabel( i18n( "Organization:" ), tab1 ); | ||
201 | mOrgEdit = new KLineEdit( tab1 ); | 205 | mOrgEdit = new KLineEdit( tab1 ); |
202 | label->setBuddy( mOrgEdit ); | 206 | //label->setBuddy( mOrgEdit ); |
203 | connect( mOrgEdit, SIGNAL( textChanged( const QString& ) ), | 207 | connect( mOrgEdit, SIGNAL( textChanged( const QString& ) ), |
204 | SLOT( textChanged( const QString& ) ) ); | 208 | SLOT( textChanged( const QString& ) ) ); |
205 | layout->addWidget( label, 2, 0 ); | 209 | layout->addWidget( button, 2, 0 ); |
206 | layout->addWidget( mOrgEdit, 2, 1 ); | 210 | layout->addWidget( mOrgEdit, 2, 1 ); |
207 | 211 | ||
208 | // File as (formatted name) | 212 | // File as (formatted name) |
209 | label = new QLabel( i18n( "Formatted name:" ), tab1 ); | 213 | label = new QLabel( i18n( "Formatted name:" ), tab1 ); |
210 | mFormattedNameLabel = new KSqueezedTextLabel( tab1 ); | 214 | mFormattedNameLabel = new KSqueezedTextLabel( tab1 ); |
211 | layout->addWidget( label, 3, 0 ); | 215 | layout->addWidget( label, 3, 0 ); |
212 | layout->addWidget( mFormattedNameLabel, 3, 1 ); | 216 | layout->addWidget( mFormattedNameLabel, 3, 1 ); |
213 | /* LR | 217 | /* LR |
214 | // Left hand separator. This separator doesn't go all the way | 218 | // Left hand separator. This separator doesn't go all the way |
215 | // across so the dialog still flows from top to bottom | 219 | // across so the dialog still flows from top to bottom |
216 | bar = new KSeparator( KSeparator::HLine, tab1 ); | 220 | bar = new KSeparator( KSeparator::HLine, tab1 ); |
217 | layout->addMultiCellWidget( bar, 4, 4, 0, 2 ); | 221 | layout->addMultiCellWidget( bar, 4, 4, 0, 2 ); |
218 | */ | 222 | */ |
219 | ////////////////////////////////////// | 223 | ////////////////////////////////////// |
220 | 224 | ||
221 | /* LR | 225 | /* LR |
222 | // Phone numbers (upper right) | 226 | // Phone numbers (upper right) |
223 | label = new QLabel( tab1 ); | 227 | label = new QLabel( tab1 ); |
224 | //US loadIcon call is ambiguous. Add one more parameter | 228 | //US loadIcon call is ambiguous. Add one more parameter |
225 | //US label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop ) ); | 229 | //US label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop ) ); |
226 | label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) ); | 230 | label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) ); |
227 | //US layout->addMultiCellWidget( label, 0, 1, 3, 3 ); | 231 | //US layout->addMultiCellWidget( label, 0, 1, 3, 3 ); |
228 | layout->addMultiCellWidget( label, 5, 6, 0, 0 ); | 232 | layout->addMultiCellWidget( label, 5, 6, 0, 0 ); |
229 | */ | 233 | */ |
230 | mPhoneEditWidget = new PhoneEditWidget( tab1 ); | 234 | mPhoneEditWidget = new PhoneEditWidget( tab1 ); |
231 | connect( mPhoneEditWidget, SIGNAL( modified() ), SLOT( emitModified() ) ); | 235 | connect( mPhoneEditWidget, SIGNAL( modified() ), SLOT( emitModified() ) ); |
232 | //US layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); | 236 | //US layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); |
233 | int iii; | 237 | int iii; |
234 | #ifndef DESKTOP_VERSION | 238 | #ifndef DESKTOP_VERSION |
235 | iii = 7; | 239 | iii = 7; |
236 | #else | 240 | #else |
237 | iii = 8; | 241 | iii = 8; |
238 | #endif | 242 | #endif |
239 | layout->addMultiCellWidget( mPhoneEditWidget, 4, iii, 0, 1 ); | 243 | layout->addMultiCellWidget( mPhoneEditWidget, 4, iii, 0, 1 ); |
240 | ++iii; | 244 | ++iii; |
241 | /* LR | 245 | /* LR |
242 | bar = new KSeparator( KSeparator::HLine, tab1 ); | 246 | bar = new KSeparator( KSeparator::HLine, tab1 ); |
243 | //US layout->addMultiCellWidget( bar, 4, 4, 3, 6 ); | 247 | //US layout->addMultiCellWidget( bar, 4, 4, 3, 6 ); |
244 | layout->addMultiCellWidget( bar, 9, 9, 0, 2 ); | 248 | layout->addMultiCellWidget( bar, 9, 9, 0, 2 ); |
245 | */ | 249 | */ |
246 | /*US | 250 | /*US |
247 | ////////////////////////////////////// | 251 | ////////////////////////////////////// |
248 | // Addresses (lower left) | 252 | // Addresses (lower left) |
249 | label = new QLabel( tab1 ); | 253 | label = new QLabel( tab1 ); |
250 | //US loadIcon call is ambiguous. Add one more parameter | 254 | //US loadIcon call is ambiguous. Add one more parameter |
251 | //US label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop ) ); | 255 | //US label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop ) ); |
252 | label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop, 0 ) ); | 256 | label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop, 0 ) ); |
253 | layout->addMultiCellWidget( label, 5, 6, 0, 0 ); | 257 | layout->addMultiCellWidget( label, 5, 6, 0, 0 ); |
@@ -280,96 +284,112 @@ void AddresseeEditorWidget::setupTab1() | |||
280 | 284 | ||
281 | label = new QLabel( i18n( "URL:" ), tab1 ); | 285 | label = new QLabel( i18n( "URL:" ), tab1 ); |
282 | mURLEdit = new KLineEdit( tab1 ); | 286 | mURLEdit = new KLineEdit( tab1 ); |
283 | connect( mURLEdit, SIGNAL( textChanged( const QString& ) ), | 287 | connect( mURLEdit, SIGNAL( textChanged( const QString& ) ), |
284 | SLOT( textChanged( const QString& ) ) ); | 288 | SLOT( textChanged( const QString& ) ) ); |
285 | label->setBuddy( mURLEdit ); | 289 | label->setBuddy( mURLEdit ); |
286 | layout->addWidget( label, 8, 4 ); | 290 | layout->addWidget( label, 8, 4 ); |
287 | layout->addMultiCellWidget( mURLEdit, 8, 8, 5, 6 ); | 291 | layout->addMultiCellWidget( mURLEdit, 8, 8, 5, 6 ); |
288 | 292 | ||
289 | label = new QLabel( i18n( "&IM address:" ), tab1 ); | 293 | label = new QLabel( i18n( "&IM address:" ), tab1 ); |
290 | mIMAddressEdit = new KLineEdit( tab1 ); | 294 | mIMAddressEdit = new KLineEdit( tab1 ); |
291 | connect( mIMAddressEdit, SIGNAL( textChanged( const QString& ) ), | 295 | connect( mIMAddressEdit, SIGNAL( textChanged( const QString& ) ), |
292 | SLOT( textChanged( const QString& ) ) ); | 296 | SLOT( textChanged( const QString& ) ) ); |
293 | label->setBuddy( mIMAddressEdit ); | 297 | label->setBuddy( mIMAddressEdit ); |
294 | layout->addWidget( label, 9, 4 ); | 298 | layout->addWidget( label, 9, 4 ); |
295 | layout->addMultiCellWidget( mIMAddressEdit, 9, 9, 5, 6 ); | 299 | layout->addMultiCellWidget( mIMAddressEdit, 9, 9, 5, 6 ); |
296 | 300 | ||
297 | layout->addColSpacing( 6, 50 ); | 301 | layout->addColSpacing( 6, 50 ); |
298 | 302 | ||
299 | bar = new KSeparator( KSeparator::HLine, tab1 ); | 303 | bar = new KSeparator( KSeparator::HLine, tab1 ); |
300 | layout->addMultiCellWidget( bar, 10, 10, 0, 6 ); | 304 | layout->addMultiCellWidget( bar, 10, 10, 0, 6 ); |
301 | */ | 305 | */ |
302 | /////////////////////////////////////// | 306 | /////////////////////////////////////// |
303 | QHBox *categoryBox = new QHBox( tab1 ,"cato"); | 307 | QHBox *categoryBox = new QHBox( tab1 ,"cato"); |
304 | categoryBox->setSpacing( KDialogBase::spacingHint() ); | 308 | categoryBox->setSpacing( KDialogBase::spacingHint() ); |
305 | categoryBox->setMargin( KDialogBase::marginHintSmall() ); | 309 | categoryBox->setMargin( KDialogBase::marginHintSmall() ); |
306 | 310 | ||
307 | // Categories | 311 | // Categories |
308 | button = new QPushButton( i18n( "Categories" ), categoryBox ); | 312 | button = new QPushButton( i18n( "Categories" ), categoryBox ); |
309 | connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) ); | 313 | connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) ); |
310 | 314 | ||
311 | mCategoryEdit = new KLineEdit( categoryBox ); | 315 | mCategoryEdit = new KLineEdit( categoryBox ); |
312 | mCategoryEdit->setReadOnly( true ); | 316 | mCategoryEdit->setReadOnly( true ); |
313 | connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), | 317 | connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), |
314 | SLOT( textChanged( const QString& ) ) ); | 318 | SLOT( textChanged( const QString& ) ) ); |
315 | 319 | ||
316 | mSecrecyWidget = new SecrecyWidget( categoryBox ); | 320 | mSecrecyWidget = new SecrecyWidget( categoryBox ); |
317 | connect( mSecrecyWidget, SIGNAL( changed() ), SLOT( emitModified() ) ); | 321 | connect( mSecrecyWidget, SIGNAL( changed() ), SLOT( emitModified() ) ); |
318 | 322 | ||
319 | //US layout->addMultiCellWidget( categoryBox, 11, 11, 0, 6 ); | 323 | //US layout->addMultiCellWidget( categoryBox, 11, 11, 0, 6 ); |
320 | layout->addMultiCellWidget( categoryBox, iii, iii, 0, 1 ); | 324 | layout->addMultiCellWidget( categoryBox, iii, iii, 0, 1 ); |
321 | 325 | ||
322 | // Build the layout and add to the tab widget | 326 | // Build the layout and add to the tab widget |
323 | layout->activate(); // required | 327 | layout->activate(); // required |
324 | 328 | ||
325 | mTabWidget->addTab( tab1, i18n( "&General" ) ); | 329 | mTabWidget->addTab( tab1, i18n( "&General" ) ); |
326 | } | 330 | } |
327 | 331 | ||
332 | void AddresseeEditorWidget::setRole2FN() | ||
333 | { | ||
334 | if ( mRoleEdit->text().isEmpty() ) return; | ||
335 | mFormattedNameType = NameEditDialog::CustomName; | ||
336 | mAddressee.setFormattedName( mRoleEdit->text() ); | ||
337 | mFormattedNameLabel->setText( mRoleEdit->text() ); | ||
338 | mDirty = true; | ||
339 | } | ||
340 | void AddresseeEditorWidget::setCompany2FN() | ||
341 | { | ||
342 | if ( mOrgEdit->text().isEmpty() ) return; | ||
343 | mFormattedNameType = NameEditDialog::CustomName; | ||
344 | mAddressee.setFormattedName( mOrgEdit->text() ); | ||
345 | mFormattedNameLabel->setText( mOrgEdit->text() ); | ||
346 | mDirty = true; | ||
347 | } | ||
328 | 348 | ||
329 | void AddresseeEditorWidget::setupTab1_1() | 349 | void AddresseeEditorWidget::setupTab1_1() |
330 | { | 350 | { |
331 | // This is the Address tab | 351 | // This is the Address tab |
332 | QWidget *tab1_1 = new QWidget( mTabWidget ); | 352 | QWidget *tab1_1 = new QWidget( mTabWidget ); |
333 | 353 | ||
334 | //US QGridLayout *layout = new QGridLayout( tab1_1, 11, 7 ); | 354 | //US QGridLayout *layout = new QGridLayout( tab1_1, 11, 7 ); |
335 | QGridLayout *layout = new QGridLayout( tab1_1, 7, 2 ); | 355 | QGridLayout *layout = new QGridLayout( tab1_1, 7, 2 ); |
336 | layout->setMargin( KDialogBase::marginHintSmall() ); | 356 | layout->setMargin( KDialogBase::marginHintSmall() ); |
337 | layout->setSpacing( KDialogBase::spacingHintSmall() ); | 357 | layout->setSpacing( KDialogBase::spacingHintSmall() ); |
338 | 358 | ||
339 | QLabel *label; | 359 | QLabel *label; |
340 | KSeparator* bar; | 360 | KSeparator* bar; |
341 | QPushButton *button; | 361 | QPushButton *button; |
342 | 362 | ||
343 | /*US | 363 | /*US |
344 | ////////////////////////////////// | 364 | ////////////////////////////////// |
345 | // Upper left group (person info) | 365 | // Upper left group (person info) |
346 | 366 | ||
347 | // Person icon | 367 | // Person icon |
348 | label = new QLabel( tab1 ); | 368 | label = new QLabel( tab1 ); |
349 | //US ambiguous call. Add one more parameter | 369 | //US ambiguous call. Add one more parameter |
350 | //US label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) ); | 370 | //US label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) ); |
351 | label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) ); | 371 | label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) ); |
352 | layout->addMultiCellWidget( label, 0, 1, 0, 0 ); | 372 | layout->addMultiCellWidget( label, 0, 1, 0, 0 ); |
353 | 373 | ||
354 | // First name | 374 | // First name |
355 | button = new QPushButton( i18n( "Name..." ), tab1 ); | 375 | button = new QPushButton( i18n( "Name..." ), tab1 ); |
356 | QToolTip::add( button, i18n( "Edit the contact's name" ) ); | 376 | QToolTip::add( button, i18n( "Edit the contact's name" ) ); |
357 | mNameEdit = new KLineEdit( tab1, "mNameEdit" ); | 377 | mNameEdit = new KLineEdit( tab1, "mNameEdit" ); |
358 | connect( mNameEdit, SIGNAL( textChanged( const QString& ) ), | 378 | connect( mNameEdit, SIGNAL( textChanged( const QString& ) ), |
359 | SLOT( nameTextChanged( const QString& ) ) ); | 379 | SLOT( nameTextChanged( const QString& ) ) ); |
360 | connect( button, SIGNAL( clicked() ), SLOT( nameButtonClicked() ) ); | 380 | connect( button, SIGNAL( clicked() ), SLOT( nameButtonClicked() ) ); |
361 | 381 | ||
362 | #ifndef KAB_EMBEDDED | 382 | #ifndef KAB_EMBEDDED |
363 | mNameLabel = new KSqueezedTextLabel( tab1 ); | 383 | mNameLabel = new KSqueezedTextLabel( tab1 ); |
364 | mNameLabel->hide(); | 384 | mNameLabel->hide(); |
365 | #else //KAB_EMBEDDED | 385 | #else //KAB_EMBEDDED |
366 | qDebug("AddresseeEditorWidget::setupTab1 has to be changed"); | 386 | qDebug("AddresseeEditorWidget::setupTab1 has to be changed"); |
367 | #endif //KAB_EMBEDDED | 387 | #endif //KAB_EMBEDDED |
368 | 388 | ||
369 | layout->addWidget( button, 0, 1 ); | 389 | layout->addWidget( button, 0, 1 ); |
370 | layout->addWidget( mNameEdit, 0, 2 ); | 390 | layout->addWidget( mNameEdit, 0, 2 ); |
371 | 391 | ||
372 | #ifndef KAB_EMBEDDED | 392 | #ifndef KAB_EMBEDDED |
373 | layout->addWidget( mNameLabel, 0, 2 ); | 393 | layout->addWidget( mNameLabel, 0, 2 ); |
374 | #else //KAB_EMBEDDED | 394 | #else //KAB_EMBEDDED |
375 | qDebug("AddresseeEditorWidget::setupTab1 has to be changed"); | 395 | qDebug("AddresseeEditorWidget::setupTab1 has to be changed"); |
diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h index 995f30e..eaf5b16 100644 --- a/kaddressbook/addresseeeditorwidget.h +++ b/kaddressbook/addresseeeditorwidget.h | |||
@@ -44,96 +44,98 @@ class QMultiLineEdit; | |||
44 | #endif //KAB_EMBEDDED | 44 | #endif //KAB_EMBEDDED |
45 | 45 | ||
46 | class KComboBox; | 46 | class KComboBox; |
47 | class KDateEdit; | 47 | class KDateEdit; |
48 | class KLineEdit; | 48 | class KLineEdit; |
49 | class KSqueezedTextLabel; | 49 | class KSqueezedTextLabel; |
50 | 50 | ||
51 | class AddressEditWidget; | 51 | class AddressEditWidget; |
52 | class EmailEditWidget; | 52 | class EmailEditWidget; |
53 | class GeoWidget; | 53 | class GeoWidget; |
54 | class ImageWidget; | 54 | class ImageWidget; |
55 | class KABCore; | 55 | class KABCore; |
56 | class KeyWidget; | 56 | class KeyWidget; |
57 | class PhoneEditWidget; | 57 | class PhoneEditWidget; |
58 | class SecrecyWidget; | 58 | class SecrecyWidget; |
59 | class SoundWidget; | 59 | class SoundWidget; |
60 | 60 | ||
61 | namespace KPIM | 61 | namespace KPIM |
62 | { | 62 | { |
63 | class CategorySelectDialog; | 63 | class CategorySelectDialog; |
64 | class CategoryEditDialog; | 64 | class CategoryEditDialog; |
65 | } | 65 | } |
66 | 66 | ||
67 | namespace KABC { class AddressBook; } | 67 | namespace KABC { class AddressBook; } |
68 | 68 | ||
69 | class AddresseeEditorWidget : public ExtensionWidget | 69 | class AddresseeEditorWidget : public ExtensionWidget |
70 | { | 70 | { |
71 | Q_OBJECT | 71 | Q_OBJECT |
72 | 72 | ||
73 | public: | 73 | public: |
74 | AddresseeEditorWidget( KABCore *core, bool isExtension, | 74 | AddresseeEditorWidget( KABCore *core, bool isExtension, |
75 | QWidget *parent, const char *name = 0 ); | 75 | QWidget *parent, const char *name = 0 ); |
76 | ~AddresseeEditorWidget(); | 76 | ~AddresseeEditorWidget(); |
77 | 77 | ||
78 | void setAddressee( const KABC::Addressee& ); | 78 | void setAddressee( const KABC::Addressee& ); |
79 | const KABC::Addressee &addressee(); | 79 | const KABC::Addressee &addressee(); |
80 | 80 | ||
81 | void contactsSelectionChanged(); | 81 | void contactsSelectionChanged(); |
82 | 82 | ||
83 | void load(); | 83 | void load(); |
84 | void save(); | 84 | void save(); |
85 | 85 | ||
86 | bool dirty(); | 86 | bool dirty(); |
87 | 87 | ||
88 | QString title() const; | 88 | QString title() const; |
89 | QString identifier() const; | 89 | QString identifier() const; |
90 | 90 | ||
91 | protected slots: | 91 | protected slots: |
92 | void setRole2FN(); | ||
93 | void setCompany2FN(); | ||
92 | void textChanged( const QString& ); | 94 | void textChanged( const QString& ); |
93 | void pageChanged( QWidget *wdg ); | 95 | void pageChanged( QWidget *wdg ); |
94 | 96 | ||
95 | /** | 97 | /** |
96 | Emits the modified signal and sets the dirty flag. Any slot | 98 | Emits the modified signal and sets the dirty flag. Any slot |
97 | that modifies data should use this method instead of calling emit | 99 | that modifies data should use this method instead of calling emit |
98 | modified() directly. | 100 | modified() directly. |
99 | */ | 101 | */ |
100 | void emitModified(); | 102 | void emitModified(); |
101 | 103 | ||
102 | void dateChanged( QDate ); | 104 | void dateChanged( QDate ); |
103 | void invalidDate(); | 105 | void invalidDate(); |
104 | void nameTextChanged( const QString& ); | 106 | void nameTextChanged( const QString& ); |
105 | void nameBoxChanged(); | 107 | void nameBoxChanged(); |
106 | void nameButtonClicked(); | 108 | void nameButtonClicked(); |
107 | void categoryButtonClicked(); | 109 | void categoryButtonClicked(); |
108 | 110 | ||
109 | /** | 111 | /** |
110 | Called whenever the categories change in the categories dialog. | 112 | Called whenever the categories change in the categories dialog. |
111 | */ | 113 | */ |
112 | void categoriesSelected( const QStringList& ); | 114 | void categoriesSelected( const QStringList& ); |
113 | 115 | ||
114 | /** | 116 | /** |
115 | Edits which categories are available in the CategorySelectDialog. | 117 | Edits which categories are available in the CategorySelectDialog. |
116 | */ | 118 | */ |
117 | void editCategories(); | 119 | void editCategories(); |
118 | 120 | ||
119 | private: | 121 | private: |
120 | AddresseeConfig * mAConfig; | 122 | AddresseeConfig * mAConfig; |
121 | void initGUI(); | 123 | void initGUI(); |
122 | void setupTab1(); | 124 | void setupTab1(); |
123 | void setupTab1_1(); | 125 | void setupTab1_1(); |
124 | void setupTab2(); | 126 | void setupTab2(); |
125 | void setupTab2_1(); | 127 | void setupTab2_1(); |
126 | void setupTab3(); | 128 | void setupTab3(); |
127 | void setupTab3_1(); | 129 | void setupTab3_1(); |
128 | 130 | ||
129 | KABC::Addressee mAddressee; | 131 | KABC::Addressee mAddressee; |
130 | int mFormattedNameType; | 132 | int mFormattedNameType; |
131 | bool mDirty; | 133 | bool mDirty; |
132 | bool mIsExtension; | 134 | bool mIsExtension; |
133 | bool mBlockSignals; | 135 | bool mBlockSignals; |
134 | 136 | ||
135 | // GUI | 137 | // GUI |
136 | KPIM::CategorySelectDialog *mCategoryDialog; | 138 | KPIM::CategorySelectDialog *mCategoryDialog; |
137 | KPIM::CategoryEditDialog *mCategoryEditDialog; | 139 | KPIM::CategoryEditDialog *mCategoryEditDialog; |
138 | QTabWidget *mTabWidget; | 140 | QTabWidget *mTabWidget; |
139 | 141 | ||