author | mickeyl <mickeyl> | 2004-02-25 11:27:48 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-02-25 11:27:48 (UTC) |
commit | 25e87d9ccc92b7a4c12518532576f55b11726b26 (patch) (side-by-side diff) | |
tree | 39c21854f8b6845736126a05f2cc89e552484881 /core/apps/embeddedkonsole | |
parent | 50aef52b265bc8c8e5e5c6a871affe94142d74fb (diff) | |
download | opie-25e87d9ccc92b7a4c12518532576f55b11726b26.zip opie-25e87d9ccc92b7a4c12518532576f55b11726b26.tar.gz opie-25e87d9ccc92b7a4c12518532576f55b11726b26.tar.bz2 |
fix most of zecke's comments. Someone should look into the open issues though
(see mail to opie-devel)
-rw-r--r-- | core/apps/embeddedkonsole/MyPty.cpp | 7 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 21 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.h | 6 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/session.h | 2 |
4 files changed, 17 insertions, 19 deletions
diff --git a/core/apps/embeddedkonsole/MyPty.cpp b/core/apps/embeddedkonsole/MyPty.cpp index e7d8274..5a8519a 100644 --- a/core/apps/embeddedkonsole/MyPty.cpp +++ b/core/apps/embeddedkonsole/MyPty.cpp @@ -76,13 +76,12 @@ #include <unistd.h> #include <termios.h> #include <sys/types.h> #include <sys/ioctl.h> #include <sys/wait.h> -#undef HAVE_OPENPTY #ifdef HAVE_OPENPTY #include <pty.h> #endif #include "MyPty.h" @@ -257,30 +256,30 @@ void MyPty::send_bytes(const char* s, int len) printf("sending bytes:\n"); for (int i = 0; i < len; i++) printf("%c", s[i]); printf("\n"); #endif - ::write(fd, s, len); + ::write(fd, s, len); } /*! indicates that a block of data is received */ void MyPty::readPty() -{ +{ char buf[4096]; int len = ::read( fd, buf, 4096 ); if (len == -1) donePty(); if (len < 0) return; emit block_in(buf,len); - + #ifdef VERBOSE_DEBUG // verbose debug printf("read bytes:\n"); for (int i = 0; i < len; i++) printf("%c", buf[i]); printf("\n"); diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index b8f009d..1c613a9 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp @@ -18,13 +18,12 @@ /* */ /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ /* */ /* -------------------------------------------------------------------------- */ // enhancements added by L.J. Potter <ljp@llornkcor.com> // enhancements added by Phillip Kuhn -//#define QT_QWS_OPIE #include <stdlib.h> #ifdef QT_QWS_OPIE #include <opie2/ocolorpopupmenu.h> #endif @@ -366,14 +365,14 @@ void Konsole::init(const char* _pgm, QStrList & _args) n_keytab = 0; n_render = 0; startUp=0; fromMenu = FALSE; fullscreen = false; - setCaption( "Konsole" ); - setIcon( Resource::loadPixmap( "qkonsole/qkonsole" ) ); + setCaption( tr( "Konsole" ) ); + setIcon( Resource::loadPixmap( "konsole/Terminal" ) ); Config cfg( "Konsole" ); cfg.setGroup("Font"); QString tmp; // initialize the list of allowed fonts /////////////////////////////////// @@ -574,13 +573,13 @@ void Konsole::init(const char* _pgm, QStrList & _args) colorMenu->insertItem(tr( "Custom")); #endif configMenu->insertItem(tr( "Colors") ,colorMenu); sessionList = new QPopupMenu(this); - sessionList-> insertItem ( Resource::loadPixmap ( "qkonsole/qkonsole" ), tr( "new session" ), this, + sessionList-> insertItem ( Resource::loadPixmap ( "konsole/Terminal" ), tr( "new session" ), this, SLOT(newSession()) ); // 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( colorMenuIsSelected(int) )); connect( tabMenu, SIGNAL( activated(int) ), this, SLOT( tabMenuSelected(int) )); @@ -876,13 +875,13 @@ void Konsole::changeFontSize(int delta) { printf("font closest %d (%d)\n", closest_font, closest); setFont(closest_font); } } -int Konsole::findFont(QString name, int size, bool exactMatch) +int Konsole::findFont(const QString& name, int size, bool exactMatch) { for(uint i = 0; i < fonts.count(); i++) { if (fonts.at(i)->getName() == name && fonts.at(i)->getSize() == size) { @@ -1156,17 +1155,17 @@ void Konsole::doneSession(TEWidget* te, int ) if (nsessions == 0) { close(); } } -void Konsole::changeTitle(TEWidget* te, QString newTitle ) +void Konsole::changeTitle(TEWidget* te, const QString& newTitle ) { if (te == getTe()) { - setCaption(newTitle + " - QKonsole"); + setCaption( newTitle + " - " + tr( "Konsole " ) ); } } void Konsole::newSession() { @@ -1197,14 +1196,14 @@ void Konsole::newSession() 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(TEWidget*,int)), this, SLOT(doneSession(TEWidget*,int)) ); - connect( se, SIGNAL(changeTitle(TEWidget*,QString)), this, - SLOT(changeTitle(TEWidget*,QString)) ); + connect( se, SIGNAL(changeTitle(TEWidget*,const QString&)), this, + SLOT(changeTitle(TEWidget*,const QString&)) ); connect(te, SIGNAL(changeFontSize(int)), this, SLOT(changeFontSize(int))); connect(te, SIGNAL(changeSession(int)), this, SLOT(changeSession(int))); connect(te, SIGNAL(newSession()), this, SLOT(newSession())); connect(te, SIGNAL(toggleFullScreen()), this, SLOT(toggleFullScreen())); connect(te, SIGNAL(setFullScreen(bool)), this, SLOT(setFullScreen(bool))); se->run(); @@ -1306,17 +1305,17 @@ void Konsole::switchSession(QWidget* w) for(int i = 0; i < (int)fontList->count(); i++) { fontList->setItemChecked(i + 1000, i == familyNum); } if (! te->currentSession->Title().isEmpty() ) { - setCaption(te->currentSession->Title() + " - QKonsole"); + setCaption( te->currentSession->Title() + " - " + tr( "Konsole" ) ); } else { - setCaption( "Konsole" ); + setCaption( tr( "Konsole" ) ); } // colorMenuSelected(te->color_menu_item); } void Konsole::toggleFullScreen() diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h index 37babbb..e163cb8 100644 --- a/core/apps/embeddedkonsole/konsole.h +++ b/core/apps/embeddedkonsole/konsole.h @@ -70,13 +70,13 @@ public slots: void cycleZoom(); void newSession(); private slots: void setDocument(const QString &); void doneSession(TEWidget*,int); - void changeTitle(TEWidget*,QString); + void changeTitle(TEWidget*, const QString&); void changeColumns(int); void setFont(int); // void fontChanged(int); void configMenuSelected(int ); void colorMenuSelected(int); void colorMenuIsSelected(int); @@ -107,13 +107,13 @@ private: void init(const char* _pgm, QStrList & _args); void initSession(const char* _pgm, QStrList & _args); void runSession(TESession* s); void setColorPixmaps(); void setHistory(bool); void setColors(QColor foreground, QColor background); - int findFont(QString name, int size, bool exact = false); + int findFont(const QString& name, int size, bool exact = false); QSize calcSize(int columns, int lines); TEWidget* getTe(); QStringList commands; QLabel * msgLabel; QColor foreground, background; bool fromMenu; @@ -121,13 +121,13 @@ private: bool fullscreen; private: class VTFont { public: - VTFont(QString name, QFont& font, QString family, int familyNum, int size) + VTFont(const QString& name, QFont& font, const QString& family, int familyNum, int size) { this->name = name; this->font = font; this->family = family; this->size = size; this->familyNum = familyNum; diff --git a/core/apps/embeddedkonsole/session.h b/core/apps/embeddedkonsole/session.h index f399e96..a4b33e2 100644 --- a/core/apps/embeddedkonsole/session.h +++ b/core/apps/embeddedkonsole/session.h @@ -65,13 +65,13 @@ public slots: void terminate(); void changeTitle(int, const QString& title); signals: void done(TEWidget*, int); - void changeTitle(TEWidget*, QString); + void changeTitle(TEWidget*, const QString&); private: // TEPty* sh; MyPty* sh; TEWidget* te; |