| -rwxr-xr-x | core/apps/embeddedkonsole/embeddedkonsole.pro | 1 | ||||
| -rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 21 |
2 files changed, 13 insertions, 9 deletions
diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro index bfa16a2..913cb89 100755 --- a/core/apps/embeddedkonsole/embeddedkonsole.pro +++ b/core/apps/embeddedkonsole/embeddedkonsole.pro @@ -36,2 +36,3 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopie +TMAKE_CXXFLAGS += -DQT_QWS_OPIE diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index ebff05e..4480fe2 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp @@ -21,3 +21,3 @@ // enhancements added by L.J. Potter <ljp@llornkcor.com> -#define QWS_QT_OPIE +//#define QT_QWS_OPIE @@ -57,3 +57,3 @@ -#ifdef QWS_QT_OPIE +#ifdef QT_QWS_OPIE #include <opie/colorpopupmenu.h> @@ -298,3 +298,3 @@ void Konsole::init(const char* _pgm, QStrList & _args) -#ifdef QWS_QT_OPIE +#ifdef QT_QWS_OPIE colorMenu->insertItem(tr( "Custom")); @@ -372,4 +372,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) - configMenu->insertItem(tr( "Wrap" )); - int jut = configMenu->insertItem(tr( "Use Beep" )); + int jut = configMenu->insertItem(tr( "Wrap" )); + cfg.setGroup("ScrollBar"); + configMenu->setItemChecked(jut, cfg.readBoolEntry("HorzScroll",0)); + + jut = configMenu->insertItem(tr( "Use Beep" )); cfg.setGroup("Menubar"); @@ -755,3 +758,3 @@ void Konsole::colorMenuSelected(int iD) } -#ifdef QWS_QT_OPIE +#ifdef QT_QWS_OPIE if(iD==-19) { @@ -799,3 +802,3 @@ void Konsole::configMenuSelected(int iD) int i,j; -#ifdef QWS_QT_OPIE +#ifdef QT_QWS_OPIE i=-29;j=-30; @@ -1002,3 +1005,3 @@ void Konsole::changeForegroundColor(const QColor &color) { qDebug("do other dialog"); -#ifdef QWS_QT_OPIE +#ifdef QT_QWS_OPIE @@ -1026,3 +1029,3 @@ void Konsole::doWrap() { int i; -#ifdef QWS_QT_OPIE +#ifdef QT_QWS_OPIE i=-29; |