author | llornkcor <llornkcor> | 2002-11-08 13:25:26 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-08 13:25:26 (UTC) |
commit | ada5be67fec81ed8845a6f358bbf7e3b181d417e (patch) (side-by-side diff) | |
tree | 7534fb32838b3323f64328f863d621d959b716fb /core | |
parent | 8714e7c5271b80bf61de10f3726bce8b6a85127f (diff) | |
download | opie-ada5be67fec81ed8845a6f358bbf7e3b181d417e.zip opie-ada5be67fec81ed8845a6f358bbf7e3b181d417e.tar.gz opie-ada5be67fec81ed8845a6f358bbf7e3b181d417e.tar.bz2 |
option for beep
-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.cpp | 3 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.h | 9 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 38 |
3 files changed, 29 insertions, 21 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 @@ -332,8 +332,9 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name) font_a = 1; word_selection_mode = FALSE; hposition = 0; vcolumns = 0; + useBeep = true; setMouseMarks(TRUE); setVTFont( QFont("fixed") ); setColorTable(base_color_table); // init color table @@ -1106,9 +1107,11 @@ void TEWidget::frameChanged() void TEWidget::Bell() { //#ifdef QT_QWS_SHARP //# ifndef QT_NO_COP + if(useBeep) QCopEnvelope( "QPE/TaskBar", "soundAlarm()" ); + //# endif //#else //# ifndef QT_NO_SOUND // QSound::play(Resource::findSound("alarm")); 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 @@ -52,23 +52,16 @@ public: 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 setImage(const ca* const newimg, int lines, int columns); int Lines() { return lines; } int Columns() { return columns; } @@ -78,10 +71,10 @@ public: QSize calcSize(int cols, int lins) const; QSize sizeHint() const; -public: bool useHorzScroll; + bool useBeep; void Bell(); void emitText(QString text); void pasteClipboard(); 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 @@ -370,8 +370,12 @@ void Konsole::init(const char* _pgm, QStrList & _args) 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)) { @@ -791,8 +795,15 @@ void Konsole::configMenuSelected(int iD) // qDebug( temp.sprintf("configmenu %d",iD)); TEWidget* te = getTe(); Config cfg("Konsole"); cfg.setGroup("Menubar"); + int i,j; +#ifdef QWS_QT_OPIE + i=-29;j=-30; +#else + i=-28;j=-29; +#endif + if( iD == -4) { cfg.setGroup("Tabs"); QString tmp=cfg.readEntry("Position","Bottom"); @@ -805,15 +816,8 @@ void Konsole::configMenuSelected(int iD) configMenu->changeItem( iD,"Tabs on Bottom"); cfg.writeEntry("Position","Top"); } } - int i; -#ifdef QWS_QT_OPIE -i=-29; -#else -i=-28; -#endif - if( iD == i) { cfg.setGroup("ScrollBar"); bool b=cfg.readBoolEntry("HorzScroll",0); b=!b; @@ -826,8 +830,17 @@ i=-28; 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) { @@ -980,11 +993,11 @@ void Konsole::changeForegroundColor(const QColor &color) { 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 @@ -1003,11 +1016,10 @@ void Konsole::changeBackgroundColor(const QColor &color) { 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() { @@ -1024,9 +1036,9 @@ i=-28; 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); } } |