-rw-r--r-- | core/pim/addressbook/abeditor.cpp | 3 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 8 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 6 |
3 files changed, 5 insertions, 12 deletions
diff --git a/core/pim/addressbook/abeditor.cpp b/core/pim/addressbook/abeditor.cpp index 91e8722..75e7ede 100644 --- a/core/pim/addressbook/abeditor.cpp +++ b/core/pim/addressbook/abeditor.cpp | |||
@@ -521,26 +521,25 @@ void AbEditor::saveEntry() | |||
521 | } | 521 | } |
522 | 522 | ||
523 | int gender = genderCombo->currentItem(); | 523 | int gender = genderCombo->currentItem(); |
524 | ent.setGender( QString::number( gender ) ); | 524 | ent.setGender( QString::number( gender ) ); |
525 | 525 | ||
526 | QString str = txtNote->text(); | 526 | QString str = txtNote->text(); |
527 | if ( !str.isNull() ) | 527 | if ( !str.isNull() ) |
528 | ent.setNotes( str ); | 528 | ent.setNotes( str ); |
529 | } | 529 | } |
530 | 530 | ||
531 | void AbEditor::slotNote() | 531 | void AbEditor::slotNote() |
532 | { | 532 | { |
533 | dlgNote->showMaximized(); | 533 | if ( ! QPEApplication::execDialog( &dlgNote ) ) { |
534 | if ( !dlgNote->exec() ) { | ||
535 | // reset the note... | 534 | // reset the note... |
536 | txtNote->setText( ent.notes() ); | 535 | txtNote->setText( ent.notes() ); |
537 | } | 536 | } |
538 | } | 537 | } |
539 | 538 | ||
540 | void AbEditor::setNameFocus() | 539 | void AbEditor::setNameFocus() |
541 | { | 540 | { |
542 | firstEdit->setFocus(); | 541 | firstEdit->setFocus(); |
543 | } | 542 | } |
544 | 543 | ||
545 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | 544 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, |
546 | QString &strAll ) | 545 | QString &strAll ) |
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 00cd2a6..1c7ddd4 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -273,26 +273,25 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
273 | connect( qApp, SIGNAL( appMessage(const QCString &, const QByteArray &) ), | 273 | connect( qApp, SIGNAL( appMessage(const QCString &, const QByteArray &) ), |
274 | this, SLOT( appMessage(const QCString &, const QByteArray &) ) ); | 274 | this, SLOT( appMessage(const QCString &, const QByteArray &) ) ); |
275 | 275 | ||
276 | 276 | ||
277 | isLoading = false; | 277 | isLoading = false; |
278 | } | 278 | } |
279 | 279 | ||
280 | 280 | ||
281 | void AddressbookWindow::slotConfig() | 281 | void AddressbookWindow::slotConfig() |
282 | { | 282 | { |
283 | ConfigDlg* dlg = new ConfigDlg( this, "Config" ); | 283 | ConfigDlg* dlg = new ConfigDlg( this, "Config" ); |
284 | dlg -> setConfig( m_config ); | 284 | dlg -> setConfig( m_config ); |
285 | dlg -> showMaximized(); | 285 | if ( QPEApplication::execDialog( dlg ) ) { |
286 | if ( dlg -> exec() ) { | ||
287 | qWarning ("Config Dialog accepted!"); | 286 | qWarning ("Config Dialog accepted!"); |
288 | m_config = dlg -> getConfig(); | 287 | m_config = dlg -> getConfig(); |
289 | if ( m_curFontSize != m_config.fontSize() ){ | 288 | if ( m_curFontSize != m_config.fontSize() ){ |
290 | qWarning("Font was changed!"); | 289 | qWarning("Font was changed!"); |
291 | m_curFontSize = m_config.fontSize(); | 290 | m_curFontSize = m_config.fontSize(); |
292 | emit slotSetFont( m_curFontSize ); | 291 | emit slotSetFont( m_curFontSize ); |
293 | } | 292 | } |
294 | m_abView -> setListOrder( m_config.orderList() ); | 293 | m_abView -> setListOrder( m_config.orderList() ); |
295 | } | 294 | } |
296 | 295 | ||
297 | delete dlg; | 296 | delete dlg; |
298 | } | 297 | } |
@@ -741,30 +740,27 @@ void AddressbookWindow::editEntry( EntryMode entryMode ) | |||
741 | { | 740 | { |
742 | OContact entry; | 741 | OContact entry; |
743 | if ( !abEditor ) { | 742 | if ( !abEditor ) { |
744 | abEditor = new ContactEditor( entry, this, "editor" ); | 743 | abEditor = new ContactEditor( entry, this, "editor" ); |
745 | } | 744 | } |
746 | if ( entryMode == EditEntry ) | 745 | if ( entryMode == EditEntry ) |
747 | abEditor->setEntry( m_abView -> currentEntry() ); | 746 | abEditor->setEntry( m_abView -> currentEntry() ); |
748 | else if ( entryMode == NewEntry ) | 747 | else if ( entryMode == NewEntry ) |
749 | abEditor->setEntry( entry ); | 748 | abEditor->setEntry( entry ); |
750 | // other things may change the caption. | 749 | // other things may change the caption. |
751 | abEditor->setCaption( tr("Edit Address") ); | 750 | abEditor->setCaption( tr("Edit Address") ); |
752 | 751 | ||
753 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | ||
754 | abEditor->showMaximized(); | ||
755 | #endif | ||
756 | // fix the foxus... | 752 | // fix the foxus... |
757 | abEditor->setNameFocus(); | 753 | abEditor->setNameFocus(); |
758 | if ( abEditor->exec() ) { | 754 | if ( QPEApplication::execDialog( abEditor ) ) { |
759 | setFocus(); | 755 | setFocus(); |
760 | if ( entryMode == NewEntry ) { | 756 | if ( entryMode == NewEntry ) { |
761 | OContact insertEntry = abEditor->entry(); | 757 | OContact insertEntry = abEditor->entry(); |
762 | insertEntry.assignUid(); | 758 | insertEntry.assignUid(); |
763 | m_abView -> addEntry( insertEntry ); | 759 | m_abView -> addEntry( insertEntry ); |
764 | m_abView -> setCurrentUid( insertEntry.uid() ); | 760 | m_abView -> setCurrentUid( insertEntry.uid() ); |
765 | } else { | 761 | } else { |
766 | OContact replEntry = abEditor->entry(); | 762 | OContact replEntry = abEditor->entry(); |
767 | 763 | ||
768 | if ( !replEntry.isValidUid() ) | 764 | if ( !replEntry.isValidUid() ) |
769 | replEntry.assignUid(); | 765 | replEntry.assignUid(); |
770 | 766 | ||
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 8fbd065..7932781 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -1074,41 +1074,39 @@ void ContactEditor::accept() { | |||
1074 | cleanupFields(); | 1074 | cleanupFields(); |
1075 | reject(); | 1075 | reject(); |
1076 | } else { | 1076 | } else { |
1077 | saveEntry(); | 1077 | saveEntry(); |
1078 | cleanupFields(); | 1078 | cleanupFields(); |
1079 | QDialog::accept(); | 1079 | QDialog::accept(); |
1080 | } | 1080 | } |
1081 | 1081 | ||
1082 | } | 1082 | } |
1083 | 1083 | ||
1084 | void ContactEditor::slotNote() { | 1084 | void ContactEditor::slotNote() { |
1085 | 1085 | ||
1086 | dlgNote->showMaximized(); | 1086 | if ( ! QPEApplication::execDialog( dlgNote ) ) { |
1087 | if ( !dlgNote->exec() ) { | ||
1088 | txtNote->setText( ent.notes() ); | 1087 | txtNote->setText( ent.notes() ); |
1089 | } | 1088 | } |
1090 | } | 1089 | } |
1091 | 1090 | ||
1092 | void ContactEditor::slotName() { | 1091 | void ContactEditor::slotName() { |
1093 | 1092 | ||
1094 | QString tmpName; | 1093 | QString tmpName; |
1095 | 1094 | ||
1096 | txtFirstName->setText( parseName(txtFullName->text(), NAME_F) ); | 1095 | txtFirstName->setText( parseName(txtFullName->text(), NAME_F) ); |
1097 | txtMiddleName->setText( parseName(txtFullName->text(), NAME_M) ); | 1096 | txtMiddleName->setText( parseName(txtFullName->text(), NAME_M) ); |
1098 | txtLastName->setText( parseName(txtFullName->text(), NAME_L) ); | 1097 | txtLastName->setText( parseName(txtFullName->text(), NAME_L) ); |
1099 | // txtSuffix->setText( parseName(txtFullName->text(), NAME_S) ); | 1098 | // txtSuffix->setText( parseName(txtFullName->text(), NAME_S) ); |
1100 | 1099 | ||
1101 | dlgName->showMaximized(); | 1100 | if ( QPEApplication::execDialog( dlgName ) ) { |
1102 | if ( dlgName->exec() ) { | ||
1103 | if ( txtLastName->text().contains( ' ', TRUE ) ) | 1101 | if ( txtLastName->text().contains( ' ', TRUE ) ) |
1104 | tmpName = txtLastName->text() + ", " + txtFirstName->text() + " " + txtMiddleName->text(); | 1102 | tmpName = txtLastName->text() + ", " + txtFirstName->text() + " " + txtMiddleName->text(); |
1105 | else | 1103 | else |
1106 | tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text(); | 1104 | tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text(); |
1107 | 1105 | ||
1108 | txtFullName->setText( tmpName.simplifyWhiteSpace() ); | 1106 | txtFullName->setText( tmpName.simplifyWhiteSpace() ); |
1109 | slotFullNameChange( txtFullName->text() ); | 1107 | slotFullNameChange( txtFullName->text() ); |
1110 | } | 1108 | } |
1111 | 1109 | ||
1112 | } | 1110 | } |
1113 | 1111 | ||
1114 | void ContactEditor::setNameFocus() { | 1112 | void ContactEditor::setNameFocus() { |