| -rw-r--r-- | core/apps/embeddedkonsole/config.in | 2 | ||||
| -rwxr-xr-x | core/apps/embeddedkonsole/embeddedkonsole.pro | 4 | ||||
| -rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 12 | ||||
| -rw-r--r-- | core/apps/embeddedkonsole/main.cpp | 12 | ||||
| -rw-r--r-- | core/apps/embeddedkonsole/opie-embeddedkonsole.control | 2 |
5 files changed, 11 insertions, 21 deletions
diff --git a/core/apps/embeddedkonsole/config.in b/core/apps/embeddedkonsole/config.in index 3a421d6..a3a1844 100644 --- a/core/apps/embeddedkonsole/config.in +++ b/core/apps/embeddedkonsole/config.in @@ -1,4 +1,4 @@ config EMBEDDEDKONSOLE boolean "opie-embeddedkonsole (konsole from KDE adapted for Qt/Embedded)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBQTAUX diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro index 427c013..2743488 100755 --- a/core/apps/embeddedkonsole/embeddedkonsole.pro +++ b/core/apps/embeddedkonsole/embeddedkonsole.pro @@ -18,21 +18,21 @@ HEADERS = TEWidget.h \ SOURCES = TEScreen.cpp \ TEWidget.cpp \ TEHistory.cpp \ TEmulation.cpp \ TEmuVt102.cpp \ session.cpp \ keytrans.cpp \ konsole.cpp \ commandeditdialog.cpp \ commandeditwidget.cpp \ playlistselection.cpp \ MyPty.cpp \ - main.cpp + main.cpp INTERFACES = commandeditdialogbase.ui smallcommandeditdialogbase.ui TARGET = embeddedkonsole INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lqtaux2 TMAKE_CXXFLAGS += -DQT_QWS_OPIE -DHAVE_OPENPTY include ( $(OPIEDIR)/include.pro ) 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 @@ -15,24 +15,28 @@ /* ---------------------------------------------------------------------- */ /* */ /* Ported Konsole to Qt/Embedded */ /* */ /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ /* */ /* -------------------------------------------------------------------------- */ // enhancements added by L.J. Potter <ljp@llornkcor.com> //#define QT_QWS_OPIE #include <stdlib.h> +#ifdef QT_QWS_OPIE +#include <opie2/ocolorpopupmenu.h> +#endif + #include <qpe/resource.h> #include <qdir.h> #include <qevent.h> #include <qdragobject.h> #include <qobjectlist.h> #include <qtoolbutton.h> #include <qtoolbar.h> #include <qpushbutton.h> #include <qfontdialog.h> #include <qglobal.h> #include <qpainter.h> @@ -54,28 +58,24 @@ #include <qlayout.h> #include <qvbox.h> #include <sys/wait.h> #include <stdio.h> #include <stdlib.h> #include <assert.h> #include "konsole.h" #include "keytrans.h" #include "commandeditdialog.h" -#ifdef QT_QWS_OPIE -#include <opie/colorpopupmenu.h> -#endif - class EKNumTabBar : public QTabBar { public: EKNumTabBar(QWidget *parent = 0, const char *name = 0) : QTabBar(parent, name) {} // QList<QTab> *getTabList() { return(tabList()); } void numberTabs() { // Yes, it really is this messy. QTabWidget needs functions @@ -1518,25 +1518,25 @@ void Konsole::colorMenuSelected(int iD) {// Black, Gold background.setRgb(0x00,0x00,0x00); foreground.setRgb(255,215,105); colorMenu->setItemChecked(cm_ab,TRUE); } #ifdef QT_QWS_OPIE if(iD==-19) { // Custom qDebug("do custom"); if(fromMenu) { - OColorPopupMenu* penColorPopupMenu = new OColorPopupMenu(Qt::black, this, "foreground color"); + Opie::OColorPopupMenu* penColorPopupMenu = new Opie::OColorPopupMenu(Qt::black, this, "foreground color"); connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, SLOT(changeForegroundColor(const QColor&))); penColorPopupMenu->exec(); } if(!fromMenu) { foreground.setNamedColor(cfg.readEntry("foreground","")); background.setNamedColor(cfg.readEntry("background","")); } fromMenu=FALSE; colorMenu->setItemChecked(-19,TRUE); } @@ -1869,25 +1869,25 @@ void Konsole::changeForegroundColor(const QColor &color) cfg.setGroup("Colors"); int r, g, b; color.rgb(&r,&g,&b); foreground.setRgb(r,g,b); cfg.writeEntry("foreground",color.name()); qDebug("foreground "+color.name()); cfg.write(); qDebug("do other dialog"); #ifdef QT_QWS_OPIE - OColorPopupMenu* penColorPopupMenu2 = new OColorPopupMenu(Qt::black, this,"background color"); + Opie::OColorPopupMenu* penColorPopupMenu2 = new Opie::OColorPopupMenu(Qt::black, this,"background color"); connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this, SLOT(changeBackgroundColor(const QColor&))); penColorPopupMenu2->exec(); #endif } void Konsole::changeBackgroundColor(const QColor &color) { qDebug("Change background"); Config cfg("Qkonsole"); cfg.setGroup("Colors"); diff --git a/core/apps/embeddedkonsole/main.cpp b/core/apps/embeddedkonsole/main.cpp index a6a079c..fe30b7e 100644 --- a/core/apps/embeddedkonsole/main.cpp +++ b/core/apps/embeddedkonsole/main.cpp @@ -12,28 +12,18 @@ /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */ /* */ /* ---------------------------------------------------------------------- */ /* */ /* Ported Konsole to Qt/Embedded */ /* */ /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ /* */ /* -------------------------------------------------------------------------- */ #include "konsole.h" -#include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> - -#include <qfile.h> - -#include <unistd.h> -#include <stdio.h> -#include <stdlib.h> - -#include <pwd.h> -#include <sys/types.h> +#include <opie2/oapplicationfactory.h> /* --| main |------------------------------------------------------ */ OPIE_EXPORT_APP( OApplicationFactory<Konsole> ) diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control index 5807cd1..a338e19 100644 --- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control +++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control @@ -1,10 +1,10 @@ Package: opie-embeddedkonsole Files: plugins/application/libembeddedkonsole.so* bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole Priority: optional Section: opie/applications Maintainer: L.J. Potter <lpotter@trolltech.com> Architecture: arm -Depends: task-opie-minimal, libopie1, opie-keytabs +Depends: task-opie-minimal, libopiecore2, libqtaux2, opie-keytabs Description: KDE's konsole (shell terminal) Ported to the Opie environment. Version: $QPE_VERSION$EXTRAVERSION |