summaryrefslogtreecommitdiff
path: root/core
authorllornkcor <llornkcor>2002-11-08 13:25:26 (UTC)
committer llornkcor <llornkcor>2002-11-08 13:25:26 (UTC)
commitada5be67fec81ed8845a6f358bbf7e3b181d417e (patch) (side-by-side diff)
tree7534fb32838b3323f64328f863d621d959b716fb /core
parent8714e7c5271b80bf61de10f3726bce8b6a85127f (diff)
downloadopie-ada5be67fec81ed8845a6f358bbf7e3b181d417e.zip
opie-ada5be67fec81ed8845a6f358bbf7e3b181d417e.tar.gz
opie-ada5be67fec81ed8845a6f358bbf7e3b181d417e.tar.bz2
option for beep
Diffstat (limited to 'core') (more/less context) (show whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/TEWidget.cpp3
-rw-r--r--core/apps/embeddedkonsole/TEWidget.h9
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp38
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
@@ -333,6 +333,7 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
word_selection_mode = FALSE;
hposition = 0;
vcolumns = 0;
+ useBeep = true;
setMouseMarks(TRUE);
setVTFont( QFont("fixed") );
@@ -1107,7 +1108,9 @@ void TEWidget::Bell()
{
//#ifdef QT_QWS_SHARP
//# ifndef QT_NO_COP
+ if(useBeep)
QCopEnvelope( "QPE/TaskBar", "soundAlarm()" );
+
//# endif
//#else
//# ifndef QT_NO_SOUND
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
@@ -53,21 +53,14 @@ 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; }
@@ -79,8 +72,8 @@ public:
QSize sizeHint() const;
-public:
bool useHorzScroll;
+ bool useBeep;
void Bell();
void emitText(QString text);
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
@@ -371,6 +371,10 @@ 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");
@@ -792,6 +796,13 @@ void Konsole::configMenuSelected(int 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");
@@ -806,13 +817,6 @@ void Konsole::configMenuSelected(int iD)
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);
@@ -827,6 +831,15 @@ i=-28;
}
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)
@@ -981,9 +994,9 @@ void Konsole::changeForegroundColor(const QColor &color) {
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");
@@ -1004,9 +1017,8 @@ void Konsole::changeBackgroundColor(const QColor &color) {
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();
}
@@ -1025,8 +1037,8 @@ i=-28;
te->setWrapAt(0);
configMenu->setItemChecked( i,TRUE);
} else {
- te->setWrapAt(90);
-// te->setWrapAt(120);
+// te->setWrapAt(90);
+ te->setWrapAt(120);
configMenu->setItemChecked( i,FALSE);
}
}