Diffstat (limited to 'core/apps/embeddedkonsole/konsole.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index d10b66d..46c0203 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -3,91 +3,91 @@ | |||
3 | /* */ | 3 | /* */ |
4 | /* [main.C] Konsole */ | 4 | /* [main.C] Konsole */ |
5 | /* */ | 5 | /* */ |
6 | /* ---------------------------------------------------------------------- */ | 6 | /* ---------------------------------------------------------------------- */ |
7 | /* */ | 7 | /* */ |
8 | /* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> */ | 8 | /* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> */ |
9 | /* */ | 9 | /* */ |
10 | /* This file is part of Konsole, an X terminal. */ | 10 | /* This file is part of Konsole, an X terminal. */ |
11 | /* */ | 11 | /* */ |
12 | /* The material contained in here more or less directly orginates from */ | 12 | /* The material contained in here more or less directly orginates from */ |
13 | /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */ | 13 | /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */ |
14 | /* */ | 14 | /* */ |
15 | /* ---------------------------------------------------------------------- */ | 15 | /* ---------------------------------------------------------------------- */ |
16 | /* */ | 16 | /* */ |
17 | /* Ported Konsole to Qt/Embedded */ | 17 | /* Ported Konsole to Qt/Embedded */ |
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 | //#define QT_QWS_OPIE | 23 | //#define QT_QWS_OPIE |
24 | 24 | ||
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
26 | 26 | ||
27 | #ifdef QT_QWS_OPIE | ||
28 | #include <opie2/ocolorpopupmenu.h> | ||
29 | #endif | ||
30 | |||
27 | #include <qpe/resource.h> | 31 | #include <qpe/resource.h> |
28 | 32 | ||
29 | #include <qdir.h> | 33 | #include <qdir.h> |
30 | #include <qevent.h> | 34 | #include <qevent.h> |
31 | #include <qdragobject.h> | 35 | #include <qdragobject.h> |
32 | #include <qobjectlist.h> | 36 | #include <qobjectlist.h> |
33 | #include <qtoolbutton.h> | 37 | #include <qtoolbutton.h> |
34 | #include <qtoolbar.h> | 38 | #include <qtoolbar.h> |
35 | #include <qpushbutton.h> | 39 | #include <qpushbutton.h> |
36 | #include <qfontdialog.h> | 40 | #include <qfontdialog.h> |
37 | #include <qglobal.h> | 41 | #include <qglobal.h> |
38 | #include <qpainter.h> | 42 | #include <qpainter.h> |
39 | #include <qmenubar.h> | 43 | #include <qmenubar.h> |
40 | #include <qmessagebox.h> | 44 | #include <qmessagebox.h> |
41 | #include <qaction.h> | 45 | #include <qaction.h> |
42 | #include <qapplication.h> | 46 | #include <qapplication.h> |
43 | #include <qfontmetrics.h> | 47 | #include <qfontmetrics.h> |
44 | #include <qcombobox.h> | 48 | #include <qcombobox.h> |
45 | #include <qevent.h> | 49 | #include <qevent.h> |
46 | #include <qtabwidget.h> | 50 | #include <qtabwidget.h> |
47 | #include <qtabbar.h> | 51 | #include <qtabbar.h> |
48 | #include <qpe/config.h> | 52 | #include <qpe/config.h> |
49 | #include <qstringlist.h> | 53 | #include <qstringlist.h> |
50 | #include <qpalette.h> | 54 | #include <qpalette.h> |
51 | #include <qfontdatabase.h> | 55 | #include <qfontdatabase.h> |
52 | #include <qfile.h> | 56 | #include <qfile.h> |
53 | #include <qspinbox.h> | 57 | #include <qspinbox.h> |
54 | #include <qlayout.h> | 58 | #include <qlayout.h> |
55 | #include <qvbox.h> | 59 | #include <qvbox.h> |
56 | 60 | ||
57 | #include <sys/wait.h> | 61 | #include <sys/wait.h> |
58 | #include <stdio.h> | 62 | #include <stdio.h> |
59 | #include <stdlib.h> | 63 | #include <stdlib.h> |
60 | #include <assert.h> | 64 | #include <assert.h> |
61 | 65 | ||
62 | #include "konsole.h" | 66 | #include "konsole.h" |
63 | #include "keytrans.h" | 67 | #include "keytrans.h" |
64 | #include "commandeditdialog.h" | 68 | #include "commandeditdialog.h" |
65 | 69 | ||
66 | #ifdef QT_QWS_OPIE | ||
67 | #include <opie/colorpopupmenu.h> | ||
68 | #endif | ||
69 | |||
70 | class EKNumTabBar : public QTabBar | 70 | class EKNumTabBar : public QTabBar |
71 | { | 71 | { |
72 | public: | 72 | public: |
73 | EKNumTabBar(QWidget *parent = 0, const char *name = 0) : | 73 | EKNumTabBar(QWidget *parent = 0, const char *name = 0) : |
74 | QTabBar(parent, name) | 74 | QTabBar(parent, name) |
75 | {} | 75 | {} |
76 | 76 | ||
77 | // QList<QTab> *getTabList() { return(tabList()); } | 77 | // QList<QTab> *getTabList() { return(tabList()); } |
78 | 78 | ||
79 | void numberTabs() | 79 | void numberTabs() |
80 | { | 80 | { |
81 | // Yes, it really is this messy. QTabWidget needs functions | 81 | // Yes, it really is this messy. QTabWidget needs functions |
82 | // that provide acces to tabs in a sequential way. | 82 | // that provide acces to tabs in a sequential way. |
83 | int m=INT_MIN; | 83 | int m=INT_MIN; |
84 | for (int i=0; i<count(); i++) | 84 | for (int i=0; i<count(); i++) |
85 | { | 85 | { |
86 | QTab* left=0; | 86 | QTab* left=0; |
87 | QListIterator<QTab> it(*tabList()); | 87 | QListIterator<QTab> it(*tabList()); |
88 | int x=INT_MAX; | 88 | int x=INT_MAX; |
89 | for( QTab* t; (t=it.current()); ++it ) | 89 | for( QTab* t; (t=it.current()); ++it ) |
90 | { | 90 | { |
91 | int tx = t->rect().x(); | 91 | int tx = t->rect().x(); |
92 | if ( tx<x && tx>m ) | 92 | if ( tx<x && tx>m ) |
93 | { | 93 | { |
@@ -1506,49 +1506,49 @@ void Konsole::colorMenuSelected(int iD) | |||
1506 | {// White, Cyan | 1506 | {// White, Cyan |
1507 | background.setRgb(8,91,129); | 1507 | background.setRgb(8,91,129); |
1508 | foreground.setRgb(0xFF,0xFF,0xFF); | 1508 | foreground.setRgb(0xFF,0xFF,0xFF); |
1509 | colorMenu->setItemChecked(cm_wc,TRUE); | 1509 | colorMenu->setItemChecked(cm_wc,TRUE); |
1510 | } | 1510 | } |
1511 | if(iD==cm_bb) | 1511 | if(iD==cm_bb) |
1512 | {// Black, Blue | 1512 | {// Black, Blue |
1513 | background.setRgb(0x00,0x00,0x00); | 1513 | background.setRgb(0x00,0x00,0x00); |
1514 | foreground.setRgb(127,147,225); | 1514 | foreground.setRgb(127,147,225); |
1515 | colorMenu->setItemChecked(cm_bb,TRUE); | 1515 | colorMenu->setItemChecked(cm_bb,TRUE); |
1516 | } | 1516 | } |
1517 | if(iD==cm_ab) | 1517 | if(iD==cm_ab) |
1518 | {// Black, Gold | 1518 | {// Black, Gold |
1519 | background.setRgb(0x00,0x00,0x00); | 1519 | background.setRgb(0x00,0x00,0x00); |
1520 | foreground.setRgb(255,215,105); | 1520 | foreground.setRgb(255,215,105); |
1521 | colorMenu->setItemChecked(cm_ab,TRUE); | 1521 | colorMenu->setItemChecked(cm_ab,TRUE); |
1522 | } | 1522 | } |
1523 | #ifdef QT_QWS_OPIE | 1523 | #ifdef QT_QWS_OPIE |
1524 | if(iD==-19) | 1524 | if(iD==-19) |
1525 | { | 1525 | { |
1526 | // Custom | 1526 | // Custom |
1527 | qDebug("do custom"); | 1527 | qDebug("do custom"); |
1528 | if(fromMenu) | 1528 | if(fromMenu) |
1529 | { | 1529 | { |
1530 | OColorPopupMenu* penColorPopupMenu = new OColorPopupMenu(Qt::black, this, "foreground color"); | 1530 | Opie::OColorPopupMenu* penColorPopupMenu = new Opie::OColorPopupMenu(Qt::black, this, "foreground color"); |
1531 | connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, | 1531 | connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, |
1532 | SLOT(changeForegroundColor(const QColor&))); | 1532 | SLOT(changeForegroundColor(const QColor&))); |
1533 | penColorPopupMenu->exec(); | 1533 | penColorPopupMenu->exec(); |
1534 | } | 1534 | } |
1535 | if(!fromMenu) | 1535 | if(!fromMenu) |
1536 | { | 1536 | { |
1537 | foreground.setNamedColor(cfg.readEntry("foreground","")); | 1537 | foreground.setNamedColor(cfg.readEntry("foreground","")); |
1538 | background.setNamedColor(cfg.readEntry("background","")); | 1538 | background.setNamedColor(cfg.readEntry("background","")); |
1539 | } | 1539 | } |
1540 | fromMenu=FALSE; | 1540 | fromMenu=FALSE; |
1541 | colorMenu->setItemChecked(-19,TRUE); | 1541 | colorMenu->setItemChecked(-19,TRUE); |
1542 | } | 1542 | } |
1543 | #endif | 1543 | #endif |
1544 | 1544 | ||
1545 | lastSelectedMenu = iD; | 1545 | lastSelectedMenu = iD; |
1546 | 1546 | ||
1547 | setColors(foreground, background); | 1547 | setColors(foreground, background); |
1548 | 1548 | ||
1549 | QTabBar *tabBar = tab->getTabBar(); | 1549 | QTabBar *tabBar = tab->getTabBar(); |
1550 | QString ss = QString("Session%1").arg(tabBar->currentTab()); | 1550 | QString ss = QString("Session%1").arg(tabBar->currentTab()); |
1551 | // printf("current tab = %d\n", tabBar->currentTab()); | 1551 | // printf("current tab = %d\n", tabBar->currentTab()); |
1552 | 1552 | ||
1553 | if (tabBar->currentTab() == 0) | 1553 | if (tabBar->currentTab() == 0) |
1554 | { | 1554 | { |
@@ -1857,49 +1857,49 @@ void Konsole::parseCommandLine() | |||
1857 | } | 1857 | } |
1858 | cmd.stripWhiteSpace(); | 1858 | cmd.stripWhiteSpace(); |
1859 | system(cmd.latin1()); | 1859 | system(cmd.latin1()); |
1860 | exit(0);//close(); | 1860 | exit(0);//close(); |
1861 | } // end -e switch | 1861 | } // end -e switch |
1862 | } | 1862 | } |
1863 | startUp++; | 1863 | startUp++; |
1864 | } | 1864 | } |
1865 | 1865 | ||
1866 | void Konsole::changeForegroundColor(const QColor &color) | 1866 | void Konsole::changeForegroundColor(const QColor &color) |
1867 | { | 1867 | { |
1868 | Config cfg("Qkonsole"); | 1868 | Config cfg("Qkonsole"); |
1869 | cfg.setGroup("Colors"); | 1869 | cfg.setGroup("Colors"); |
1870 | int r, g, b; | 1870 | int r, g, b; |
1871 | color.rgb(&r,&g,&b); | 1871 | color.rgb(&r,&g,&b); |
1872 | foreground.setRgb(r,g,b); | 1872 | foreground.setRgb(r,g,b); |
1873 | 1873 | ||
1874 | cfg.writeEntry("foreground",color.name()); | 1874 | cfg.writeEntry("foreground",color.name()); |
1875 | qDebug("foreground "+color.name()); | 1875 | qDebug("foreground "+color.name()); |
1876 | cfg.write(); | 1876 | cfg.write(); |
1877 | 1877 | ||
1878 | qDebug("do other dialog"); | 1878 | qDebug("do other dialog"); |
1879 | #ifdef QT_QWS_OPIE | 1879 | #ifdef QT_QWS_OPIE |
1880 | 1880 | ||
1881 | OColorPopupMenu* penColorPopupMenu2 = new OColorPopupMenu(Qt::black, this,"background color"); | 1881 | Opie::OColorPopupMenu* penColorPopupMenu2 = new Opie::OColorPopupMenu(Qt::black, this,"background color"); |
1882 | connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this, | 1882 | connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this, |
1883 | SLOT(changeBackgroundColor(const QColor&))); | 1883 | SLOT(changeBackgroundColor(const QColor&))); |
1884 | penColorPopupMenu2->exec(); | 1884 | penColorPopupMenu2->exec(); |
1885 | #endif | 1885 | #endif |
1886 | } | 1886 | } |
1887 | 1887 | ||
1888 | void Konsole::changeBackgroundColor(const QColor &color) | 1888 | void Konsole::changeBackgroundColor(const QColor &color) |
1889 | { | 1889 | { |
1890 | 1890 | ||
1891 | qDebug("Change background"); | 1891 | qDebug("Change background"); |
1892 | Config cfg("Qkonsole"); | 1892 | Config cfg("Qkonsole"); |
1893 | cfg.setGroup("Colors"); | 1893 | cfg.setGroup("Colors"); |
1894 | int r, g, b; | 1894 | int r, g, b; |
1895 | color.rgb(&r,&g,&b); | 1895 | color.rgb(&r,&g,&b); |
1896 | background.setRgb(r,g,b); | 1896 | background.setRgb(r,g,b); |
1897 | cfg.writeEntry("background",color.name()); | 1897 | cfg.writeEntry("background",color.name()); |
1898 | qDebug("background "+color.name()); | 1898 | qDebug("background "+color.name()); |
1899 | cfg.write(); | 1899 | cfg.write(); |
1900 | } | 1900 | } |
1901 | 1901 | ||
1902 | void Konsole::doWrap() | 1902 | void Konsole::doWrap() |
1903 | { | 1903 | { |
1904 | Config cfg("Qkonsole"); | 1904 | Config cfg("Qkonsole"); |
1905 | cfg.setGroup("ScrollBar"); | 1905 | cfg.setGroup("ScrollBar"); |