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 | |
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/apps/embeddedkonsole/konsole.cpp | 5 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 6 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 3 | ||||
-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 | ||||
-rw-r--r-- | core/pim/datebook/datebook.cpp | 27 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 10 | ||||
-rw-r--r-- | core/pim/datebook2/mainwindow.cpp | 9 | ||||
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 3 | ||||
-rw-r--r-- | core/pim/todo/todoeditor.cpp | 9 | ||||
-rw-r--r-- | core/settings/light-and-power/light.cpp | 4 |
12 files changed, 28 insertions, 65 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index a5adc03..ce8fb6b 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -39,19 +39,20 @@ | |||
39 | #include <qmessagebox.h> | 39 | #include <qmessagebox.h> |
40 | #include <qaction.h> | 40 | #include <qaction.h> |
41 | #include <qapplication.h> | 41 | #include <qapplication.h> |
42 | #include <qfontmetrics.h> | 42 | #include <qfontmetrics.h> |
43 | #include <qcombobox.h> | 43 | #include <qcombobox.h> |
44 | #include <qevent.h> | 44 | #include <qevent.h> |
45 | #include <qtabwidget.h> | 45 | #include <qtabwidget.h> |
46 | #include <qtabbar.h> | 46 | #include <qtabbar.h> |
47 | #include <qpe/config.h> | ||
48 | #include <qstringlist.h> | 47 | #include <qstringlist.h> |
49 | #include <qpalette.h> | 48 | #include <qpalette.h> |
49 | #include <qpe/config.h> | ||
50 | #include <qpe/qpeapplication.h> | ||
50 | 51 | ||
51 | #include <unistd.h> | 52 | #include <unistd.h> |
52 | #include <pwd.h> | 53 | #include <pwd.h> |
53 | #include <sys/types.h> | 54 | #include <sys/types.h> |
54 | //#include <sys/wait.h> | 55 | //#include <sys/wait.h> |
55 | #include <stdio.h> | 56 | #include <stdio.h> |
56 | #include <stdlib.h> | 57 | #include <stdlib.h> |
57 | #include <assert.h> | 58 | #include <assert.h> |
@@ -1071,17 +1072,17 @@ void Konsole::editCommandListMenuSelected(int iD) | |||
1071 | commonCombo->setFocusPolicy(QWidget::NoFocus); | 1072 | commonCombo->setFocusPolicy(QWidget::NoFocus); |
1072 | te->setFocus(); | 1073 | te->setFocus(); |
1073 | } | 1074 | } |
1074 | } | 1075 | } |
1075 | if(iD == -24) { | 1076 | if(iD == -24) { |
1076 | // "edit commands" | 1077 | // "edit commands" |
1077 | CommandEditDialog *m = new CommandEditDialog(this); | 1078 | CommandEditDialog *m = new CommandEditDialog(this); |
1078 | connect(m,SIGNAL(commandsEdited()),this,SLOT(initCommandList())); | 1079 | connect(m,SIGNAL(commandsEdited()),this,SLOT(initCommandList())); |
1079 | m->showMaximized(); | 1080 | QPEApplication::showDialog( m ); |
1080 | } | 1081 | } |
1081 | 1082 | ||
1082 | } | 1083 | } |
1083 | 1084 | ||
1084 | // $QPEDIR/bin/qcop QPE/Application/embeddedkonsole 'setDocument(QString)' 'ssh -V' | 1085 | // $QPEDIR/bin/qcop QPE/Application/embeddedkonsole 'setDocument(QString)' 'ssh -V' |
1085 | void Konsole::setDocument( const QString &cmd) { | 1086 | void Konsole::setDocument( const QString &cmd) { |
1086 | newSession(); | 1087 | newSession(); |
1087 | TEWidget* te = getTe(); | 1088 | TEWidget* te = getTe(); |
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index be18140..1299fe3 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -937,18 +937,17 @@ bool TextEdit::saveAs() { | |||
937 | return false; | 937 | return false; |
938 | } | 938 | } |
939 | 939 | ||
940 | if( filePerms ) { | 940 | if( filePerms ) { |
941 | filePermissions *filePerm; | 941 | filePermissions *filePerm; |
942 | filePerm = new filePermissions(this, | 942 | filePerm = new filePermissions(this, |
943 | tr("Permissions"),true, | 943 | tr("Permissions"),true, |
944 | 0,(const QString &)fileNm); | 944 | 0,(const QString &)fileNm); |
945 | filePerm->showMaximized(); | 945 | QPEApplication::execDialog( filePerm ); |
946 | filePerm->exec(); | ||
947 | 946 | ||
948 | if( filePerm) | 947 | if( filePerm) |
949 | delete filePerm; | 948 | delete filePerm; |
950 | } | 949 | } |
951 | // } | 950 | // } |
952 | editor->setEdited( false); | 951 | editor->setEdited( false); |
953 | edited1 = false; | 952 | edited1 = false; |
954 | edited = false; | 953 | edited = false; |
@@ -1011,18 +1010,17 @@ void TextEdit::setDocument(const QString& fileref) { | |||
1011 | void TextEdit::changeFont() { | 1010 | void TextEdit::changeFont() { |
1012 | QDialog *d = new QDialog ( this, "FontDialog", true ); | 1011 | QDialog *d = new QDialog ( this, "FontDialog", true ); |
1013 | d-> setCaption ( tr( "Choose font" )); | 1012 | d-> setCaption ( tr( "Choose font" )); |
1014 | QBoxLayout *lay = new QVBoxLayout ( d ); | 1013 | QBoxLayout *lay = new QVBoxLayout ( d ); |
1015 | OFontSelector *ofs = new OFontSelector ( true, d ); | 1014 | OFontSelector *ofs = new OFontSelector ( true, d ); |
1016 | lay-> addWidget ( ofs ); | 1015 | lay-> addWidget ( ofs ); |
1017 | ofs-> setSelectedFont ( editor-> font ( )); | 1016 | ofs-> setSelectedFont ( editor-> font ( )); |
1018 | 1017 | ||
1019 | d-> showMaximized ( ); | 1018 | if ( QPEApplication::execDialog( d ) == QDialog::Accepted ) |
1020 | if ( d-> exec ( ) == QDialog::Accepted ) | ||
1021 | editor-> setFont ( ofs-> selectedFont ( )); | 1019 | editor-> setFont ( ofs-> selectedFont ( )); |
1022 | delete d; | 1020 | delete d; |
1023 | 1021 | ||
1024 | } | 1022 | } |
1025 | 1023 | ||
1026 | void TextEdit::editDelete() { | 1024 | void TextEdit::editDelete() { |
1027 | switch ( QMessageBox::warning(this,tr("Text Editor"), | 1025 | switch ( QMessageBox::warning(this,tr("Text Editor"), |
1028 | tr("Do you really want<BR>to <B>delete</B> " | 1026 | tr("Do you really want<BR>to <B>delete</B> " |
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 5fb605b..82fd1e1 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -944,18 +944,17 @@ void PlayListWidget::listDelete() { | |||
944 | break; | 944 | break; |
945 | case 1: | 945 | case 1: |
946 | { | 946 | { |
947 | file = audioView->currentItem()->text(0); | 947 | file = audioView->currentItem()->text(0); |
948 | QListIterator<DocLnk> Pdit( files.children() ); | 948 | QListIterator<DocLnk> Pdit( files.children() ); |
949 | for ( ; Pdit.current(); ++Pdit ) { | 949 | for ( ; Pdit.current(); ++Pdit ) { |
950 | if( Pdit.current()->name() == file) { | 950 | if( Pdit.current()->name() == file) { |
951 | LnkProperties prop( Pdit.current() ); | 951 | LnkProperties prop( Pdit.current() ); |
952 | prop.showMaximized(); | 952 | QPEApplication::execDialog( &prop ); |
953 | prop.exec(); | ||
954 | } | 953 | } |
955 | } | 954 | } |
956 | populateAudioView(); | 955 | populateAudioView(); |
957 | } | 956 | } |
958 | break; | 957 | break; |
959 | case 2: | 958 | case 2: |
960 | { | 959 | { |
961 | // file = videoView->selectedItem()->text(0); | 960 | // file = videoView->selectedItem()->text(0); |
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 | |||
@@ -525,18 +525,17 @@ void AbEditor::saveEntry() | |||
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(); |
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 | |||
@@ -277,18 +277,17 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
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() ); |
@@ -745,22 +744,19 @@ void AddressbookWindow::editEntry( EntryMode entryMode ) | |||
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(); |
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 | |||
@@ -1078,33 +1078,31 @@ void ContactEditor::accept() { | |||
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 | } |
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 44f1515..706cc08 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -260,22 +260,17 @@ void DateBook::slotSettings() | |||
260 | } | 260 | } |
261 | } | 261 | } |
262 | if(!found) { | 262 | if(!found) { |
263 | frmSettings.comboLocation->insertItem(defaultLocation); | 263 | frmSettings.comboLocation->insertItem(defaultLocation); |
264 | frmSettings.comboLocation->setCurrentItem(frmSettings.comboLocation->count()-1); | 264 | frmSettings.comboLocation->setCurrentItem(frmSettings.comboLocation->count()-1); |
265 | } | 265 | } |
266 | frmSettings.comboCategory->setCategories(defaultCategories,"Calendar", tr("Calendar")); | 266 | frmSettings.comboCategory->setCategories(defaultCategories,"Calendar", tr("Calendar")); |
267 | 267 | ||
268 | #if defined (Q_WS_QWS) || defined(_WS_QWS_) | 268 | if ( QPEApplication::execDialog( &frmSettings ) ) { |
269 | frmSettings.showMaximized(); | ||
270 | #endif | ||
271 | |||
272 | if ( frmSettings.exec() ) { | ||
273 | |||
274 | aPreset = frmSettings.alarmPreset(); | 269 | aPreset = frmSettings.alarmPreset(); |
275 | presetTime = frmSettings.presetTime(); | 270 | presetTime = frmSettings.presetTime(); |
276 | startTime = frmSettings.startTime(); | 271 | startTime = frmSettings.startTime(); |
277 | bJumpToCurTime = frmSettings.jumpToCurTime(); | 272 | bJumpToCurTime = frmSettings.jumpToCurTime(); |
278 | rowStyle = frmSettings.rowStyle(); | 273 | rowStyle = frmSettings.rowStyle(); |
279 | defaultView=frmSettings.comboDefaultView->currentItem()+1; | 274 | defaultView=frmSettings.comboDefaultView->currentItem()+1; |
280 | weeklistviewconfig=frmSettings.comboWeekListView->currentItem(); | 275 | weeklistviewconfig=frmSettings.comboWeekListView->currentItem(); |
281 | defaultLocation=frmSettings.comboLocation->currentText(); | 276 | defaultLocation=frmSettings.comboLocation->currentText(); |
@@ -432,20 +427,17 @@ void DateBook::duplicateEvent( const Event &e ) | |||
432 | sv->setResizePolicy( QScrollView::AutoOneFit ); | 427 | sv->setResizePolicy( QScrollView::AutoOneFit ); |
433 | // KLUDGE!!! | 428 | // KLUDGE!!! |
434 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); | 429 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); |
435 | vb->addWidget( sv ); | 430 | vb->addWidget( sv ); |
436 | entry = new DateEntry( onMonday, dupevent, ampm, &editDlg, "editor" ); | 431 | entry = new DateEntry( onMonday, dupevent, ampm, &editDlg, "editor" ); |
437 | entry->timezone->setEnabled( FALSE ); | 432 | entry->timezone->setEnabled( FALSE ); |
438 | sv->addChild( entry ); | 433 | sv->addChild( entry ); |
439 | 434 | ||
440 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 435 | while ( QPEApplication::execDialog( &editDlg ) ) { |
441 | editDlg.showMaximized(); | ||
442 | #endif | ||
443 | while (editDlg.exec() ) { | ||
444 | Event newEv = entry->event(); | 436 | Event newEv = entry->event(); |
445 | QString error = checkEvent(newEv); | 437 | QString error = checkEvent(newEv); |
446 | if (!error.isNull()) { | 438 | if (!error.isNull()) { |
447 | if (QMessageBox::warning(this, tr("error box"), error, tr("Fix it"), tr("Continue"), 0, 0, 1) == 0) | 439 | if (QMessageBox::warning(this, tr("error box"), error, tr("Fix it"), tr("Continue"), 0, 0, 1) == 0) |
448 | continue; | 440 | continue; |
449 | } | 441 | } |
450 | /* | 442 | /* |
451 | * The problem: | 443 | * The problem: |
@@ -481,20 +473,17 @@ void DateBook::editEvent( const Event &e ) | |||
481 | sv->setResizePolicy( QScrollView::AutoOneFit ); | 473 | sv->setResizePolicy( QScrollView::AutoOneFit ); |
482 | // KLUDGE!!! | 474 | // KLUDGE!!! |
483 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); | 475 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); |
484 | vb->addWidget( sv ); | 476 | vb->addWidget( sv ); |
485 | entry = new DateEntry( onMonday, e, ampm, &editDlg, "editor" ); | 477 | entry = new DateEntry( onMonday, e, ampm, &editDlg, "editor" ); |
486 | entry->timezone->setEnabled( FALSE ); | 478 | entry->timezone->setEnabled( FALSE ); |
487 | sv->addChild( entry ); | 479 | sv->addChild( entry ); |
488 | 480 | ||
489 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 481 | while ( QPEApplication::execDialog( &editDlg ) ) { |
490 | editDlg.showMaximized(); | ||
491 | #endif | ||
492 | while (editDlg.exec() ) { | ||
493 | Event newEv = entry->event(); | 482 | Event newEv = entry->event(); |
494 | if(newEv.description().isEmpty() && newEv.notes().isEmpty() ) | 483 | if(newEv.description().isEmpty() && newEv.notes().isEmpty() ) |
495 | break; | 484 | break; |
496 | newEv.setUid(e.uid()); // FIXME: Hack not to clear uid | 485 | newEv.setUid(e.uid()); // FIXME: Hack not to clear uid |
497 | QString error = checkEvent(newEv); | 486 | QString error = checkEvent(newEv); |
498 | if (!error.isNull()) { | 487 | if (!error.isNull()) { |
499 | if (QMessageBox::warning(this, tr("error box"), error, tr("Fix it"), tr("Continue"), 0, 0, 1) == 0) continue; | 488 | if (QMessageBox::warning(this, tr("error box"), error, tr("Fix it"), tr("Continue"), 0, 0, 1) == 0) continue; |
500 | } | 489 | } |
@@ -702,20 +691,17 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data) | |||
702 | view->setResizePolicy( QScrollView::AutoOneFit ); | 691 | view->setResizePolicy( QScrollView::AutoOneFit ); |
703 | vb->addWidget( view ); | 692 | vb->addWidget( view ); |
704 | QLabel *lblMsg = new QLabel( msg, &dlg ); | 693 | QLabel *lblMsg = new QLabel( msg, &dlg ); |
705 | view->addChild( lblMsg ); | 694 | view->addChild( lblMsg ); |
706 | QPushButton *cmdOk = new QPushButton( tr("OK"), &dlg ); | 695 | QPushButton *cmdOk = new QPushButton( tr("OK"), &dlg ); |
707 | connect( cmdOk, SIGNAL(clicked()), &dlg, SLOT(accept()) ); | 696 | connect( cmdOk, SIGNAL(clicked()), &dlg, SLOT(accept()) ); |
708 | vb->addWidget( cmdOk ); | 697 | vb->addWidget( cmdOk ); |
709 | 698 | ||
710 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 699 | needShow = QPEApplication::execDialog( &dlg ); |
711 | dlg.showMaximized(); | ||
712 | #endif | ||
713 | needShow = dlg.exec(); | ||
714 | 700 | ||
715 | if ( bSound ) | 701 | if ( bSound ) |
716 | killTimer( stopTimer ); | 702 | killTimer( stopTimer ); |
717 | } | 703 | } |
718 | } | 704 | } |
719 | } else if ( msg == "nextView()" ) { | 705 | } else if ( msg == "nextView()" ) { |
720 | needShow = true; | 706 | needShow = true; |
721 | if ( !qApp-> activeWindow ( )) { | 707 | if ( !qApp-> activeWindow ( )) { |
@@ -897,20 +883,17 @@ void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const | |||
897 | } | 883 | } |
898 | ev.setCategories(defaultCategories); | 884 | ev.setCategories(defaultCategories); |
899 | ev.setStart( start ); | 885 | ev.setStart( start ); |
900 | ev.setEnd( end ); | 886 | ev.setEnd( end ); |
901 | 887 | ||
902 | e = new DateEntry( onMonday, ev, ampm, &newDlg ); | 888 | e = new DateEntry( onMonday, ev, ampm, &newDlg ); |
903 | e->setAlarmEnabled( aPreset, presetTime, Event::Loud ); | 889 | e->setAlarmEnabled( aPreset, presetTime, Event::Loud ); |
904 | sv->addChild( e ); | 890 | sv->addChild( e ); |
905 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 891 | while ( QPEApplication::execDialog( &newDlg ) ) { |
906 | newDlg.showMaximized(); | ||
907 | #endif | ||
908 | while (newDlg.exec()) { | ||
909 | ev = e->event(); | 892 | ev = e->event(); |
910 | ev.assignUid(); | 893 | ev.assignUid(); |
911 | QString error = checkEvent( ev ); | 894 | QString error = checkEvent( ev ); |
912 | if ( !error.isNull() ) { | 895 | if ( !error.isNull() ) { |
913 | if ( QMessageBox::warning( this, tr("Error!"), error, tr("Fix it"), tr("Continue"), 0, 0, 1 ) == 0 ) | 896 | if ( QMessageBox::warning( this, tr("Error!"), error, tr("Fix it"), tr("Continue"), 0, 0, 1 ) == 0 ) |
914 | continue; | 897 | continue; |
915 | } | 898 | } |
916 | db->addEvent( ev ); | 899 | db->addEvent( ev ); |
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index d9e5225..856837c 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -244,20 +244,17 @@ DateEntry::~DateEntry() | |||
244 | 244 | ||
245 | void DateEntry::slotEditNote() { | 245 | void DateEntry::slotEditNote() { |
246 | QString s; | 246 | QString s; |
247 | s = "<B>"+ TimeString::longDateString( startDate ) + "</B>"; | 247 | s = "<B>"+ TimeString::longDateString( startDate ) + "</B>"; |
248 | // s.sprintf("<B>%d/%d</B> ", startDate.day(), startDate.month()); | 248 | // s.sprintf("<B>%d/%d</B> ", startDate.day(), startDate.month()); |
249 | NoteEntry noteDlg(s+comboDescription->currentText(), noteStr, | 249 | NoteEntry noteDlg(s+comboDescription->currentText(), noteStr, |
250 | this,0,TRUE); | 250 | this,0,TRUE); |
251 | 251 | ||
252 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 252 | if ( QPEApplication::execDialog( ¬eDlg ) ) { |
253 | noteDlg.showMaximized(); | ||
254 | #endif | ||
255 | if (noteDlg.exec() ) { | ||
256 | noteStr=noteDlg.note->text(); | 253 | noteStr=noteDlg.note->text(); |
257 | } | 254 | } |
258 | 255 | ||
259 | } | 256 | } |
260 | 257 | ||
261 | void DateEntry::endDateChanged( int y, int m, int d ) | 258 | void DateEntry::endDateChanged( int y, int m, int d ) |
262 | { | 259 | { |
263 | endDate.setYMD( y, m, d ); | 260 | endDate.setYMD( y, m, d ); |
@@ -390,20 +387,17 @@ void DateEntry::slotRepeat() | |||
390 | 387 | ||
391 | // it is better in my opinion to just grab this from the mother, | 388 | // it is better in my opinion to just grab this from the mother, |
392 | // since, this dialog doesn't need to keep track of it... | 389 | // since, this dialog doesn't need to keep track of it... |
393 | if ( rp.type != Event::NoRepeat ) | 390 | if ( rp.type != Event::NoRepeat ) |
394 | e = new RepeatEntry( startWeekOnMonday, rp, startDate, this); | 391 | e = new RepeatEntry( startWeekOnMonday, rp, startDate, this); |
395 | else | 392 | else |
396 | e = new RepeatEntry( startWeekOnMonday, startDate, this ); | 393 | e = new RepeatEntry( startWeekOnMonday, startDate, this ); |
397 | 394 | ||
398 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 395 | if ( QPEApplication::execDialog( e ) ) { |
399 | e->showMaximized(); | ||
400 | #endif | ||
401 | if ( e->exec() ) { | ||
402 | rp = e->repeatPattern(); | 396 | rp = e->repeatPattern(); |
403 | setRepeatLabel(); | 397 | setRepeatLabel(); |
404 | } | 398 | } |
405 | // deleting sounds like a nice idea... | 399 | // deleting sounds like a nice idea... |
406 | delete e; | 400 | delete e; |
407 | } | 401 | } |
408 | 402 | ||
409 | void DateEntry::slotChangeStartOfWeek( bool onMonday ) | 403 | void DateEntry::slotChangeStartOfWeek( bool onMonday ) |
diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp index be30415..7ff2204 100644 --- a/core/pim/datebook2/mainwindow.cpp +++ b/core/pim/datebook2/mainwindow.cpp | |||
@@ -224,34 +224,31 @@ Show* MainWindow::eventShow() { | |||
224 | return m_show; | 224 | return m_show; |
225 | } | 225 | } |
226 | void MainWindow::slotAction( QAction* act ) { | 226 | void MainWindow::slotAction( QAction* act ) { |
227 | 227 | ||
228 | } | 228 | } |
229 | void MainWindow::slotConfigureLocs() { | 229 | void MainWindow::slotConfigureLocs() { |
230 | LocationManagerDialog dlg( locationManager() ); | 230 | LocationManagerDialog dlg( locationManager() ); |
231 | dlg.setCaption( tr("Configure Locations") ); | 231 | dlg.setCaption( tr("Configure Locations") ); |
232 | dlg.showMaximized(); | 232 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) { |
233 | if (dlg.exec() == QDialog::Accepted ) { | ||
234 | setLocationManager( dlg.manager() ); | 233 | setLocationManager( dlg.manager() ); |
235 | } | 234 | } |
236 | } | 235 | } |
237 | void MainWindow::slotConfigureDesc() { | 236 | void MainWindow::slotConfigureDesc() { |
238 | DescriptionManagerDialog dlg( descriptionManager() ); | 237 | DescriptionManagerDialog dlg( descriptionManager() ); |
239 | dlg.setCaption( tr("Configure Descriptions") ); | 238 | dlg.setCaption( tr("Configure Descriptions") ); |
240 | dlg.showMaximized(); | 239 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) { |
241 | if (dlg.exec() == QDialog::Accepted ) { | ||
242 | setDescriptionManager( dlg.manager() ); | 240 | setDescriptionManager( dlg.manager() ); |
243 | } | 241 | } |
244 | } | 242 | } |
245 | void MainWindow::slotConfigureTemp() { | 243 | void MainWindow::slotConfigureTemp() { |
246 | TemplateDialog dlg( templateManager(), editor() ); | 244 | TemplateDialog dlg( templateManager(), editor() ); |
247 | dlg.setCaption( tr("Configure Templates") ); | 245 | dlg.setCaption( tr("Configure Templates") ); |
248 | dlg.showMaximized(); | 246 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) { |
249 | if ( dlg.exec() == QDialog::Accepted ) { | ||
250 | m_tempMan = dlg.manager(); | 247 | m_tempMan = dlg.manager(); |
251 | setTemplateMenu(); | 248 | setTemplateMenu(); |
252 | } | 249 | } |
253 | } | 250 | } |
254 | void MainWindow::hideShow() { | 251 | void MainWindow::hideShow() { |
255 | 252 | ||
256 | } | 253 | } |
257 | void MainWindow::viewPopup(int ) { | 254 | void MainWindow::viewPopup(int ) { |
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index d06a405..fc189bd 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp | |||
@@ -1023,18 +1023,17 @@ void MainWindow::doAlarm( const QDateTime& dt, int uid ) { | |||
1023 | QPushButton* btnOk = new QPushButton( tr("Ok"), &dlg ); | 1023 | QPushButton* btnOk = new QPushButton( tr("Ok"), &dlg ); |
1024 | connect( btnOk, SIGNAL(clicked() ), &dlg, SLOT(accept() ) ); | 1024 | connect( btnOk, SIGNAL(clicked() ), &dlg, SLOT(accept() ) ); |
1025 | lay->addWidget( btnOk ); | 1025 | lay->addWidget( btnOk ); |
1026 | 1026 | ||
1027 | QString text = tr("<h1>Alarm at %1</h1><br>").arg( TimeString::dateString( dt ) ); | 1027 | QString text = tr("<h1>Alarm at %1</h1><br>").arg( TimeString::dateString( dt ) ); |
1028 | text += todo.toRichText(); | 1028 | text += todo.toRichText(); |
1029 | view->setText( text ); | 1029 | view->setText( text ); |
1030 | 1030 | ||
1031 | dlg.showMaximized(); | 1031 | bool needToStay = QPEApplication::execDialog( &dlg ); |
1032 | bool needToStay = dlg.exec(); | ||
1033 | 1032 | ||
1034 | if (loud) | 1033 | if (loud) |
1035 | killAlarm(); | 1034 | killAlarm(); |
1036 | 1035 | ||
1037 | if (needToStay) { | 1036 | if (needToStay) { |
1038 | // showMaximized(); | 1037 | // showMaximized(); |
1039 | // raise(); | 1038 | // raise(); |
1040 | QPEApplication::setKeepRunning(); | 1039 | QPEApplication::setKeepRunning(); |
diff --git a/core/pim/todo/todoeditor.cpp b/core/pim/todo/todoeditor.cpp index c204325..78aedd6 100644 --- a/core/pim/todo/todoeditor.cpp +++ b/core/pim/todo/todoeditor.cpp | |||
@@ -1,9 +1,11 @@ | |||
1 | 1 | ||
2 | #include <qpe/qpeapplication.h> | ||
3 | |||
2 | #include "otaskeditor.h" | 4 | #include "otaskeditor.h" |
3 | #include "todoeditor.h" | 5 | #include "todoeditor.h" |
4 | 6 | ||
5 | using namespace Todo; | 7 | using namespace Todo; |
6 | 8 | ||
7 | Editor::Editor() { | 9 | Editor::Editor() { |
8 | m_accepted = false; | 10 | m_accepted = false; |
9 | m_self = 0l; | 11 | m_self = 0l; |
@@ -14,20 +16,18 @@ Editor::~Editor() { | |||
14 | } | 16 | } |
15 | OTodo Editor::newTodo( int cur, | 17 | OTodo Editor::newTodo( int cur, |
16 | QWidget*) { | 18 | QWidget*) { |
17 | 19 | ||
18 | OTaskEditor *e = self(); | 20 | OTaskEditor *e = self(); |
19 | e->setCaption( QObject::tr("Enter Task") ); | 21 | e->setCaption( QObject::tr("Enter Task") ); |
20 | e->init( cur ); | 22 | e->init( cur ); |
21 | 23 | ||
24 | int ret = QPEApplication::execDialog( e ); | ||
22 | 25 | ||
23 | e->showMaximized(); | ||
24 | |||
25 | int ret = e->exec(); | ||
26 | if ( QDialog::Accepted == ret ) { | 26 | if ( QDialog::Accepted == ret ) { |
27 | m_accepted = true; | 27 | m_accepted = true; |
28 | }else | 28 | }else |
29 | m_accepted = false; | 29 | m_accepted = false; |
30 | 30 | ||
31 | OTodo ev = e->todo(); | 31 | OTodo ev = e->todo(); |
32 | qWarning("Todo uid"); | 32 | qWarning("Todo uid"); |
33 | qWarning("Todo %s %d %d", ev.summary().latin1(), ev.progress(), ev.isCompleted() ); | 33 | qWarning("Todo %s %d %d", ev.summary().latin1(), ev.progress(), ev.isCompleted() ); |
@@ -36,18 +36,17 @@ OTodo Editor::newTodo( int cur, | |||
36 | return ev; | 36 | return ev; |
37 | } | 37 | } |
38 | OTodo Editor::edit( QWidget *, | 38 | OTodo Editor::edit( QWidget *, |
39 | const OTodo& todo ) { | 39 | const OTodo& todo ) { |
40 | OTaskEditor *e = self(); | 40 | OTaskEditor *e = self(); |
41 | e->init( todo ); | 41 | e->init( todo ); |
42 | e->setCaption( QObject::tr( "Edit Task" ) ); | 42 | e->setCaption( QObject::tr( "Edit Task" ) ); |
43 | 43 | ||
44 | e->showMaximized(); | 44 | int ret = QPEApplication::execDialog( e ); |
45 | int ret = e->exec(); | ||
46 | 45 | ||
47 | OTodo ev = e->todo(); | 46 | OTodo ev = e->todo(); |
48 | if ( ret == QDialog::Accepted ) | 47 | if ( ret == QDialog::Accepted ) |
49 | m_accepted = true; | 48 | m_accepted = true; |
50 | else | 49 | else |
51 | m_accepted = false; | 50 | m_accepted = false; |
52 | 51 | ||
53 | return ev; | 52 | return ev; |
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index d6d09a1..b21215b 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp | |||
@@ -28,16 +28,17 @@ | |||
28 | 28 | ||
29 | #include "light.h" | 29 | #include "light.h" |
30 | 30 | ||
31 | #include <qpe/config.h> | 31 | #include <qpe/config.h> |
32 | #include <qpe/power.h> | 32 | #include <qpe/power.h> |
33 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 33 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
34 | #include <qpe/qcopenvelope_qws.h> | 34 | #include <qpe/qcopenvelope_qws.h> |
35 | #endif | 35 | #endif |
36 | #include <qpe/qpeapplication.h> | ||
36 | 37 | ||
37 | #include <qlabel.h> | 38 | #include <qlabel.h> |
38 | #include <qcheckbox.h> | 39 | #include <qcheckbox.h> |
39 | #include <qtabwidget.h> | 40 | #include <qtabwidget.h> |
40 | #include <qslider.h> | 41 | #include <qslider.h> |
41 | #include <qspinbox.h> | 42 | #include <qspinbox.h> |
42 | #include <qpushbutton.h> | 43 | #include <qpushbutton.h> |
43 | #include <qgroupbox.h> | 44 | #include <qgroupbox.h> |
@@ -196,18 +197,17 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
196 | LightSettings::~LightSettings ( ) | 197 | LightSettings::~LightSettings ( ) |
197 | { | 198 | { |
198 | } | 199 | } |
199 | 200 | ||
200 | void LightSettings::calibrateSensor ( ) | 201 | void LightSettings::calibrateSensor ( ) |
201 | { | 202 | { |
202 | Sensor *s = new Sensor ( m_sensordata, this ); | 203 | Sensor *s = new Sensor ( m_sensordata, this ); |
203 | connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int ))); | 204 | connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int ))); |
204 | s-> showMaximized ( ); | 205 | QPEApplication::execDialog( s ); |
205 | s-> exec ( ); | ||
206 | delete s; | 206 | delete s; |
207 | } | 207 | } |
208 | 208 | ||
209 | void LightSettings::calibrateSensorAC ( ) | 209 | void LightSettings::calibrateSensorAC ( ) |
210 | { | 210 | { |
211 | Sensor *s = new Sensor ( m_sensordata_ac, this ); | 211 | Sensor *s = new Sensor ( m_sensordata_ac, this ); |
212 | connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int ))); | 212 | connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int ))); |
213 | s-> showMaximized ( ); | 213 | s-> showMaximized ( ); |