summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index f3f0c29..efcb1f2 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -31,48 +31,49 @@
31#include <qfontdialog.h> 31#include <qfontdialog.h>
32#include <qglobal.h> 32#include <qglobal.h>
33#include <qpainter.h> 33#include <qpainter.h>
34#include <qpe/qpemenubar.h> 34#include <qpe/qpemenubar.h>
35#include <qmessagebox.h> 35#include <qmessagebox.h>
36#include <qaction.h> 36#include <qaction.h>
37#include <qapplication.h> 37#include <qapplication.h>
38#include <qfontmetrics.h> 38#include <qfontmetrics.h>
39#include <qcombobox.h> 39#include <qcombobox.h>
40#include <qevent.h> 40#include <qevent.h>
41#include <qtabwidget.h> 41#include <qtabwidget.h>
42#include <qtabbar.h> 42#include <qtabbar.h>
43#include <qpe/config.h> 43#include <qpe/config.h>
44#include <qstringlist.h> 44#include <qstringlist.h>
45#include <qpalette.h> 45#include <qpalette.h>
46 46
47#include <sys/wait.h> 47#include <sys/wait.h>
48#include <stdio.h> 48#include <stdio.h>
49#include <stdlib.h> 49#include <stdlib.h>
50#include <assert.h> 50#include <assert.h>
51 51
52#include "konsole.h" 52#include "konsole.h"
53#include "keytrans.h" 53#include "keytrans.h"
54 54
55
55class EKNumTabBar : public QTabBar { 56class EKNumTabBar : public QTabBar {
56public: 57public:
57 void numberTabs() 58 void numberTabs()
58 { 59 {
59 // Yes, it really is this messy. QTabWidget needs functions 60 // Yes, it really is this messy. QTabWidget needs functions
60 // that provide acces to tabs in a sequential way. 61 // that provide acces to tabs in a sequential way.
61 int m=INT_MIN; 62 int m=INT_MIN;
62 for (int i=0; i<count(); i++) { 63 for (int i=0; i<count(); i++) {
63 QTab* left=0; 64 QTab* left=0;
64 QListIterator<QTab> it(*tabList()); 65 QListIterator<QTab> it(*tabList());
65 int x=INT_MAX; 66 int x=INT_MAX;
66 for( QTab* t; (t=it.current()); ++it ) { 67 for( QTab* t; (t=it.current()); ++it ) {
67 int tx = t->rect().x(); 68 int tx = t->rect().x();
68 if ( tx<x && tx>m ) { 69 if ( tx<x && tx>m ) {
69 x = tx; 70 x = tx;
70 left = t; 71 left = t;
71 } 72 }
72 } 73 }
73 if ( left ) { 74 if ( left ) {
74 left->setText(QString::number(i+1)); 75 left->setText(QString::number(i+1));
75 m = left->rect().x(); 76 m = left->rect().x();
76 } 77 }
77 } 78 }
78 } 79 }
@@ -99,48 +100,49 @@ public:
99 100
100// This could be configurable or dynamicly generated from the bash history 101// This could be configurable or dynamicly generated from the bash history
101// file of the user 102// file of the user
102static const char *commonCmds[] = 103static const char *commonCmds[] =
103{ 104{
104 "ls ", // I left this here, cause it looks better than the first alpha 105 "ls ", // I left this here, cause it looks better than the first alpha
105 "cardctl eject", 106 "cardctl eject",
106 "cat ", 107 "cat ",
107 "cd ", 108 "cd ",
108 "chmod ", 109 "chmod ",
109 "cp ", 110 "cp ",
110 "dc ", 111 "dc ",
111 "df ", 112 "df ",
112 "dmesg", 113 "dmesg",
113 "echo ", 114 "echo ",
114 "find ", 115 "find ",
115 "free", 116 "free",
116 "grep ", 117 "grep ",
117 "ifconfig ", 118 "ifconfig ",
118 "ipkg ", 119 "ipkg ",
119 "mkdir ", 120 "mkdir ",
120 "mv ", 121 "mv ",
121 "nc localhost 7776", 122 "nc localhost 7776",
122 "nc localhost 7777", 123 "nc localhost 7777",
124 "netstat ",
123 "nslookup ", 125 "nslookup ",
124 "ping ", 126 "ping ",
125 "ps aux", 127 "ps aux",
126 "pwd ", 128 "pwd ",
127 "rm ", 129 "rm ",
128 "rmdir ", 130 "rmdir ",
129 "route ", 131 "route ",
130 "set ", 132 "set ",
131 "traceroute", 133 "traceroute",
132 134
133/* 135/*
134 "gzip", 136 "gzip",
135 "gunzip", 137 "gunzip",
136 "chgrp", 138 "chgrp",
137 "chown", 139 "chown",
138 "date", 140 "date",
139 "dd", 141 "dd",
140 "df", 142 "df",
141 "dmesg", 143 "dmesg",
142 "fuser", 144 "fuser",
143 "hostname", 145 "hostname",
144 "kill", 146 "kill",
145 "killall", 147 "killall",
146 "ln", 148 "ln",
@@ -680,49 +682,49 @@ void Konsole::colorMenuSelected(int iD)
680 update(); 682 update();
681} 683}
682 684
683void Konsole::configMenuSelected(int iD) 685void Konsole::configMenuSelected(int iD)
684{ 686{
685// QString temp; 687// QString temp;
686// temp.sprintf("%d",iD); 688// temp.sprintf("%d",iD);
687// qDebug(temp); 689// qDebug(temp);
688 TEWidget* te = getTe(); 690 TEWidget* te = getTe();
689 Config cfg("Konsole"); 691 Config cfg("Konsole");
690 cfg.setGroup("Menubar"); 692 cfg.setGroup("Menubar");
691 if( iD == -2) { 693 if( iD == -2) {
692 if(!secondToolBar->isHidden()) { 694 if(!secondToolBar->isHidden()) {
693 secondToolBar->hide(); 695 secondToolBar->hide();
694 configMenu->changeItem( iD,"Show Command List"); 696 configMenu->changeItem( iD,"Show Command List");
695 cfg.writeEntry("Hidden","TRUE"); 697 cfg.writeEntry("Hidden","TRUE");
696 configMenu->setItemEnabled(-20 ,FALSE); 698 configMenu->setItemEnabled(-20 ,FALSE);
697 } else { 699 } else {
698 secondToolBar->show(); 700 secondToolBar->show();
699 configMenu->changeItem( iD,"Hide Command List"); 701 configMenu->changeItem( iD,"Hide Command List");
700 cfg.writeEntry("Hidden","FALSE"); 702 cfg.writeEntry("Hidden","FALSE");
701 configMenu->setItemEnabled(-20 ,TRUE); 703 configMenu->setItemEnabled(-20 ,TRUE);
702 704
703 if(cfg.readEntry("EditEnabled","FALSE")=="TRUE") { 705 if(cfg.readEntry("EditEnabled","FALSE")=="TRUE") {
704 configMenu->setItemChecked(-16,TRUE); 706 configMenu->setItemChecked(-20,TRUE);
705 commonCombo->setEditable( TRUE ); 707 commonCombo->setEditable( TRUE );
706 } else { 708 } else {
707 configMenu->setItemChecked(-20,FALSE); 709 configMenu->setItemChecked(-20,FALSE);
708 commonCombo->setEditable( FALSE ); 710 commonCombo->setEditable( FALSE );
709 } 711 }
710 } 712 }
711 } 713 }
712 if( iD == -3) { 714 if( iD == -3) {
713 cfg.setGroup("Tabs"); 715 cfg.setGroup("Tabs");
714 QString tmp=cfg.readEntry("Position","Top"); 716 QString tmp=cfg.readEntry("Position","Top");
715 717
716 if(tmp=="Top") { 718 if(tmp=="Top") {
717 tab->setTabPosition(QTabWidget::Bottom); 719 tab->setTabPosition(QTabWidget::Bottom);
718 configMenu->changeItem( iD,"Tabs on Top"); 720 configMenu->changeItem( iD,"Tabs on Top");
719 cfg.writeEntry("Position","Bottom"); 721 cfg.writeEntry("Position","Bottom");
720 } else { 722 } else {
721 tab->setTabPosition(QTabWidget::Top); 723 tab->setTabPosition(QTabWidget::Top);
722 configMenu->changeItem( iD,"Tabs on Bottom"); 724 configMenu->changeItem( iD,"Tabs on Bottom");
723 cfg.writeEntry("Position","Top"); 725 cfg.writeEntry("Position","Top");
724 } 726 }
725 } 727 }
726 if( iD == -20) { 728 if( iD == -20) {
727 cfg.setGroup("Commands"); 729 cfg.setGroup("Commands");
728// qDebug("enableCommandEdit"); 730// qDebug("enableCommandEdit");