Diffstat (limited to 'core/pim/addressbook/addressbook.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
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 | ||