Diffstat (limited to 'core/apps/embeddedkonsole/konsole.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 5 |
1 files changed, 3 insertions, 2 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 | |||
@@ -23,51 +23,52 @@ | |||
23 | 23 | ||
24 | #include "signal.h" | 24 | #include "signal.h" |
25 | 25 | ||
26 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
27 | 27 | ||
28 | #include <qdir.h> | 28 | #include <qdir.h> |
29 | #include <qevent.h> | 29 | #include <qevent.h> |
30 | #include <qdragobject.h> | 30 | #include <qdragobject.h> |
31 | #include <qobjectlist.h> | 31 | #include <qobjectlist.h> |
32 | #include <qtoolbutton.h> | 32 | #include <qtoolbutton.h> |
33 | #include <qtoolbar.h> | 33 | #include <qtoolbar.h> |
34 | #include <qpushbutton.h> | 34 | #include <qpushbutton.h> |
35 | #include <qfontdialog.h> | 35 | #include <qfontdialog.h> |
36 | #include <qglobal.h> | 36 | #include <qglobal.h> |
37 | #include <qpainter.h> | 37 | #include <qpainter.h> |
38 | #include <qmenubar.h> | 38 | #include <qmenubar.h> |
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> |
58 | 59 | ||
59 | #include "konsole.h" | 60 | #include "konsole.h" |
60 | #include "keytrans.h" | 61 | #include "keytrans.h" |
61 | #include "commandeditdialog.h" | 62 | #include "commandeditdialog.h" |
62 | 63 | ||
63 | #ifdef QT_QWS_OPIE | 64 | #ifdef QT_QWS_OPIE |
64 | #include <opie/colorpopupmenu.h> | 65 | #include <opie/colorpopupmenu.h> |
65 | #endif | 66 | #endif |
66 | 67 | ||
67 | #include <qfontdatabase.h>// U.B. | 68 | #include <qfontdatabase.h>// U.B. |
68 | #include <qstringlist.h>// U.B. | 69 | #include <qstringlist.h>// U.B. |
69 | #include <qvaluelist.h> // U.B. | 70 | #include <qvaluelist.h> // U.B. |
70 | 71 | ||
71 | class EKNumTabBar : public QTabBar { | 72 | class EKNumTabBar : public QTabBar { |
72 | public: | 73 | public: |
73 | void numberTabs() | 74 | void numberTabs() |
@@ -1055,49 +1056,49 @@ void Konsole::editCommandListMenuSelected(int iD) | |||
1055 | commonCombo->setEditable( FALSE ); | 1056 | commonCombo->setEditable( FALSE ); |
1056 | } | 1057 | } |
1057 | } | 1058 | } |
1058 | } | 1059 | } |
1059 | if( iD == -23) { | 1060 | if( iD == -23) { |
1060 | cfg.setGroup("Commands"); | 1061 | cfg.setGroup("Commands"); |
1061 | // qDebug("enableCommandEdit"); | 1062 | // qDebug("enableCommandEdit"); |
1062 | if( !configMenu->isItemChecked(iD) ) { | 1063 | if( !configMenu->isItemChecked(iD) ) { |
1063 | commonCombo->setEditable( TRUE ); | 1064 | commonCombo->setEditable( TRUE ); |
1064 | configMenu->setItemChecked(iD,TRUE); | 1065 | configMenu->setItemChecked(iD,TRUE); |
1065 | commonCombo->setCurrentItem(0); | 1066 | commonCombo->setCurrentItem(0); |
1066 | cfg.writeEntry("EditEnabled","TRUE"); | 1067 | cfg.writeEntry("EditEnabled","TRUE"); |
1067 | } else { | 1068 | } else { |
1068 | commonCombo->setEditable( FALSE ); | 1069 | commonCombo->setEditable( FALSE ); |
1069 | configMenu->setItemChecked(iD,FALSE); | 1070 | configMenu->setItemChecked(iD,FALSE); |
1070 | cfg.writeEntry("EditEnabled","FALSE"); | 1071 | cfg.writeEntry("EditEnabled","FALSE"); |
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(); |
1088 | if(cmd.find("-e", 0, TRUE) != -1) { | 1089 | if(cmd.find("-e", 0, TRUE) != -1) { |
1089 | QString cmd2; | 1090 | QString cmd2; |
1090 | cmd2=cmd.right(cmd.length()-3)+" &"; | 1091 | cmd2=cmd.right(cmd.length()-3)+" &"; |
1091 | system(cmd2.latin1()); | 1092 | system(cmd2.latin1()); |
1092 | if(startUp <= 1 && nsessions < 2) { | 1093 | if(startUp <= 1 && nsessions < 2) { |
1093 | doneSession(getTe()->currentSession, 0); | 1094 | doneSession(getTe()->currentSession, 0); |
1094 | exit(0); | 1095 | exit(0); |
1095 | } else | 1096 | } else |
1096 | doneSession(getTe()->currentSession, 0); | 1097 | doneSession(getTe()->currentSession, 0); |
1097 | } else { | 1098 | } else { |
1098 | if (te != 0) { | 1099 | if (te != 0) { |
1099 | te->emitText(cmd+"\r"); | 1100 | te->emitText(cmd+"\r"); |
1100 | } | 1101 | } |
1101 | } | 1102 | } |
1102 | startUp++; | 1103 | startUp++; |
1103 | } | 1104 | } |