small changes

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
@@ -35,4 +35,5 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
+TMAKE_CXXFLAGS += -DQT_QWS_OPIE
 
 TRANSLATIONS = ../../../i18n/de/embeddedkonsole.ts \
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
@@ -20,5 +20,5 @@
 /* -------------------------------------------------------------------------- */
 // enhancements added by L.J. Potter <ljp@llornkcor.com>
-#define QWS_QT_OPIE
+//#define QT_QWS_OPIE
 
 #include <qpe/resource.h>
@@ -56,5 +56,5 @@
 #include "commandeditdialog.h"
 
-#ifdef  QWS_QT_OPIE
+#ifdef  QT_QWS_OPIE
 #include <opie/colorpopupmenu.h>
 #endif
@@ -297,5 +297,5 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   colorMenu->insertItem(tr( "Amber on Black"));
 
-#ifdef QWS_QT_OPIE
+#ifdef QT_QWS_OPIE
   colorMenu->insertItem(tr( "Custom"));
 #endif
@@ -371,6 +371,9 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   configMenu->insertItem(tr( "ScrollBar" ),scrollMenu);
 
-  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");
   configMenu->setItemChecked(jut, cfg.readBoolEntry("useBeep",0));
@@ -754,5 +757,5 @@ void Konsole::colorMenuSelected(int iD)
             colorMenu->setItemChecked(-18,TRUE);
         }
-#ifdef QWS_QT_OPIE        
+#ifdef QT_QWS_OPIE        
         if(iD==-19) {
 // Custom
@@ -798,5 +801,5 @@ void Konsole::configMenuSelected(int iD)
     cfg.setGroup("Menubar");
     int i,j;
-#ifdef QWS_QT_OPIE
+#ifdef QT_QWS_OPIE
     i=-29;j=-30;
 #else
@@ -1001,5 +1004,5 @@ void Konsole::changeForegroundColor(const QColor &color) {
 
 qDebug("do other dialog");
-#ifdef QWS_QT_OPIE
+#ifdef QT_QWS_OPIE
 
  ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color");
@@ -1025,5 +1028,5 @@ void Konsole::changeBackgroundColor(const QColor &color) {
 void Konsole::doWrap() {
 int i;
-#ifdef QWS_QT_OPIE
+#ifdef QT_QWS_OPIE
 i=-29;
 #else