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
@@ -29,16 +29,17 @@ SOURCES   = TEScreen.cpp \
       playlistselection.cpp \
       MyPty.cpp \
       main.cpp 
 INTERFACES =  commandeditdialogbase.ui smallcommandeditdialogbase.ui
 TARGET    = embeddedkonsole
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
+TMAKE_CXXFLAGS += -DQT_QWS_OPIE
 
 TRANSLATIONS = ../../../i18n/de/embeddedkonsole.ts \
         ../../../i18n/en/embeddedkonsole.ts \
         ../../../i18n/es/embeddedkonsole.ts \
         ../../../i18n/fr/embeddedkonsole.ts \
         ../../../i18n/hu/embeddedkonsole.ts \
         ../../../i18n/ja/embeddedkonsole.ts \
         ../../../i18n/ko/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
@@ -14,17 +14,17 @@
 /* ---------------------------------------------------------------------- */
 /*                        */
 /* Ported Konsole to Qt/Embedded                                              */
 /*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
 /*                        */
 /* -------------------------------------------------------------------------- */
 // enhancements added by L.J. Potter <ljp@llornkcor.com>
-#define QWS_QT_OPIE
+//#define QT_QWS_OPIE
 
 #include <qpe/resource.h>
 
 #include <qdir.h>
 #include <qevent.h>
 #include <qdragobject.h>
 #include <qobjectlist.h>
 #include <qtoolbutton.h>
@@ -50,17 +50,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 
 #include "konsole.h"
 #include "keytrans.h"
 #include "commandeditdialog.h"
 
-#ifdef  QWS_QT_OPIE
+#ifdef  QT_QWS_OPIE
 #include <opie/colorpopupmenu.h>
 #endif
 
 class EKNumTabBar : public QTabBar {
 public:
     void numberTabs()
     {
   // Yes, it really is this messy. QTabWidget needs functions
@@ -291,17 +291,17 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   colorMenu->insertItem(tr( "Green on Yellow"));
   colorMenu->insertItem(tr( "Blue on Magenta"));
   colorMenu->insertItem(tr( "Magenta on Blue"));
   colorMenu->insertItem(tr( "Cyan on White"));
   colorMenu->insertItem(tr( "White on Cyan"));
   colorMenu->insertItem(tr( "Blue on Black"));
   colorMenu->insertItem(tr( "Amber on Black"));
 
-#ifdef QWS_QT_OPIE
+#ifdef QT_QWS_OPIE
   colorMenu->insertItem(tr( "Custom"));
 #endif
   
   configMenu->insertItem(tr( "Colors") ,colorMenu);
 
   connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) ));
   connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) ));
   connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) ));
@@ -365,18 +365,21 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   scrollMenu->insertItem(tr( "None" ));
   scrollMenu->insertItem(tr( "Left" ));
   scrollMenu->insertItem(tr( "Right" ));
 //   scrollMenu->insertSeparator(4);
 //   scrollMenu->insertItem(tr( "Horizontal" ));
  
   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));
 
   
 //scrollMenuSelected(-29);
 //   cfg.setGroup("ScrollBar");
 //   if(cfg.readBoolEntry("HorzScroll",0)) {
 //       if(cfg.readNumEntry("Position",2) == 0)
@@ -748,17 +751,17 @@ void Konsole::colorMenuSelected(int iD)
             colorMenu->setItemChecked(-17,TRUE);
         }
         if(iD==-18) {// Black, Gold
             background.setRgb(0x00,0x00,0x00);
             foreground.setRgb(255,215,0);
             cfg.writeEntry("Schema","18");
             colorMenu->setItemChecked(-18,TRUE);
         }
-#ifdef QWS_QT_OPIE        
+#ifdef QT_QWS_OPIE        
         if(iD==-19) {
 // Custom
             qDebug("do custom");
             if(fromMenu) {
             ColorPopupMenu* penColorPopupMenu = new ColorPopupMenu(Qt::black, this, "foreground color");
             connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this,
                     SLOT(changeForegroundColor(const QColor&)));
             penColorPopupMenu->exec();
@@ -792,17 +795,17 @@ void Konsole::colorMenuSelected(int iD)
 void Konsole::configMenuSelected(int iD)
 {
 //     QString temp;
 //     qDebug( temp.sprintf("configmenu %d",iD));
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("Menubar");
     int i,j;
-#ifdef QWS_QT_OPIE
+#ifdef QT_QWS_OPIE
     i=-29;j=-30;
 #else
     i=-28;j=-29;
 #endif
 
     if(iD == -4) {
           cfg.setGroup("Tabs");
           QString tmp=cfg.readEntry("Position","Bottom");
@@ -995,17 +998,17 @@ void Konsole::changeForegroundColor(const QColor &color) {
     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 QWS_QT_OPIE
+#ifdef QT_QWS_OPIE
 
  ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color");
     connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
             SLOT(changeBackgroundColor(const QColor&)));
    penColorPopupMenu2->exec();
 #endif
 }
 
@@ -1019,17 +1022,17 @@ void Konsole::changeBackgroundColor(const QColor &color) {
     background.setRgb(r,g,b);
     cfg.writeEntry("background",color.name());
     qDebug("background "+color.name());
     cfg.write();
 }
 
 void Konsole::doWrap() {
 int i;
-#ifdef QWS_QT_OPIE
+#ifdef QT_QWS_OPIE
 i=-29;
 #else
 i=-28;
 #endif
     
  Config cfg("Konsole");
     cfg.setGroup("ScrollBar");
     TEWidget* te = getTe();