Diffstat (limited to 'kaddressbook/addresseeeditorwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/addresseeeditorwidget.cpp | 50 |
1 files changed, 43 insertions, 7 deletions
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index c4083a9..4313998 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp | |||
@@ -319,67 +319,103 @@ void AddresseeEditorWidget::setupTab1() | |||
319 | SLOT( textChanged( const QString& ) ) ); | 319 | SLOT( textChanged( const QString& ) ) ); |
320 | label->setBuddy( mIMAddressEdit ); | 320 | label->setBuddy( mIMAddressEdit ); |
321 | layout->addWidget( label, 9, 4 ); | 321 | layout->addWidget( label, 9, 4 ); |
322 | layout->addMultiCellWidget( mIMAddressEdit, 9, 9, 5, 6 ); | 322 | layout->addMultiCellWidget( mIMAddressEdit, 9, 9, 5, 6 ); |
323 | 323 | ||
324 | layout->addColSpacing( 6, 50 ); | 324 | layout->addColSpacing( 6, 50 ); |
325 | 325 | ||
326 | bar = new KSeparator( KSeparator::HLine, tab1 ); | 326 | bar = new KSeparator( KSeparator::HLine, tab1 ); |
327 | layout->addMultiCellWidget( bar, 10, 10, 0, 6 ); | 327 | layout->addMultiCellWidget( bar, 10, 10, 0, 6 ); |
328 | */ | 328 | */ |
329 | /////////////////////////////////////// | 329 | /////////////////////////////////////// |
330 | QHBox *categoryBox = new QHBox( tab1 ,"cato"); | 330 | QHBox *categoryBox = new QHBox( tab1 ,"cato"); |
331 | categoryBox->setSpacing( KDialogBase::spacingHint() ); | 331 | categoryBox->setSpacing( KDialogBase::spacingHint() ); |
332 | categoryBox->setMargin( KDialogBase::marginHintSmall() ); | 332 | categoryBox->setMargin( KDialogBase::marginHintSmall() ); |
333 | 333 | ||
334 | // Categories | 334 | // Categories |
335 | button = new QPushButton( i18n( "Categories" ), categoryBox ); | 335 | button = new QPushButton( i18n( "Categories" )+":", categoryBox ); |
336 | connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) ); | 336 | connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) ); |
337 | 337 | ||
338 | mCategoryEdit = new KLineEdit( categoryBox ); | 338 | mCategoryEdit = new QPushButton ( categoryBox ); |
339 | mCategoryEdit->setReadOnly( true ); | 339 | mCategoryEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Fixed ,FALSE) ); |
340 | connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), | 340 | mCatPopup = new QPopupMenu ( categoryBox ); |
341 | SLOT( textChanged( const QString& ) ) ); | 341 | mCategoryEdit->setPopup( mCatPopup ); |
342 | connect(mCatPopup,SIGNAL(aboutToShow () ), this ,SLOT(showCatPopup())); | ||
343 | connect(mCatPopup,SIGNAL( activated ( int ) ), this ,SLOT(selectedCatPopup( int ))); | ||
344 | //connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), | ||
345 | // SLOT( textChanged( const QString& ) ) ); | ||
342 | 346 | ||
343 | mSecrecyWidget = new SecrecyWidget( categoryBox ); | 347 | mSecrecyWidget = new SecrecyWidget( categoryBox ); |
344 | connect( mSecrecyWidget, SIGNAL( changed() ), SLOT( emitModified() ) ); | 348 | connect( mSecrecyWidget, SIGNAL( changed() ), SLOT( emitModified() ) ); |
345 | 349 | ||
346 | //US layout->addMultiCellWidget( categoryBox, 11, 11, 0, 6 ); | 350 | //US layout->addMultiCellWidget( categoryBox, 11, 11, 0, 6 ); |
347 | layout->addMultiCellWidget( categoryBox, iii, iii, 0, maxCol ); | 351 | layout->addMultiCellWidget( categoryBox, iii, iii, 0, maxCol ); |
348 | 352 | ||
349 | // Build the layout and add to the tab widget | 353 | // Build the layout and add to the tab widget |
350 | layout->activate(); // required | 354 | layout->activate(); // required |
351 | 355 | ||
352 | mTabWidget->addTab( tab1, i18n( "&General" ) ); | 356 | mTabWidget->addTab( tab1, i18n( "&General" ) ); |
353 | } | 357 | } |
354 | 358 | ||
359 | void AddresseeEditorWidget::showCatPopup() | ||
360 | { | ||
361 | mCatPopup->clear(); | ||
362 | QStringList checkedCategories = QStringList::split (",", mCategoryEdit->text()); | ||
363 | int index = 0; | ||
364 | for (QStringList::Iterator it = KABPrefs::instance()->mCustomCategories.begin (); | ||
365 | it != KABPrefs::instance()->mCustomCategories.end (); | ||
366 | ++it) { | ||
367 | mCatPopup->insertItem (*it, index ); | ||
368 | //mCategory[index] = *it; | ||
369 | if (checkedCategories.find (*it) != checkedCategories.end ()) mCatPopup->setItemChecked (index, true); | ||
370 | ++index; | ||
371 | } | ||
372 | } | ||
373 | void AddresseeEditorWidget::selectedCatPopup( int index ) | ||
374 | { | ||
375 | QStringList categories = QStringList::split (",", mCategoryEdit->text()); | ||
376 | QString colcat = categories.first(); | ||
377 | if (categories.find ( KABPrefs::instance()->mCustomCategories[index]) != categories.end ()) | ||
378 | categories.remove (KABPrefs::instance()->mCustomCategories[index]); | ||
379 | else | ||
380 | categories.insert (categories.end(), KABPrefs::instance()->mCustomCategories[index]); | ||
381 | categories.sort (); | ||
382 | if ( !colcat.isEmpty() ) { | ||
383 | if ( categories.find ( colcat ) != categories.end () ) { | ||
384 | categories.remove( colcat ); | ||
385 | categories.prepend( colcat ); | ||
386 | } | ||
387 | } | ||
388 | mCategoryEdit->setText( categories.join(",") ); | ||
389 | emitModified(); | ||
390 | } | ||
355 | void AddresseeEditorWidget::setRole2FN() | 391 | void AddresseeEditorWidget::setRole2FN() |
356 | { | 392 | { |
357 | if ( mRoleEdit->text().isEmpty() ) return; | 393 | if ( mRoleEdit->text().isEmpty() ) return; |
358 | mFormattedNameType = NameEditDialog::CustomName; | 394 | mFormattedNameType = NameEditDialog::CustomName; |
359 | mAddressee.setFormattedName( mRoleEdit->text() ); | 395 | mAddressee.setFormattedName( mRoleEdit->text() ); |
360 | mFormattedNameLabel->setText( mRoleEdit->text() ); | 396 | mFormattedNameLabel->setText( mRoleEdit->text() ); |
361 | mDirty = true; | 397 | emitModified(); |
362 | } | 398 | } |
363 | void AddresseeEditorWidget::setCompany2FN() | 399 | void AddresseeEditorWidget::setCompany2FN() |
364 | { | 400 | { |
365 | if ( mOrgEdit->text().isEmpty() ) return; | 401 | if ( mOrgEdit->text().isEmpty() ) return; |
366 | mFormattedNameType = NameEditDialog::CustomName; | 402 | mFormattedNameType = NameEditDialog::CustomName; |
367 | mAddressee.setFormattedName( mOrgEdit->text() ); | 403 | mAddressee.setFormattedName( mOrgEdit->text() ); |
368 | mFormattedNameLabel->setText( mOrgEdit->text() ); | 404 | mFormattedNameLabel->setText( mOrgEdit->text() ); |
369 | mDirty = true; | 405 | emitModified(); |
370 | } | 406 | } |
371 | 407 | ||
372 | void AddresseeEditorWidget::setupTab1_1() | 408 | void AddresseeEditorWidget::setupTab1_1() |
373 | { | 409 | { |
374 | // This is the Address tab | 410 | // This is the Address tab |
375 | QWidget *tab1_1 = new QWidget( mTabWidget ); | 411 | QWidget *tab1_1 = new QWidget( mTabWidget ); |
376 | 412 | ||
377 | //US QGridLayout *layout = new QGridLayout( tab1_1, 11, 7 ); | 413 | //US QGridLayout *layout = new QGridLayout( tab1_1, 11, 7 ); |
378 | QGridLayout *layout = new QGridLayout( tab1_1, 7, 2 ); | 414 | QGridLayout *layout = new QGridLayout( tab1_1, 7, 2 ); |
379 | layout->setMargin( KDialogBase::marginHintSmall() ); | 415 | layout->setMargin( KDialogBase::marginHintSmall() ); |
380 | layout->setSpacing( KDialogBase::spacingHintSmall() ); | 416 | layout->setSpacing( KDialogBase::spacingHintSmall() ); |
381 | 417 | ||
382 | QLabel *label; | 418 | QLabel *label; |
383 | KSeparator* bar; | 419 | KSeparator* bar; |
384 | QPushButton *button; | 420 | QPushButton *button; |
385 | 421 | ||