summaryrefslogtreecommitdiff
path: root/core/apps/embeddedkonsole/konsole.cpp
Unidiff
Diffstat (limited to 'core/apps/embeddedkonsole/konsole.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp12
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
@@ -21,12 +21,16 @@
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>
@@ -60,16 +64,12 @@
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
70class EKNumTabBar : public QTabBar 70class EKNumTabBar : public QTabBar
71{ 71{
72public: 72public:
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 {}
@@ -1524,13 +1524,13 @@ void Konsole::colorMenuSelected(int iD)
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 {
@@ -1875,13 +1875,13 @@ void Konsole::changeForegroundColor(const QColor &color)
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