summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-11-08 13:25:26 (UTC)
committer llornkcor <llornkcor>2002-11-08 13:25:26 (UTC)
commitada5be67fec81ed8845a6f358bbf7e3b181d417e (patch) (unidiff)
tree7534fb32838b3323f64328f863d621d959b716fb
parent8714e7c5271b80bf61de10f3726bce8b6a85127f (diff)
downloadopie-ada5be67fec81ed8845a6f358bbf7e3b181d417e.zip
opie-ada5be67fec81ed8845a6f358bbf7e3b181d417e.tar.gz
opie-ada5be67fec81ed8845a6f358bbf7e3b181d417e.tar.bz2
option for beep
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/TEWidget.cpp7
-rw-r--r--core/apps/embeddedkonsole/TEWidget.h11
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp68
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
@@ -331,9 +331,10 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
331 font_h = 1; 331 font_h = 1;
332 font_a = 1; 332 font_a = 1;
333 word_selection_mode = FALSE; 333 word_selection_mode = FALSE;
334 hposition = 0; 334 hposition = 0;
335vcolumns = 0; 335 vcolumns = 0;
336 useBeep = true;
336 337
337 setMouseMarks(TRUE); 338 setMouseMarks(TRUE);
338 setVTFont( QFont("fixed") ); 339 setVTFont( QFont("fixed") );
339 setColorTable(base_color_table); // init color table 340 setColorTable(base_color_table); // init color table
@@ -1106,9 +1107,11 @@ void TEWidget::frameChanged()
1106void TEWidget::Bell() 1107void TEWidget::Bell()
1107{ 1108{
1108//#ifdef QT_QWS_SHARP 1109//#ifdef QT_QWS_SHARP
1109//# ifndef QT_NO_COP 1110//# ifndef QT_NO_COP
1110 QCopEnvelope( "QPE/TaskBar", "soundAlarm()" ); 1111 if(useBeep)
1112 QCopEnvelope( "QPE/TaskBar", "soundAlarm()" );
1113
1111//# endif 1114//# endif
1112//#else 1115//#else
1113//# ifndef QT_NO_SOUND 1116//# ifndef QT_NO_SOUND
1114// QSound::play(Resource::findSound("alarm")); 1117// 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,22 +52,15 @@ public:
52 52
53 const ColorEntry* getColorTable() const; 53 const ColorEntry* getColorTable() const;
54 const ColorEntry* getdefaultColorTable() const; 54 const ColorEntry* getdefaultColorTable() const;
55 void setColorTable(const ColorEntry table[]); 55 void setColorTable(const ColorEntry table[]);
56
57 void setScrollbarLocation(int loc); 56 void setScrollbarLocation(int loc);
58 enum { SCRNONE=0, SCRLEFT=1, SCRRIGHT=2 }; 57 enum { SCRNONE=0, SCRLEFT=1, SCRRIGHT=2 };
59
60 void setScroll(int cursor, int lines); 58 void setScroll(int cursor, int lines);
61 void doScroll(int lines); 59 void doScroll(int lines);
62
63 void doHScroll(int lines); 60 void doHScroll(int lines);
64
65
66 void emitSelection(); 61 void emitSelection();
67 void setWrapAt(int columns); 62 void setWrapAt(int columns);
68
69public:
70 63
71 void setImage(const ca* const newimg, int lines, int columns); 64 void setImage(const ca* const newimg, int lines, int columns);
72 65
73 int Lines() { return lines; } 66 int Lines() { return lines; }
@@ -78,10 +71,10 @@ public:
78 QSize calcSize(int cols, int lins) const; 71 QSize calcSize(int cols, int lins) const;
79 72
80 QSize sizeHint() const; 73 QSize sizeHint() const;
81 74
82public:
83 bool useHorzScroll; 75 bool useHorzScroll;
76 bool useBeep;
84 77
85 void Bell(); 78 void Bell();
86 void emitText(QString text); 79 void emitText(QString text);
87 void pasteClipboard(); 80 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)
370 370
371 configMenu->insertItem(tr( "ScrollBar" ),scrollMenu); 371 configMenu->insertItem(tr( "ScrollBar" ),scrollMenu);
372 372
373 configMenu->insertItem(tr( "Wrap" )); 373 configMenu->insertItem(tr( "Wrap" ));
374 int jut = configMenu->insertItem(tr( "Use Beep" ));
375 cfg.setGroup("Menubar");
376 configMenu->setItemChecked(jut, cfg.readBoolEntry("useBeep",0));
377
374 378
375//scrollMenuSelected(-29); 379//scrollMenuSelected(-29);
376// cfg.setGroup("ScrollBar"); 380// cfg.setGroup("ScrollBar");
377// if(cfg.readBoolEntry("HorzScroll",0)) { 381// if(cfg.readBoolEntry("HorzScroll",0)) {
@@ -786,36 +790,36 @@ void Konsole::colorMenuSelected(int iD)
786} 790}
787 791
788void Konsole::configMenuSelected(int iD) 792void Konsole::configMenuSelected(int iD)
789{ 793{
790// QString temp; 794// QString temp;
791// qDebug( temp.sprintf("configmenu %d",iD)); 795// qDebug( temp.sprintf("configmenu %d",iD));
792 TEWidget* te = getTe(); 796 TEWidget* te = getTe();
793 Config cfg("Konsole"); 797 Config cfg("Konsole");
794 cfg.setGroup("Menubar"); 798 cfg.setGroup("Menubar");
795 if( iD == -4) { 799 int i,j;
796 cfg.setGroup("Tabs");
797 QString tmp=cfg.readEntry("Position","Bottom");
798
799 if(tmp=="Top") {
800 tab->setTabPosition(QTabWidget::Bottom);
801 configMenu->changeItem( iD,"Tabs on Top");
802 cfg.writeEntry("Position","Bottom");
803 } else {
804 tab->setTabPosition(QTabWidget::Top);
805 configMenu->changeItem( iD,"Tabs on Bottom");
806 cfg.writeEntry("Position","Top");
807 }
808 }
809 int i;
810#ifdef QWS_QT_OPIE 800#ifdef QWS_QT_OPIE
811i=-29; 801 i=-29;j=-30;
812#else 802#else
813i=-28; 803 i=-28;j=-29;
814#endif 804#endif
815 805
816 if( iD == i) { 806 if(iD == -4) {
817 cfg.setGroup("ScrollBar"); 807 cfg.setGroup("Tabs");
808 QString tmp=cfg.readEntry("Position","Bottom");
809
810 if(tmp=="Top") {
811 tab->setTabPosition(QTabWidget::Bottom);
812 configMenu->changeItem( iD,"Tabs on Top");
813 cfg.writeEntry("Position","Bottom");
814 } else {
815 tab->setTabPosition(QTabWidget::Top);
816 configMenu->changeItem( iD,"Tabs on Bottom");
817 cfg.writeEntry("Position","Top");
818 }
819 }
820 if(iD == i) {
821 cfg.setGroup("ScrollBar");
818 bool b=cfg.readBoolEntry("HorzScroll",0); 822 bool b=cfg.readBoolEntry("HorzScroll",0);
819 b=!b; 823 b=!b;
820 cfg.writeEntry("HorzScroll", b ); 824 cfg.writeEntry("HorzScroll", b );
821 cfg.write(); 825 cfg.write();
@@ -825,9 +829,18 @@ i=-28;
825 } else { 829 } else {
826 te->setScrollbarLocation(0); 830 te->setScrollbarLocation(0);
827 } 831 }
828 te->setScrollbarLocation( cfg.readNumEntry("Position",2)); 832 te->setScrollbarLocation( cfg.readNumEntry("Position",2));
829 } 833 }
834 if(iD == j) {
835 cfg.setGroup("Menubar");
836 bool b=cfg.readBoolEntry("useBeep",0);
837 b=!b;
838 cfg.writeEntry("useBeep", b );
839 cfg.write();
840 configMenu->setItemChecked(j,b);
841 te->useBeep=b;
842 }
830} 843}
831 844
832void Konsole::changeCommand(const QString &text, int c) 845void Konsole::changeCommand(const QString &text, int c)
833{ 846{
@@ -980,11 +993,11 @@ void Konsole::changeForegroundColor(const QColor &color) {
980 cfg.setGroup("Colors"); 993 cfg.setGroup("Colors");
981 int r, g, b; 994 int r, g, b;
982 color.rgb(&r,&g,&b); 995 color.rgb(&r,&g,&b);
983 foreground.setRgb(r,g,b); 996 foreground.setRgb(r,g,b);
984// QString colors; 997
985// colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
986 cfg.writeEntry("foreground",color.name()); 998 cfg.writeEntry("foreground",color.name());
999 qDebug("foreground "+color.name());
987 cfg.write(); 1000 cfg.write();
988 1001
989qDebug("do other dialog"); 1002qDebug("do other dialog");
990#ifdef QWS_QT_OPIE 1003#ifdef QWS_QT_OPIE
@@ -1003,11 +1016,10 @@ void Konsole::changeBackgroundColor(const QColor &color) {
1003 cfg.setGroup("Colors"); 1016 cfg.setGroup("Colors");
1004 int r, g, b; 1017 int r, g, b;
1005 color.rgb(&r,&g,&b); 1018 color.rgb(&r,&g,&b);
1006 background.setRgb(r,g,b); 1019 background.setRgb(r,g,b);
1007// QString colors;
1008// colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
1009 cfg.writeEntry("background",color.name()); 1020 cfg.writeEntry("background",color.name());
1021 qDebug("background "+color.name());
1010 cfg.write(); 1022 cfg.write();
1011} 1023}
1012 1024
1013void Konsole::doWrap() { 1025void Konsole::doWrap() {
@@ -1024,9 +1036,9 @@ i=-28;
1024 if( !cfg.readBoolEntry("HorzScroll",0)) { 1036 if( !cfg.readBoolEntry("HorzScroll",0)) {
1025 te->setWrapAt(0); 1037 te->setWrapAt(0);
1026 configMenu->setItemChecked( i,TRUE); 1038 configMenu->setItemChecked( i,TRUE);
1027 } else { 1039 } else {
1028 te->setWrapAt(90); 1040// te->setWrapAt(90);
1029// te->setWrapAt(120); 1041 te->setWrapAt(120);
1030 configMenu->setItemChecked( i,FALSE); 1042 configMenu->setItemChecked( i,FALSE);
1031 } 1043 }
1032} 1044}