option for beep

3 files changed, 47 insertions, 39 deletions

diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index 4c6ea2a..c220e11 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -327,17 +327,18 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
   image    = 0;
   lines    = 1;
   columns  = 1;
   font_w   = 1;
   font_h   = 1;
   font_a   = 1;
   word_selection_mode = FALSE;
   hposition = 0;
-vcolumns = 0;
+  vcolumns = 0;
+  useBeep = true;
  
   setMouseMarks(TRUE);
   setVTFont( QFont("fixed") );
   setColorTable(base_color_table); // init color table
 
   qApp->installEventFilter( this ); //FIXME: see below
 //  KCursor::setAutoHideCursor( this, true );
 
@@ -1102,17 +1103,19 @@ void TEWidget::frameChanged()
 /*                                   Sound                                   */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 void TEWidget::Bell()
 {
 //#ifdef QT_QWS_SHARP
 //# ifndef QT_NO_COP
-    QCopEnvelope( "QPE/TaskBar", "soundAlarm()" );
+    if(useBeep) 
+        QCopEnvelope( "QPE/TaskBar", "soundAlarm()" );
+    
 //# endif
 //#else
 //# ifndef QT_NO_SOUND
 //    QSound::play(Resource::findSound("alarm"));
 //# endif
 //#endif    
 
 //    QApplication::beep();
diff --git a/core/apps/embeddedkonsole/TEWidget.h b/core/apps/embeddedkonsole/TEWidget.h
index a480d45..5597f27 100644
--- a/core/apps/embeddedkonsole/TEWidget.h
+++ b/core/apps/embeddedkonsole/TEWidget.h
@@ -48,44 +48,37 @@ public:
 
 public:
 
     QColor getDefaultBackColor();
 
     const ColorEntry* getColorTable() const;
     const ColorEntry* getdefaultColorTable() const;
     void              setColorTable(const ColorEntry table[]);
-
     void setScrollbarLocation(int loc);
     enum { SCRNONE=0, SCRLEFT=1, SCRRIGHT=2 };
-
     void setScroll(int cursor, int lines);
     void doScroll(int lines);
-
     void doHScroll(int lines);
-
-    
     void emitSelection();
-  void setWrapAt(int columns);
-
-public:
+    void setWrapAt(int columns);
 
     void setImage(const ca* const newimg, int lines, int columns);
 
     int  Lines()   { return lines;   }
     int  Columns() { return columns; }
 
     void calcGeometry();
     void propagateSize();
     QSize calcSize(int cols, int lins) const;
 
     QSize sizeHint() const;
 
-public:
     bool useHorzScroll;
+    bool useBeep;
 
     void Bell();
     void emitText(QString text);
     void pasteClipboard();
 
 signals:
 
     void keyPressedSignal(QKeyEvent *e);
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index 5a68c81..ebff05e 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -366,16 +366,20 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   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" ));
+  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)
 //           te->setScrollbarLocation(1);
 //       else
 //           te->setScrollbarLocation(0);
