author | ar <ar> | 2004-02-07 23:52:31 (UTC) |
---|---|---|
committer | ar <ar> | 2004-02-07 23:52:31 (UTC) |
commit | 6582895befc98131430710191238a93b9dde161c (patch) (unidiff) | |
tree | d050483742d0e102e08138bcdd8f170a9558b12d /core/pim/addressbook | |
parent | 3f261fa6eac46b8d0d4ac8b8bb95b385435004da (diff) | |
download | opie-6582895befc98131430710191238a93b9dde161c.zip opie-6582895befc98131430710191238a93b9dde161c.tar.gz opie-6582895befc98131430710191238a93b9dde161c.tar.bz2 |
QPEApplication::showDialog() and QPEAPplication::execDialog() for better big screen handling
-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 | |||
@@ -531,6 +531,5 @@ void AbEditor::saveEntry() | |||
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() ); |
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 | |||
@@ -283,6 +283,5 @@ void AddressbookWindow::slotConfig() | |||
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(); |
@@ -751,10 +750,7 @@ void AddressbookWindow::editEntry( EntryMode entryMode ) | |||
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 ) { |
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 | |||
@@ -1084,6 +1084,5 @@ void ContactEditor::accept() { | |||
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 | } |
@@ -1099,6 +1098,5 @@ void ContactEditor::slotName() { | |||
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(); |