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/apps | |
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 |
2 files changed, 5 insertions, 6 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 | |||
@@ -41,15 +41,16 @@ | |||
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> |
@@ -1073,13 +1074,13 @@ void Konsole::editCommandListMenuSelected(int iD) | |||
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) { |
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 | |||
@@ -939,14 +939,13 @@ bool TextEdit::saveAs() { | |||
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); |
@@ -1013,14 +1012,13 @@ void TextEdit::changeFont() { | |||
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() { |