-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index cbea7bd..ff5c2f1 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -16,53 +16,53 @@ | |||
16 | /* */ | 16 | /* */ |
17 | /* Ported Konsole to Qt/Embedded */ | 17 | /* Ported Konsole to Qt/Embedded */ |
18 | /* */ | 18 | /* */ |
19 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ | 19 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ |
20 | /* */ | 20 | /* */ |
21 | /* -------------------------------------------------------------------------- */ | 21 | /* -------------------------------------------------------------------------- */ |
22 | // enhancements added by L.J. Potter <ljp@llornkcor.com> | 22 | // enhancements added by L.J. Potter <ljp@llornkcor.com> |
23 | // enhancements added by Phillip Kuhn | 23 | // enhancements added by Phillip Kuhn |
24 | 24 | ||
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
26 | #include <sys/types.h> | 26 | #include <sys/types.h> |
27 | #include <pwd.h> | 27 | #include <pwd.h> |
28 | #include <unistd.h> | 28 | #include <unistd.h> |
29 | 29 | ||
30 | #ifdef QT_QWS_OPIE | 30 | #ifdef QT_QWS_OPIE |
31 | #include <opie2/ocolorpopupmenu.h> | 31 | #include <opie2/ocolorpopupmenu.h> |
32 | using namespace Opie; | ||
32 | #endif | 33 | #endif |
33 | 34 | ||
34 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
35 | 36 | ||
36 | #include <qmenubar.h> | 37 | #include <qmenubar.h> |
37 | #include <qtabbar.h> | 38 | #include <qtabbar.h> |
38 | #include <qpe/config.h> | 39 | #include <qpe/config.h> |
39 | #include <qfontdatabase.h> | 40 | #include <qfontdatabase.h> |
40 | #include <qfile.h> | 41 | #include <qfile.h> |
41 | #include <qspinbox.h> | 42 | #include <qspinbox.h> |
42 | #include <qlayout.h> | 43 | #include <qlayout.h> |
43 | 44 | ||
44 | #include <sys/wait.h> | 45 | #include <sys/wait.h> |
45 | #include <stdio.h> | 46 | #include <stdio.h> |
46 | #include <stdlib.h> | 47 | #include <stdlib.h> |
47 | #include <assert.h> | 48 | #include <assert.h> |
48 | 49 | ||
49 | #include "konsole.h" | 50 | #include "konsole.h" |
50 | #include "commandeditdialog.h" | 51 | #include "commandeditdialog.h" |
51 | 52 | ||
52 | using namespace Opie; | ||
53 | class EKNumTabBar : public QTabBar | 53 | class EKNumTabBar : public QTabBar |
54 | { | 54 | { |
55 | public: | 55 | public: |
56 | EKNumTabBar(QWidget *parent = 0, const char *name = 0) : | 56 | EKNumTabBar(QWidget *parent = 0, const char *name = 0) : |
57 | QTabBar(parent, name) | 57 | QTabBar(parent, name) |
58 | {} | 58 | {} |
59 | 59 | ||
60 | // QList<QTab> *getTabList() { return(tabList()); } | 60 | // QList<QTab> *getTabList() { return(tabList()); } |
61 | 61 | ||
62 | void numberTabs() | 62 | void numberTabs() |
63 | { | 63 | { |
64 | // Yes, it really is this messy. QTabWidget needs functions | 64 | // Yes, it really is this messy. QTabWidget needs functions |
65 | // that provide acces to tabs in a sequential way. | 65 | // that provide acces to tabs in a sequential way. |
66 | int m=INT_MIN; | 66 | int m=INT_MIN; |
67 | for (int i=0; i<count(); i++) | 67 | for (int i=0; i<count(); i++) |
68 | { | 68 | { |
@@ -500,34 +500,34 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
500 | nsessions = 0; | 500 | nsessions = 0; |
501 | 501 | ||
502 | tab = new EKNumTabWidget(this); | 502 | tab = new EKNumTabWidget(this); |
503 | // tab->setMargin(tab->margin()-5); | 503 | // tab->setMargin(tab->margin()-5); |
504 | connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*))); | 504 | connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*))); |
505 | 505 | ||
506 | // create terminal toolbar //////////////////////////////////////////////// | 506 | // create terminal toolbar //////////////////////////////////////////////// |
507 | setToolBarsMovable( FALSE ); | 507 | setToolBarsMovable( FALSE ); |
508 | menuToolBar = new QToolBar( this ); | 508 | menuToolBar = new QToolBar( this ); |
509 | menuToolBar->setHorizontalStretchable( TRUE ); | 509 | menuToolBar->setHorizontalStretchable( TRUE ); |
510 | 510 | ||
511 | QMenuBar *menuBar = new QMenuBar( menuToolBar ); | 511 | QMenuBar *menuBar = new QMenuBar( menuToolBar ); |
512 | 512 | ||
513 | setFont(cfont); | 513 | setFont(cfont); |
514 | 514 | ||
515 | configMenu = new QPopupMenu( this); | 515 | configMenu = new QPopupMenu( this); |
516 | colorMenu = new QPopupMenu( this); | 516 | colorMenu = new QPopupMenu( this); |
517 | scrollMenu = new QPopupMenu( this); | 517 | scrollMenu = new QPopupMenu( this); |
518 | editCommandListMenu = new QPopupMenu( this); | 518 | editCommandListMenu = new QPopupMenu( this); |
519 | 519 | ||
520 | configMenu->insertItem(tr("Command List"), editCommandListMenu); | 520 | configMenu->insertItem(tr("Command List"), editCommandListMenu); |
521 | 521 | ||
522 | bool listHidden; | 522 | bool listHidden; |
523 | cfg.setGroup("Menubar"); | 523 | cfg.setGroup("Menubar"); |
524 | if( cfg.readEntry("Hidden","FALSE") == "TRUE") | 524 | if( cfg.readEntry("Hidden","FALSE") == "TRUE") |
525 | { | 525 | { |
526 | ec_cmdlist = editCommandListMenu->insertItem( tr( "Show command list" )); | 526 | ec_cmdlist = editCommandListMenu->insertItem( tr( "Show command list" )); |
527 | listHidden=TRUE; | 527 | listHidden=TRUE; |
528 | } | 528 | } |
529 | else | 529 | else |
530 | { | 530 | { |
531 | ec_cmdlist = editCommandListMenu->insertItem( tr( "Hide command list" )); | 531 | ec_cmdlist = editCommandListMenu->insertItem( tr( "Hide command list" )); |
532 | listHidden=FALSE; | 532 | listHidden=FALSE; |
533 | } | 533 | } |