Diffstat (limited to 'core/apps/embeddedkonsole/konsole.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
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 @@ | |||
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 | //#define QT_QWS_OPIE | ||
25 | 24 | ||
26 | #include <stdlib.h> | 25 | #include <stdlib.h> |
27 | 26 | ||
28 | #ifdef QT_QWS_OPIE | 27 | #ifdef QT_QWS_OPIE |
29 | #include <opie2/ocolorpopupmenu.h> | 28 | #include <opie2/ocolorpopupmenu.h> |
30 | #endif | 29 | #endif |
@@ -366,14 +365,14 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
366 | n_keytab = 0; | 365 | n_keytab = 0; |
367 | n_render = 0; | 366 | n_render = 0; |
368 | startUp=0; | 367 | startUp=0; |
369 | fromMenu = FALSE; | 368 | fromMenu = FALSE; |
370 | fullscreen = false; | 369 | fullscreen = false; |
371 | 370 | ||
372 | setCaption( "Konsole" ); | 371 | setCaption( tr( "Konsole" ) ); |
373 | setIcon( Resource::loadPixmap( "qkonsole/qkonsole" ) ); | 372 | setIcon( Resource::loadPixmap( "konsole/Terminal" ) ); |
374 | 373 | ||
375 | Config cfg( "Konsole" ); | 374 | Config cfg( "Konsole" ); |
376 | cfg.setGroup("Font"); | 375 | cfg.setGroup("Font"); |
377 | QString tmp; | 376 | QString tmp; |
378 | 377 | ||
379 | // initialize the list of allowed fonts /////////////////////////////////// | 378 | // initialize the list of allowed fonts /////////////////////////////////// |
@@ -574,13 +573,13 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
574 | colorMenu->insertItem(tr( "Custom")); | 573 | colorMenu->insertItem(tr( "Custom")); |
575 | #endif | 574 | #endif |
576 | 575 | ||
577 | configMenu->insertItem(tr( "Colors") ,colorMenu); | 576 | configMenu->insertItem(tr( "Colors") ,colorMenu); |
578 | 577 | ||
579 | sessionList = new QPopupMenu(this); | 578 | sessionList = new QPopupMenu(this); |
580 | sessionList-> insertItem ( Resource::loadPixmap ( "qkonsole/qkonsole" ), tr( "new session" ), this, | 579 | sessionList-> insertItem ( Resource::loadPixmap ( "konsole/Terminal" ), tr( "new session" ), this, |
581 | SLOT(newSession()) ); | 580 | SLOT(newSession()) ); |
582 | 581 | ||
583 | // connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) )); | 582 | // connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) )); |
584 | connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) )); | 583 | connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) )); |
585 | connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) )); | 584 | connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) )); |
586 | connect( tabMenu, SIGNAL( activated(int) ), this, SLOT( tabMenuSelected(int) )); | 585 | connect( tabMenu, SIGNAL( activated(int) ), this, SLOT( tabMenuSelected(int) )); |
@@ -876,13 +875,13 @@ void Konsole::changeFontSize(int delta) | |||
876 | { | 875 | { |
877 | printf("font closest %d (%d)\n", closest_font, closest); | 876 | printf("font closest %d (%d)\n", closest_font, closest); |
878 | setFont(closest_font); | 877 | setFont(closest_font); |
879 | } | 878 | } |
880 | } | 879 | } |
881 | 880 | ||
882 | int Konsole::findFont(QString name, int size, bool exactMatch) | 881 | int Konsole::findFont(const QString& name, int size, bool exactMatch) |
883 | { | 882 | { |
884 | for(uint i = 0; i < fonts.count(); i++) | 883 | for(uint i = 0; i < fonts.count(); i++) |
885 | { | 884 | { |
886 | if (fonts.at(i)->getName() == name | 885 | if (fonts.at(i)->getName() == name |
887 | && fonts.at(i)->getSize() == size) | 886 | && fonts.at(i)->getSize() == size) |
888 | { | 887 | { |
@@ -1156,17 +1155,17 @@ void Konsole::doneSession(TEWidget* te, int ) | |||
1156 | if (nsessions == 0) | 1155 | if (nsessions == 0) |
1157 | { | 1156 | { |
1158 | close(); | 1157 | close(); |
1159 | } | 1158 | } |
1160 | } | 1159 | } |
1161 | 1160 | ||
1162 | void Konsole::changeTitle(TEWidget* te, QString newTitle ) | 1161 | void Konsole::changeTitle(TEWidget* te, const QString& newTitle ) |
1163 | { | 1162 | { |
1164 | if (te == getTe()) | 1163 | if (te == getTe()) |
1165 | { | 1164 | { |
1166 | setCaption(newTitle + " - QKonsole"); | 1165 | setCaption( newTitle + " - " + tr( "Konsole " ) ); |
1167 | } | 1166 | } |
1168 | } | 1167 | } |
1169 | 1168 | ||
1170 | 1169 | ||
1171 | void Konsole::newSession() | 1170 | void Konsole::newSession() |
1172 | { | 1171 | { |
@@ -1197,14 +1196,14 @@ void Konsole::newSession() | |||
1197 | te->setVTFont(fonts.at(cfont)->getFont()); | 1196 | te->setVTFont(fonts.at(cfont)->getFont()); |
1198 | 1197 | ||
1199 | tab->addTab(te); | 1198 | tab->addTab(te); |
1200 | TESession* se = new TESession(this, te, se_pgm, se_args, "xterm"); | 1199 | TESession* se = new TESession(this, te, se_pgm, se_args, "xterm"); |
1201 | te->currentSession = se; | 1200 | te->currentSession = se; |
1202 | connect( se, SIGNAL(done(TEWidget*,int)), this, SLOT(doneSession(TEWidget*,int)) ); | 1201 | connect( se, SIGNAL(done(TEWidget*,int)), this, SLOT(doneSession(TEWidget*,int)) ); |
1203 | connect( se, SIGNAL(changeTitle(TEWidget*,QString)), this, | 1202 | connect( se, SIGNAL(changeTitle(TEWidget*,const QString&)), this, |
1204 | SLOT(changeTitle(TEWidget*,QString)) ); | 1203 | SLOT(changeTitle(TEWidget*,const QString&)) ); |
1205 | connect(te, SIGNAL(changeFontSize(int)), this, SLOT(changeFontSize(int))); | 1204 | connect(te, SIGNAL(changeFontSize(int)), this, SLOT(changeFontSize(int))); |
1206 | connect(te, SIGNAL(changeSession(int)), this, SLOT(changeSession(int))); | 1205 | connect(te, SIGNAL(changeSession(int)), this, SLOT(changeSession(int))); |
1207 | connect(te, SIGNAL(newSession()), this, SLOT(newSession())); | 1206 | connect(te, SIGNAL(newSession()), this, SLOT(newSession())); |
1208 | connect(te, SIGNAL(toggleFullScreen()), this, SLOT(toggleFullScreen())); | 1207 | connect(te, SIGNAL(toggleFullScreen()), this, SLOT(toggleFullScreen())); |
1209 | connect(te, SIGNAL(setFullScreen(bool)), this, SLOT(setFullScreen(bool))); | 1208 | connect(te, SIGNAL(setFullScreen(bool)), this, SLOT(setFullScreen(bool))); |
1210 | se->run(); | 1209 | se->run(); |
@@ -1306,17 +1305,17 @@ void Konsole::switchSession(QWidget* w) | |||
1306 | for(int i = 0; i < (int)fontList->count(); i++) | 1305 | for(int i = 0; i < (int)fontList->count(); i++) |
1307 | { | 1306 | { |
1308 | fontList->setItemChecked(i + 1000, i == familyNum); | 1307 | fontList->setItemChecked(i + 1000, i == familyNum); |
1309 | } | 1308 | } |
1310 | if (! te->currentSession->Title().isEmpty() ) | 1309 | if (! te->currentSession->Title().isEmpty() ) |
1311 | { | 1310 | { |
1312 | setCaption(te->currentSession->Title() + " - QKonsole"); | 1311 | setCaption( te->currentSession->Title() + " - " + tr( "Konsole" ) ); |
1313 | } | 1312 | } |
1314 | else | 1313 | else |
1315 | { | 1314 | { |
1316 | setCaption( "Konsole" ); | 1315 | setCaption( tr( "Konsole" ) ); |
1317 | } | 1316 | } |
1318 | // colorMenuSelected(te->color_menu_item); | 1317 | // colorMenuSelected(te->color_menu_item); |
1319 | } | 1318 | } |
1320 | 1319 | ||
1321 | 1320 | ||
1322 | void Konsole::toggleFullScreen() | 1321 | void Konsole::toggleFullScreen() |