@@ -782,56 +786,65 @@ void Konsole::colorMenuSelected(int iD)
     lastSelectedMenu = iD;
     te->setColorTable(m_table);
     update();
 
 }
 
 void Konsole::configMenuSelected(int iD)
 {
-//         QString temp;
-//         qDebug( temp.sprintf("configmenu %d",iD));
+//     QString temp;
+//     qDebug( temp.sprintf("configmenu %d",iD));
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("Menubar");
-    if( iD  == -4) {
-        cfg.setGroup("Tabs");
-        QString tmp=cfg.readEntry("Position","Bottom");
-
-        if(tmp=="Top") {
-            tab->setTabPosition(QTabWidget::Bottom);
-            configMenu->changeItem( iD,"Tabs on Top");
-            cfg.writeEntry("Position","Bottom");
-        } else {
-            tab->setTabPosition(QTabWidget::Top);
-            configMenu->changeItem( iD,"Tabs on Bottom");
-            cfg.writeEntry("Position","Top");
-        }
-    }
-    int i;
+    int i,j;
 #ifdef QWS_QT_OPIE
-i=-29;
+    i=-29;j=-30;
 #else
-i=-28;
+    i=-28;j=-29;
 #endif
 
-    if( iD  == i) {
-    cfg.setGroup("ScrollBar");
+    if(iD == -4) {
+          cfg.setGroup("Tabs");
+          QString tmp=cfg.readEntry("Position","Bottom");
+
+          if(tmp=="Top") {
+              tab->setTabPosition(QTabWidget::Bottom);
+              configMenu->changeItem( iD,"Tabs on Top");
+              cfg.writeEntry("Position","Bottom");
+          } else {
+              tab->setTabPosition(QTabWidget::Top);
+              configMenu->changeItem( iD,"Tabs on Bottom");
+              cfg.writeEntry("Position","Top");
+          }
+      }
+      if(iD == i) {
+          cfg.setGroup("ScrollBar");
           bool b=cfg.readBoolEntry("HorzScroll",0);
           b=!b;
           cfg.writeEntry("HorzScroll", b );
           cfg.write();
           doWrap();
           if(cfg.readNumEntry("Position",2) == 0) {
               te->setScrollbarLocation(1);
           } else {
               te->setScrollbarLocation(0);
           }
           te->setScrollbarLocation( cfg.readNumEntry("Position",2));
-    }   
+      }
+      if(iD ==  j) {
+          cfg.setGroup("Menubar");
+          bool b=cfg.readBoolEntry("useBeep",0);
+          b=!b;
+          cfg.writeEntry("useBeep", b );
+          cfg.write();
+          configMenu->setItemChecked(j,b);
+          te->useBeep=b;
+      }
 }
 
 void Konsole::changeCommand(const QString &text, int c)
 {
     Config cfg("Konsole");
     cfg.setGroup("Commands");
     if(commonCmds[c] != text) {
         cfg.writeEntry(QString::number(c),text);
@@ -976,19 +989,19 @@ void Konsole::parseCommandLine() {
 }
 
 void Konsole::changeForegroundColor(const QColor &color) {
     Config cfg("Konsole");
     cfg.setGroup("Colors");
     int r, g, b;
     color.rgb(&r,&g,&b);
     foreground.setRgb(r,g,b);
-//     QString colors;
-//     colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
+
     cfg.writeEntry("foreground",color.name());
+    qDebug("foreground "+color.name());
     cfg.write();
 
 qDebug("do other dialog");
 #ifdef QWS_QT_OPIE
 
  ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color");
     connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
             SLOT(changeBackgroundColor(const QColor&)));
@@ -999,19 +1012,18 @@ qDebug("do other dialog");
 void Konsole::changeBackgroundColor(const QColor &color) {
 
     qDebug("Change background");
     Config cfg("Konsole");
     cfg.setGroup("Colors");
     int r, g, b;
     color.rgb(&r,&g,&b);
     background.setRgb(r,g,b);
-//     QString colors;
-//     colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
     cfg.writeEntry("background",color.name());
+    qDebug("background "+color.name());
     cfg.write();
 }
 
 void Konsole::doWrap() {
 int i;
 #ifdef QWS_QT_OPIE
 i=-29;
 #else
@@ -1020,13 +1032,13 @@ i=-28;
     
  Config cfg("Konsole");
     cfg.setGroup("ScrollBar");
     TEWidget* te = getTe();
     if( !cfg.readBoolEntry("HorzScroll",0)) {
         te->setWrapAt(0);
         configMenu->setItemChecked( i,TRUE);
     } else {
-        te->setWrapAt(90);
-//        te->setWrapAt(120);
+//        te->setWrapAt(90);
+        te->setWrapAt(120);
         configMenu->setItemChecked( i,FALSE);
     }       
 }