From 07ec85f797cad04431df30855a81b88f06fe27d3 Mon Sep 17 00:00:00 2001 From: llornkcor Date: Fri, 01 Feb 2002 14:11:46 +0000 Subject: Added editable commandlist, tabs position, and user selectable colors. --- diff --git a/core/apps/embeddedkonsole/TECommon.h b/core/apps/embeddedkonsole/TECommon.h index 261d51b..5db41ad 100644 --- a/core/apps/embeddedkonsole/TECommon.h +++ b/core/apps/embeddedkonsole/TECommon.h @@ -9,11 +9,11 @@ /* This file is part of Konsole - an X terminal for KDE */ /* */ /* -------------------------------------------------------------------------- */ -/* */ +/* */ /* Ported Konsole to Qt/Embedded */ -/* */ +/* */ /* Copyright (C) 2000 by John Ryland */ -/* */ +/* */ /* -------------------------------------------------------------------------- */ /*! \file TECommon.h diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp index dc83998..f10bfb2 100644 --- a/core/apps/embeddedkonsole/TEWidget.cpp +++ b/core/apps/embeddedkonsole/TEWidget.cpp @@ -9,13 +9,12 @@ /* This file is part of Konsole - an X terminal for KDE */ /* */ /* ------------------------------------------------------------------------ */ -/* */ +/* */ /* Ported Konsole to Qt/Embedded */ -/* */ +/* */ /* Copyright (C) 2000 by John Ryland */ -/* */ +/* */ /* -------------------------------------------------------------------------- */ - /*! \class TEWidget \brief Visible screen contents @@ -115,7 +114,7 @@ static const ColorEntry base_color_table[TABLE_COLORS] = ColorEntry(QColor(0x00,0x00,0x00), 0, 1 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 1, 0 ), ColorEntry(QColor(0x68,0x68,0x68), 0, 0 ), ColorEntry( QColor(0xFF,0x54,0x54), 0, 0 ), ColorEntry(QColor(0x54,0xFF,0x54), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0x54), 0, 0 ), - ColorEntry(QColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry( QColor(0xFF,0x54,0xFF), 0, 0 ), + ColorEntry(QColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ), ColorEntry(QColor(0x54,0xFF,0xFF), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 0, 0 ) }; @@ -137,6 +136,12 @@ const ColorEntry* TEWidget::getColorTable() const return color_table; } +const ColorEntry* TEWidget::getdefaultColorTable() const +{ + return base_color_table; +} + + const QPixmap *TEWidget::backgroundPixmap() { static QPixmap *bg = new QPixmap("~/qpim/main/pics/faded_bg.xpm"); @@ -240,11 +245,11 @@ void TEWidget::fontChange(const QFont &) //printf("rawname: %s\n",font().rawName().ascii()); fontMap = #if QT_VERSION < 300 - strcmp(QFont::encodingName(font().charSet()).ascii(),"iso10646") + strcmp(QFont::encodingName(font().charSet()).ascii(),"iso10646") ? vt100extended : #endif - identicalMap; + identicalMap; propagateSize(); update(); } @@ -254,8 +259,7 @@ void TEWidget::setVTFont(const QFont& f) QFrame::setFont(f); } -QFont TEWidget::getVTFont() -{ +QFont TEWidget::getVTFont() { return font(); } @@ -647,7 +651,7 @@ void TEWidget::mousePressEvent(QMouseEvent* ev) emit clearSelectionSignal(); iPntSel = pntSel = pos; actSel = 1; // left mouse button pressed but nothing selected yet. - grabMouse( /*crossCursor*/ ); // handle with care! + grabMouse( /*crossCursor*/ ); // handle with care! } else { @@ -713,9 +717,9 @@ void TEWidget::mouseMoveEvent(QMouseEvent* ev) int selClass; bool left_not_right = ( here.y() < iPntSel.y() || - here.y() == iPntSel.y() && here.x() < iPntSel.x() ); + here.y() == iPntSel.y() && here.x() < iPntSel.x() ); bool old_left_not_right = ( pntSel.y() < iPntSel.y() || - pntSel.y() == iPntSel.y() && pntSel.x() < iPntSel.x() ); + pntSel.y() == iPntSel.y() && pntSel.x() < iPntSel.x() ); swapping = left_not_right != old_left_not_right; // Find left (left_not_right ? from here : from start) @@ -975,34 +979,34 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) // Has a keyboard with no CTRL and ALT keys, but we fake it: bool dele=FALSE; if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { - QKeyEvent* ke = (QKeyEvent*)e; - bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); - switch (ke->key()) { - case Key_F9: // let this be "Control" - control = keydown; - e = new QKeyEvent(QEvent::KeyPress, Key_Control, 0, ke->state()); - dele=TRUE; - break; - case Key_F13: // let this be "Alt" - alt = keydown; - e = new QKeyEvent(QEvent::KeyPress, Key_Alt, 0, ke->state()); - dele=TRUE; - break; - default: - if ( control ) { - int a = toupper(ke->ascii())-64; - if ( a >= 0 && a < ' ' ) { - e = new QKeyEvent(e->type(), ke->key(), - a, ke->state()|ControlButton, QChar(a,0)); - dele=TRUE; - } - } - if ( alt ) { - e = new QKeyEvent(e->type(), ke->key(), - ke->ascii(), ke->state()|AltButton, ke->text()); - dele=TRUE; - } - } + QKeyEvent* ke = (QKeyEvent*)e; + bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); + switch (ke->key()) { + case Key_F9: // let this be "Control" + control = keydown; + e = new QKeyEvent(QEvent::KeyPress, Key_Control, 0, ke->state()); + dele=TRUE; + break; + case Key_F13: // let this be "Alt" + alt = keydown; + e = new QKeyEvent(QEvent::KeyPress, Key_Alt, 0, ke->state()); + dele=TRUE; + break; + default: + if ( control ) { + int a = toupper(ke->ascii())-64; + if ( a >= 0 && a < ' ' ) { + e = new QKeyEvent(e->type(), ke->key(), + a, ke->state()|ControlButton, QChar(a,0)); + dele=TRUE; + } + } + if ( alt ) { + e = new QKeyEvent(e->type(), ke->key(), + ke->ascii(), ke->state()|AltButton, ke->text()); + dele=TRUE; + } + } } #endif @@ -1188,14 +1192,14 @@ void TEWidget::dropEvent(QDropEvent* event) if (bPopup) // m_drop->popup(pos() + event->pos()); - m_drop->popup(mapToGlobal(event->pos())); + m_drop->popup(mapToGlobal(event->pos())); else - { - if (currentSession) { - currentSession->getEmulation()->sendString(dropText.local8Bit()); - } -// kdDebug() << "Drop:" << dropText.local8Bit() << "\n"; - } + { + if (currentSession) { + currentSession->getEmulation()->sendString(dropText.local8Bit()); + } +// kdDebug() << "Drop:" << dropText.local8Bit() << "\n"; + } } } else if(QTextDrag::decode(event, dropText)) { diff --git a/core/apps/embeddedkonsole/TEWidget.h b/core/apps/embeddedkonsole/TEWidget.h index 3f9f4ae..40e1aea 100644 --- a/core/apps/embeddedkonsole/TEWidget.h +++ b/core/apps/embeddedkonsole/TEWidget.h @@ -9,13 +9,12 @@ /* This file is part of Konsole - an X terminal for KDE */ /* */ /* ----------------------------------------------------------------------- */ -/* */ +/* */ /* Ported Konsole to Qt/Embedded */ -/* */ +/* */ /* Copyright (C) 2000 by John Ryland */ -/* */ +/* */ /* -------------------------------------------------------------------------- */ - #ifndef TE_WIDGET_H #define TE_WIDGET_H @@ -52,6 +51,7 @@ public: QColor getDefaultBackColor(); const ColorEntry* getColorTable() const; + const ColorEntry* getdefaultColorTable() const; void setColorTable(const ColorEntry table[]); void setScrollbarLocation(int loc); diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index 7253baf..1102ef3 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp @@ -12,11 +12,11 @@ /* kvt, which is copyright (c) 1996 by Matthias Ettrich */ /* */ /* ---------------------------------------------------------------------- */ -/* */ +/* */ /* Ported Konsole to Qt/Embedded */ -/* */ +/* */ /* Copyright (C) 2000 by John Ryland */ -/* */ +/* */ /* -------------------------------------------------------------------------- */ #include @@ -41,6 +41,8 @@ #include #include #include +#include +#include #include #include @@ -54,25 +56,25 @@ class EKNumTabBar : public QTabBar { public: void numberTabs() { - // Yes, it really is this messy. QTabWidget needs functions - // that provide acces to tabs in a sequential way. - int m=INT_MIN; - for (int i=0; i it(*tabList()); - int x=INT_MAX; - for( QTab* t; (t=it.current()); ++it ) { - int tx = t->rect().x(); - if ( txm ) { - x = tx; - left = t; - } - } - if ( left ) { - left->setText(QString::number(i+1)); - m = left->rect().x(); - } - } + // Yes, it really is this messy. QTabWidget needs functions + // that provide acces to tabs in a sequential way. + int m=INT_MIN; + for (int i=0; i it(*tabList()); + int x=INT_MAX; + for( QTab* t; (t=it.current()); ++it ) { + int tx = t->rect().x(); + if ( txm ) { + x = tx; + left = t; + } + } + if ( left ) { + left->setText(QString::number(i+1)); + m = left->rect().x(); + } + } } }; @@ -84,14 +86,14 @@ public: void addTab(QWidget* w) { - QTab* t = new QTab(QString::number(tabBar()->count()+1)); - QTabWidget::addTab(w,t); + QTab* t = new QTab(QString::number(tabBar()->count()+1)); + QTabWidget::addTab(w,t); } void removeTab(QWidget* w) { - removePage(w); - ((EKNumTabBar*)tabBar())->numberTabs(); + removePage(w); + ((EKNumTabBar*)tabBar())->numberTabs(); } }; @@ -99,39 +101,34 @@ public: // file of the user static const char *commonCmds[] = { - "ls ", - //"ls -la ", + "ls ", // I left this here, cause it looks better than the first alpha + "cardctl eject", + "cat ", "cd ", - "pwd", - //"cat", - //"less ", - //"vi ", - //"man ", + "chmod ", + "cp ", + "dc ", + "df ", + "dmesg", "echo ", - "set ", - //"ps", - "ps aux", - //"tar", - //"tar -zxf", + "find ", + "free", "grep ", - //"grep -i", - //"mkdir", - "cp ", + "ifconfig ", + "ipkg ", + "mkdir ", "mv ", + "nc localhost 7776", + "nc localhost 7777", + "nslookup ", + "ping ", + "ps aux", + "pwd ", "rm ", "rmdir ", - //"chmod", - //"su", -// "top", - //"find", - //"make", - //"tail", - "cardctl eject", - "ifconfig ", -// "iwconfig eth0 ", - "nc localhost 7777", - "nc localhost 7776", - //"mount /dev/hda1", + "route ", + "set ", + "traceroute", /* "gzip", @@ -186,7 +183,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) Config cfg("Konsole"); cfg.setGroup("Konsole"); - + QString tmp; // initialize the list of allowed fonts /////////////////////////////////// cfont = cfg.readNumEntry("FontID", 1); QFont f = QFont("Micro", 4, QFont::Normal); @@ -203,11 +200,12 @@ void Konsole::init(const char* _pgm, QStrList & _args) // create terminal emulation framework //////////////////////////////////// nsessions = 0; + tab = new EKNumTabWidget(this); - tab->setTabPosition(QTabWidget::Bottom); + connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*))); - // create terminal toolbar //////////////////////////////////////////////// + // create terminal toolbar //////////////////////////////////////////////// setToolBarsMovable( FALSE ); QPEToolBar *menuToolBar = new QPEToolBar( this ); menuToolBar->setHorizontalStretchable( TRUE ); @@ -221,9 +219,50 @@ void Konsole::init(const char* _pgm, QStrList & _args) } fontChanged(cfont); + configMenu = new QPopupMenu( this); + colorMenu = new QPopupMenu( this); + + bool listHidden; + cfg.setGroup("Menubar"); + if( cfg.readEntry("Hidden","FALSE") == "TRUE") { + configMenu->insertItem("Show command list"); + listHidden=TRUE; + } else { + configMenu->insertItem("Hide command list"); + listHidden=FALSE; + } + + cfg.setGroup("Tabs"); + tmp=cfg.readEntry("Position","Bottom"); + if(tmp=="Top") { + tab->setTabPosition(QTabWidget::Top); + configMenu->insertItem("Tabs on Bottom"); + } else { + tab->setTabPosition(QTabWidget::Bottom); + configMenu->insertItem("Tabs on Top"); + } + configMenu->insertSeparator(2); + + colorMenu->insertItem("Green on Black"); + colorMenu->insertItem("Black on White"); + colorMenu->insertItem("White on Black"); + colorMenu->insertItem("Black on Transparent"); + colorMenu->insertItem("Black on Red"); + colorMenu->insertItem("Red on Black"); + colorMenu->insertItem("Green on Yellow"); + colorMenu->insertItem("Blue on Magenta"); + colorMenu->insertItem("Magenta on Blue"); + colorMenu->insertItem("Cyan on White"); + colorMenu->insertItem("White on Cyan"); + colorMenu->insertItem("Blue on Black"); + configMenu->insertItem("Colors",colorMenu); + connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) )); + connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) )); + connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuSelected(int) )); menuBar->insertItem( tr("Font"), fontList ); + menuBar->insertItem( tr("Options"), configMenu ); QPEToolBar *toolbar = new QPEToolBar( this ); @@ -250,17 +289,29 @@ void Konsole::init(const char* _pgm, QStrList & _args) a = new QAction( tr("Down"), Resource::loadPixmap( "down" ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar ); */ - - QPEToolBar *secondToolBar = new QPEToolBar( this ); + + secondToolBar = new QPEToolBar( this ); secondToolBar->setHorizontalStretchable( TRUE ); - QComboBox *commonCombo = new QComboBox( secondToolBar ); -// commonCombo->setEditable( TRUE ); - for (int i = 0; commonCmds[i] != NULL; i++) - commonCombo->insertItem( commonCmds[i], i ); + commonCombo = new QComboBox( secondToolBar ); + + if( listHidden) + secondToolBar->hide(); + configMenu->insertItem( "Edit Command List"); + + cfg.setGroup("Commands"); + commonCombo->setInsertionPolicy(QComboBox::AtCurrent); + + for (int i = 0; commonCmds[i] != NULL; i++) { + commonCombo->insertItem( commonCmds[i], i ); + tmp = cfg.readEntry( QString::number(i),""); + if(tmp != "") + commonCombo->changeItem( tmp,i ); + } + connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) )); - // create applications ///////////////////////////////////////////////////// + // create applications ///////////////////////////////////////////////////// setCentralWidget(tab); // load keymaps //////////////////////////////////////////////////////////// @@ -278,6 +329,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) QSize currentSize = size(); if (currentSize != size()) defaultSize = size(); + } void Konsole::show() @@ -296,7 +348,7 @@ void Konsole::initSession(const char*, QStrList &) Konsole::~Konsole() { while (nsessions > 0) { - doneSession(getTe()->currentSession, 0); + doneSession(getTe()->currentSession, 0); } Config cfg("Konsole"); @@ -309,24 +361,29 @@ void Konsole::fontChanged(int f) VTFont* font = fonts.at(f); if (font != 0) { for(uint i = 0; i < fonts.count(); i++) { - fontList->setItemChecked(i, (i == (uint) f) ? TRUE : FALSE); - } + fontList->setItemChecked(i, (i == (uint) f) ? TRUE : FALSE); + } - cfont = f; + cfont = f; TEWidget* te = getTe(); - if (te != 0) { - te->setVTFont(font->getFont()); - } + if (te != 0) { + te->setVTFont(font->getFont()); + } } } + void Konsole::enterCommand(int c) { TEWidget* te = getTe(); if (te != 0) { - QString text = commonCmds[c]; - te->emitText(text); + if(!commonCombo->editable()) { + QString text = commonCombo->text(c); //commonCmds[c]; + te->emitText(text); + } else { + changeCommand( commonCombo->text(c), c); + } } } @@ -390,8 +447,8 @@ QSize Konsole::calcSize(int columns, int lines) { QSize size = te->calcSize(columns, lines); return size; } else { - QSize size; - return size; + QSize size; + return size; } } @@ -467,26 +524,28 @@ void Konsole::doneSession(TESession*, int ) delete te; nsessions--; } - + if (nsessions == 0) { close(); } } - void Konsole::newSession() { - TEWidget* te = new TEWidget(tab); - te->setBackgroundMode(PaletteBase); - te->setVTFont(fonts.at(cfont)->getFont()); - tab->addTab(te); - TESession* se = new TESession(this, te, se_pgm, se_args, "xterm"); - te->currentSession = se; - connect( se, SIGNAL(done(TESession*,int)), this, SLOT(doneSession(TESession*,int)) ); - se->run(); - se->setConnect(TRUE); - se->setHistory(b_scroll); - tab->setCurrentPage(nsessions); - nsessions++; + if(nsessions < 15) { // seems to be something weird about 16 tabs on the Zaurus.... memory? + TEWidget* te = new TEWidget(tab); +// te->setBackgroundMode(PaletteBase); //we want transparent!! + te->setVTFont(fonts.at(cfont)->getFont()); + tab->addTab(te); + TESession* se = new TESession(this, te, se_pgm, se_args, "xterm"); + te->currentSession = se; + connect( se, SIGNAL(done(TESession*,int)), this, SLOT(doneSession(TESession*,int)) ); + se->run(); + se->setConnect(TRUE); + se->setHistory(b_scroll); + tab->setCurrentPage(nsessions); + nsessions++; + setColor(); + } } TEWidget* Konsole::getTe() { @@ -495,8 +554,8 @@ TEWidget* Konsole::getTe() { } else { return 0; } - } - +} + void Konsole::switchSession(QWidget* w) { TEWidget* te = (TEWidget *) w; @@ -510,3 +569,194 @@ void Konsole::switchSession(QWidget* w) { } } } + +/// ------------------------------- some new stuff by L.J. Potter +void Konsole::colorMenuSelected(int iD) +{ // this is NOT pretty, elegant or anything else besides functional +// QString temp; +// temp.sprintf("%d", iD); +// qDebug(temp); + TEWidget* te = getTe(); + Config cfg("Konsole"); + cfg.setGroup("Colors"); + QColor foreground; + QColor background; + colorMenu->setItemChecked(lastSelectedMenu,FALSE); + ColorEntry m_table[TABLE_COLORS]; + const ColorEntry * defaultCt=te->getdefaultColorTable(); + /////////// fore back + int i; + if(iD==-8) { // default default + for (i = 0; i < TABLE_COLORS; i++) { + m_table[i].color = defaultCt[i].color; + if(i==1 || i == 11) + m_table[i].transparent=1; + cfg.writeEntry("Schema","8"); + colorMenu->setItemChecked(-8,TRUE); + } + } else { + if(iD==-5) { // green black + foreground.setRgb(0x18,255,0x18); + background.setRgb(0x00,0x00,0x00); + cfg.writeEntry("Schema","5"); + colorMenu->setItemChecked(-5,TRUE); + } + if(iD==-6) { // black white + foreground.setRgb(0x00,0x00,0x00); + background.setRgb(0xFF,0xFF,0xFF); + cfg.writeEntry("Schema","6"); + colorMenu->setItemChecked(-6,TRUE); + } + if(iD==-7) { // white black + foreground.setRgb(0xFF,0xFF,0xFF); + background.setRgb(0x00,0x00,0x00); + cfg.writeEntry("Schema","7"); + colorMenu->setItemChecked(-7,TRUE); + } + if(iD==-9) {// Black, Red + foreground.setRgb(0x00,0x00,0x00); + background.setRgb(0xB2,0x18,0x18); + cfg.writeEntry("Schema","9"); + colorMenu->setItemChecked(-9,TRUE); + } + if(iD==-10) {// Red, Black + foreground.setRgb(230,31,31); //0xB2,0x18,0x18 + background.setRgb(0x00,0x00,0x00); + cfg.writeEntry("Schema","10"); + colorMenu->setItemChecked(-10,TRUE); + } + if(iD==-11) {// Green, Yellow - is ugly +// foreground.setRgb(0x18,0xB2,0x18); + foreground.setRgb(36,139,10); +// background.setRgb(0xB2,0x68,0x18); + background.setRgb(255,255,0); + cfg.writeEntry("Schema","11"); + colorMenu->setItemChecked(-11,TRUE); + } + if(iD==-12) {// Blue, Magenta + foreground.setRgb(0x18,0xB2,0xB2); + background.setRgb(0x18,0x18,0xB2); + cfg.writeEntry("Schema","12"); + colorMenu->setItemChecked(-12,TRUE); + } + if(iD==-13) {// Magenta, Blue + foreground.setRgb(0x18,0x18,0xB2); + background.setRgb(0x18,0xB2,0xB2); + cfg.writeEntry("Schema","13"); + colorMenu->setItemChecked(-13,TRUE); + } + if(iD==-14) {// Cyan, White + foreground.setRgb(0x18,0xB2,0xB2); + background.setRgb(0xFF,0xFF,0xFF); + cfg.writeEntry("Schema","14"); + colorMenu->setItemChecked(-14,TRUE); + } + if(iD==-15) {// White, Cyan + background.setRgb(0x18,0xB2,0xB2); + foreground.setRgb(0xFF,0xFF,0xFF); + cfg.writeEntry("Schema","15"); + colorMenu->setItemChecked(-15,TRUE); + } + if(iD==-16) {// Black, Blue + background.setRgb(0x00,0x00,0x00); + foreground.setRgb(0x18,0xB2,0xB2); + cfg.writeEntry("Schema","16"); + colorMenu->setItemChecked(-16,TRUE); + } + + for (i = 0; i < TABLE_COLORS; i++) { + if(i==0 || i == 10) { + m_table[i].color = foreground; + } + else if(i==1 || i == 11) { + m_table[i].color = background; m_table[i].transparent=0; + } + else + m_table[i].color = defaultCt[i].color; + } + } + lastSelectedMenu = iD; + te->setColorTable(m_table); +// update(); +} + +void Konsole::configMenuSelected(int iD) +{ +// QString temp; +// temp.sprintf("%d",iD); +// qDebug(temp); + TEWidget* te = getTe(); + Config cfg("Konsole"); + cfg.setGroup("Menubar"); + if( iD == -2) { + if(!secondToolBar->isHidden()) { + secondToolBar->hide(); + configMenu->changeItem( iD,"Show Command List"); + cfg.writeEntry("Hidden","TRUE"); + configMenu->setItemEnabled(-20 ,FALSE); + } else { + secondToolBar->show(); + configMenu->changeItem( iD,"Hide Command List"); + cfg.writeEntry("Hidden","FALSE"); + configMenu->setItemEnabled(-20 ,TRUE); + + if(cfg.readEntry("EditEnabled","FALSE")=="TRUE") { + configMenu->setItemChecked(-16,TRUE); + commonCombo->setEditable( TRUE ); + } else { + configMenu->setItemChecked(-20,FALSE); + commonCombo->setEditable( FALSE ); + } + } + } + if( iD == -3) { + cfg.setGroup("Tabs"); + QString tmp=cfg.readEntry("Position","Top"); + + if(tmp=="Top") { + tab->setTabPosition(QTabWidget::Bottom); + configMenu->changeItem( iD,"Tabs on Top"); + cfg.writeEntry("Position","Bottom"); + } else { + tab->setTabPosition(QTabWidget::Top); + configMenu->changeItem( iD,"Tabs on Bottom"); + cfg.writeEntry("Position","Top"); + } + } + if( iD == -20) { + cfg.setGroup("Commands"); +// qDebug("enableCommandEdit"); + if( !configMenu->isItemChecked(iD) ) { + commonCombo->setEditable( TRUE ); + configMenu->setItemChecked(iD,TRUE); + commonCombo->setCurrentItem(0); + cfg.writeEntry("EditEnabled","TRUE"); + } else { + commonCombo->setEditable( FALSE ); + configMenu->setItemChecked(iD,FALSE); + cfg.writeEntry("EditEnabled","FALSE"); + commonCombo->setFocusPolicy(QWidget::NoFocus); + te->setFocus(); + } + } +} + +void Konsole::changeCommand(const QString &text, int c) +{ + Config cfg("Konsole"); + cfg.setGroup("Commands"); + if(commonCmds[c] != text) { + cfg.writeEntry(QString::number(c),text); + commonCombo->clearEdit(); + commonCombo->setCurrentItem(c); + } +} + +void Konsole::setColor() +{ + Config cfg("Konsole"); + cfg.setGroup("Colors"); + int scheme = cfg.readNumEntry("Schema",1); + if(scheme != 1) colorMenuSelected( -scheme); + +} diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h index 819ea5d..40003d4 100644 --- a/core/apps/embeddedkonsole/konsole.h +++ b/core/apps/embeddedkonsole/konsole.h @@ -12,11 +12,11 @@ /* kvt, which is copyright (c) 1996 by Matthias Ettrich */ /* */ /* -------------------------------------------------------------------------- */ -/* */ +/* */ /* Ported Konsole to Qt/Embedded */ -/* */ +/* */ /* Copyright (C) 2000 by John Ryland */ -/* */ +/* */ /* -------------------------------------------------------------------------- */ #ifndef KONSOLE_H @@ -30,6 +30,8 @@ #include #include #include +#include +#include #include "MyPty.h" #include "TEWidget.h" @@ -48,13 +50,16 @@ public: Konsole(const char * name, const char* pgm, QStrList & _args, int histon); ~Konsole(); void setColLin(int columns, int lines); - + QPEToolBar *secondToolBar; void show(); - + void setColor(); + int lastSelectedMenu; private slots: void doneSession(TESession*,int); void changeColumns(int); void fontChanged(int); + void configMenuSelected(int ); + void colorMenuSelected(int); void enterCommand(int); void hitEnter(); void hitSpace(); @@ -64,6 +69,7 @@ private slots: void hitDown(); void switchSession(QWidget *); void newSession(); + void changeCommand(const QString &, int); private: void init(const char* _pgm, QStrList & _args); @@ -106,9 +112,9 @@ private: QCString se_pgm; QStrList se_args; - QPopupMenu* fontList; - - // history scrolling I think + QPopupMenu* fontList,*configMenu,*colorMenu; + QComboBox *commonCombo; + // history scrolling I think bool b_scroll; int n_keytab; -- cgit v0.9.0.2