-rw-r--r-- | core/apps/embeddedkonsole/commandeditdialog.cpp | 2 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/apps/embeddedkonsole/commandeditdialog.cpp b/core/apps/embeddedkonsole/commandeditdialog.cpp index 8b2abfa..97b0a9e 100644 --- a/core/apps/embeddedkonsole/commandeditdialog.cpp +++ b/core/apps/embeddedkonsole/commandeditdialog.cpp | |||
@@ -1,33 +1,33 @@ | |||
1 | //comandeditdialog.cpp | 1 | //comandeditdialog.cpp |
2 | 2 | ||
3 | #include "commandeditdialog.h" | 3 | #include "commandeditdialog.h" |
4 | #include "playlistselection.h" | 4 | #include "playlistselection.h" |
5 | #include <qstring.h> | 5 | #include <qstring.h> |
6 | #include <qpe/config.h> | 6 | #include <qpe/config.h> |
7 | #include <qpe/qpetoolbar.h> | 7 | #include <qpe/qpetoolbar.h> |
8 | #include <qwidget.h> | 8 | #include <qwidget.h> |
9 | #include <qpe/qpemenubar.h> | 9 | #include <qmenubar.h> |
10 | #include <qpe/resource.h> | 10 | #include <qpe/resource.h> |
11 | #include <qlist.h> | 11 | #include <qlist.h> |
12 | #include <qtoolbutton.h> | 12 | #include <qtoolbutton.h> |
13 | #include <qvbox.h> | 13 | #include <qvbox.h> |
14 | #include <qlistview.h> | 14 | #include <qlistview.h> |
15 | #include <qlineedit.h> | 15 | #include <qlineedit.h> |
16 | #include <qheader.h> | 16 | #include <qheader.h> |
17 | #include <qlabel.h> | 17 | #include <qlabel.h> |
18 | #include <qmessagebox.h> | 18 | #include <qmessagebox.h> |
19 | #include "smallcommandeditdialogbase.h" | 19 | #include "smallcommandeditdialogbase.h" |
20 | 20 | ||
21 | CommandEditDialog::CommandEditDialog(QWidget *parent, const char* name, WFlags fl ) | 21 | CommandEditDialog::CommandEditDialog(QWidget *parent, const char* name, WFlags fl ) |
22 | : CommandEditDialogBase(parent, name, TRUE, fl) | 22 | : CommandEditDialogBase(parent, name, TRUE, fl) |
23 | 23 | ||
24 | { | 24 | { |
25 | m_SuggestedCommandList->addColumn( tr("Command Selection") ); | 25 | m_SuggestedCommandList->addColumn( tr("Command Selection") ); |
26 | m_SuggestedCommandList->header()->hide(); | 26 | m_SuggestedCommandList->header()->hide(); |
27 | m_SuggestedCommandList->setSorting(-1,FALSE); | 27 | m_SuggestedCommandList->setSorting(-1,FALSE); |
28 | m_SuggestedCommandList->clearSelection(); | 28 | m_SuggestedCommandList->clearSelection(); |
29 | m_SuggestedCommandList->setSorting(0,TRUE); | 29 | m_SuggestedCommandList->setSorting(0,TRUE); |
30 | QListViewItem *item; | 30 | QListViewItem *item; |
31 | item = new QListViewItem( m_SuggestedCommandList,"export "); | 31 | item = new QListViewItem( m_SuggestedCommandList,"export "); |
32 | item = new QListViewItem( m_SuggestedCommandList,"ifconfig "); | 32 | item = new QListViewItem( m_SuggestedCommandList,"ifconfig "); |
33 | item = new QListViewItem( m_SuggestedCommandList,"ipkg "); | 33 | item = new QListViewItem( m_SuggestedCommandList,"ipkg "); |
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index ec438c3..d855d90 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -12,49 +12,49 @@ | |||
12 | /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */ | 12 | /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */ |
13 | /* */ | 13 | /* */ |
14 | /* ---------------------------------------------------------------------- */ | 14 | /* ---------------------------------------------------------------------- */ |
15 | /* */ | 15 | /* */ |
16 | /* Ported Konsole to Qt/Embedded */ | 16 | /* Ported Konsole to Qt/Embedded */ |
17 | /* */ | 17 | /* */ |
18 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ | 18 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ |
19 | /* */ | 19 | /* */ |
20 | /* -------------------------------------------------------------------------- */ | 20 | /* -------------------------------------------------------------------------- */ |
21 | // enhancements added by L.J. Potter <ljp@llornkcor.com> | 21 | // enhancements added by L.J. Potter <ljp@llornkcor.com> |
22 | #define QT_QWS_OPIE | 22 | #define QT_QWS_OPIE |
23 | 23 | ||
24 | #include <qpe/resource.h> | 24 | #include <qpe/resource.h> |
25 | 25 | ||
26 | #include <qdir.h> | 26 | #include <qdir.h> |
27 | #include <qevent.h> | 27 | #include <qevent.h> |
28 | #include <qdragobject.h> | 28 | #include <qdragobject.h> |
29 | #include <qobjectlist.h> | 29 | #include <qobjectlist.h> |
30 | #include <qtoolbutton.h> | 30 | #include <qtoolbutton.h> |
31 | #include <qpe/qpetoolbar.h> | 31 | #include <qpe/qpetoolbar.h> |
32 | #include <qpushbutton.h> | 32 | #include <qpushbutton.h> |
33 | #include <qfontdialog.h> | 33 | #include <qfontdialog.h> |
34 | #include <qglobal.h> | 34 | #include <qglobal.h> |
35 | #include <qpainter.h> | 35 | #include <qpainter.h> |
36 | #include <qpe/qpemenubar.h> | 36 | #include <qmenubar.h> |
37 | #include <qmessagebox.h> | 37 | #include <qmessagebox.h> |
38 | #include <qaction.h> | 38 | #include <qaction.h> |
39 | #include <qapplication.h> | 39 | #include <qapplication.h> |
40 | #include <qfontmetrics.h> | 40 | #include <qfontmetrics.h> |
41 | #include <qcombobox.h> | 41 | #include <qcombobox.h> |
42 | #include <qevent.h> | 42 | #include <qevent.h> |
43 | #include <qtabwidget.h> | 43 | #include <qtabwidget.h> |
44 | #include <qtabbar.h> | 44 | #include <qtabbar.h> |
45 | #include <qpe/config.h> | 45 | #include <qpe/config.h> |
46 | #include <qstringlist.h> | 46 | #include <qstringlist.h> |
47 | #include <qpalette.h> | 47 | #include <qpalette.h> |
48 | 48 | ||
49 | #include <unistd.h> | 49 | #include <unistd.h> |
50 | #include <pwd.h> | 50 | #include <pwd.h> |
51 | #include <sys/types.h> | 51 | #include <sys/types.h> |
52 | #include <sys/wait.h> | 52 | #include <sys/wait.h> |
53 | #include <stdio.h> | 53 | #include <stdio.h> |
54 | #include <stdlib.h> | 54 | #include <stdlib.h> |
55 | #include <assert.h> | 55 | #include <assert.h> |
56 | 56 | ||
57 | #include "konsole.h" | 57 | #include "konsole.h" |
58 | #include "keytrans.h" | 58 | #include "keytrans.h" |
59 | #include "commandeditdialog.h" | 59 | #include "commandeditdialog.h" |
60 | 60 | ||
@@ -264,49 +264,49 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
264 | QFont f = QFont("Micro", 4, QFont::Normal); | 264 | QFont f = QFont("Micro", 4, QFont::Normal); |
265 | f.setFixedPitch(TRUE); | 265 | f.setFixedPitch(TRUE); |
266 | fonts.append(new VTFont(tr("Micro"), f)); | 266 | fonts.append(new VTFont(tr("Micro"), f)); |
267 | 267 | ||
268 | f = QFont("Fixed", 7, QFont::Normal); | 268 | f = QFont("Fixed", 7, QFont::Normal); |
269 | f.setFixedPitch(TRUE); | 269 | f.setFixedPitch(TRUE); |
270 | fonts.append(new VTFont(tr("Small Fixed"), f)); | 270 | fonts.append(new VTFont(tr("Small Fixed"), f)); |
271 | 271 | ||
272 | f = QFont("Fixed", 12, QFont::Normal); | 272 | f = QFont("Fixed", 12, QFont::Normal); |
273 | f.setFixedPitch(TRUE); | 273 | f.setFixedPitch(TRUE); |
274 | fonts.append(new VTFont(tr("Medium Fixed"), f)); | 274 | fonts.append(new VTFont(tr("Medium Fixed"), f)); |
275 | 275 | ||
276 | // create terminal emulation framework //////////////////////////////////// | 276 | // create terminal emulation framework //////////////////////////////////// |
277 | nsessions = 0; | 277 | nsessions = 0; |
278 | 278 | ||
279 | tab = new EKNumTabWidget(this); | 279 | tab = new EKNumTabWidget(this); |
280 | 280 | ||
281 | connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*))); | 281 | connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*))); |
282 | 282 | ||
283 | // create terminal toolbar //////////////////////////////////////////////// | 283 | // create terminal toolbar //////////////////////////////////////////////// |
284 | setToolBarsMovable( FALSE ); | 284 | setToolBarsMovable( FALSE ); |
285 | QPEToolBar *menuToolBar = new QPEToolBar( this ); | 285 | QPEToolBar *menuToolBar = new QPEToolBar( this ); |
286 | menuToolBar->setHorizontalStretchable( TRUE ); | 286 | menuToolBar->setHorizontalStretchable( TRUE ); |
287 | 287 | ||
288 | QPEMenuBar *menuBar = new QPEMenuBar( menuToolBar ); | 288 | QMenuBar *menuBar = new QMenuBar( menuToolBar ); |
289 | 289 | ||
290 | fontList = new QPopupMenu( this ); | 290 | fontList = new QPopupMenu( this ); |
291 | for(uint i = 0; i < fonts.count(); i++) { | 291 | for(uint i = 0; i < fonts.count(); i++) { |
292 | VTFont *fnt = fonts.at(i); | 292 | VTFont *fnt = fonts.at(i); |
293 | fontList->insertItem(fnt->getName(), i); | 293 | fontList->insertItem(fnt->getName(), i); |
294 | } | 294 | } |
295 | fontChanged(cfont); | 295 | fontChanged(cfont); |
296 | 296 | ||
297 | configMenu = new QPopupMenu( this); | 297 | configMenu = new QPopupMenu( this); |
298 | colorMenu = new QPopupMenu( this); | 298 | colorMenu = new QPopupMenu( this); |
299 | scrollMenu = new QPopupMenu( this); | 299 | scrollMenu = new QPopupMenu( this); |
300 | editCommandListMenu = new QPopupMenu( this); | 300 | editCommandListMenu = new QPopupMenu( this); |
301 | 301 | ||
302 | configMenu->insertItem(tr("Command List"), editCommandListMenu); | 302 | configMenu->insertItem(tr("Command List"), editCommandListMenu); |
303 | 303 | ||
304 | bool listHidden; | 304 | bool listHidden; |
305 | cfg.setGroup("Menubar"); | 305 | cfg.setGroup("Menubar"); |
306 | if( cfg.readEntry("Hidden","FALSE") == "TRUE") { | 306 | if( cfg.readEntry("Hidden","FALSE") == "TRUE") { |
307 | editCommandListMenu->insertItem( tr( "Show command list" )); | 307 | editCommandListMenu->insertItem( tr( "Show command list" )); |
308 | listHidden=TRUE; | 308 | listHidden=TRUE; |
309 | } else { | 309 | } else { |
310 | editCommandListMenu->insertItem( tr( "Hide command list" )); | 310 | editCommandListMenu->insertItem( tr( "Hide command list" )); |
311 | listHidden=FALSE; | 311 | listHidden=FALSE; |
312 | } | 312 | } |