author | llornkcor <llornkcor> | 2002-10-31 20:10:52 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-31 20:10:52 (UTC) |
commit | ab5a63544deead5206ca47ff8bf94123aa032281 (patch) (unidiff) | |
tree | b28514032d605dc28a5bffbd6918066c81fff74f | |
parent | 16d3fac9169e400f5542ca0e3aa993cc5c5db574 (diff) | |
download | opie-ab5a63544deead5206ca47ff8bf94123aa032281.zip opie-ab5a63544deead5206ca47ff8bf94123aa032281.tar.gz opie-ab5a63544deead5206ca47ff8bf94123aa032281.tar.bz2 |
no wrap and horz scroll should work, thanks to console
-rw-r--r-- | core/apps/embeddedkonsole/TEHistory.h | 0 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/TEScreen.h | 8 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.cpp | 3 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/TEmulation.h | 1 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 68 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.h | 1 |
6 files changed, 62 insertions, 19 deletions
diff --git a/core/apps/embeddedkonsole/TEHistory.h b/core/apps/embeddedkonsole/TEHistory.h index 8339ec6..11eb150 100644 --- a/core/apps/embeddedkonsole/TEHistory.h +++ b/core/apps/embeddedkonsole/TEHistory.h | |||
diff --git a/core/apps/embeddedkonsole/TEScreen.h b/core/apps/embeddedkonsole/TEScreen.h index ba47ee5..a28f7c5 100644 --- a/core/apps/embeddedkonsole/TEScreen.h +++ b/core/apps/embeddedkonsole/TEScreen.h | |||
@@ -142,2 +142,3 @@ public: // these are all `Screen' operations | |||
142 | int getLines() { return lines; } | 142 | int getLines() { return lines; } |
143 | |||
143 | /*! return the number of columns. */ | 144 | /*! return the number of columns. */ |
@@ -150,2 +151,7 @@ public: // these are all `Screen' operations | |||
150 | 151 | ||
152 | /*! set the position of the horizontal cursor. */ | ||
153 | void setHorzCursor(int cursor); | ||
154 | /*! return the position of the horizontal cursor. */ | ||
155 | int getHorzCursor(); | ||
156 | |||
151 | int getHistLines (); | 157 | int getHistLines (); |
@@ -202,2 +208,4 @@ private: | |||
202 | 208 | ||
209 | int horzCursor; | ||
210 | |||
203 | // cursor location | 211 | // cursor location |
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp index c10c7a8..60021f4 100644 --- a/core/apps/embeddedkonsole/TEWidget.cpp +++ b/core/apps/embeddedkonsole/TEWidget.cpp | |||
@@ -334,2 +334,3 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name) | |||
334 | hposition = 0; | 334 | hposition = 0; |
335 | vcolumns = 0; | ||
335 | 336 | ||
@@ -1405,3 +1406 @@ void TEWidget::setWrapAt(int columns) | |||
1405 | } | } | |
1406 | |||
1407 | |||
diff --git a/core/apps/embeddedkonsole/TEmulation.h b/core/apps/embeddedkonsole/TEmulation.h index ec15e7a..bf43f11 100644 --- a/core/apps/embeddedkonsole/TEmulation.h +++ b/core/apps/embeddedkonsole/TEmulation.h | |||
@@ -44,2 +44,3 @@ public slots: // signals incoming from TEWidget | |||
44 | virtual void onHistoryCursorChange(int cursor); | 44 | virtual void onHistoryCursorChange(int cursor); |
45 | virtual void onHorzCursorChange(int cursor); | ||
45 | virtual void onKeyPress(QKeyEvent*); | 46 | virtual void onKeyPress(QKeyEvent*); |
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index 3c87ad4..16db0ea 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -360,6 +360,9 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
360 | scrollMenu->insertItem(tr( "Right" )); | 360 | scrollMenu->insertItem(tr( "Right" )); |
361 | scrollMenu->insertSeparator(4); | 361 | // scrollMenu->insertSeparator(4); |
362 | scrollMenu->insertItem(tr( "Horizontal" )); | 362 | // scrollMenu->insertItem(tr( "Horizontal" )); |
363 | 363 | ||
364 | configMenu->insertItem(tr( "ScrollBar" ),scrollMenu); | 364 | configMenu->insertItem(tr( "ScrollBar" ),scrollMenu); |
365 | |||
366 | configMenu->insertItem(tr( "Wrap" )); | ||
367 | |||
365 | //scrollMenuSelected(-29); | 368 | //scrollMenuSelected(-29); |
@@ -401,2 +404,3 @@ void Konsole::show() | |||
401 | QMainWindow::show(); | 404 | QMainWindow::show(); |
405 | |||
402 | } | 406 | } |
@@ -610,2 +614,3 @@ void Konsole::newSession() { | |||
610 | nsessions++; | 614 | nsessions++; |
615 | doWrap(); | ||
611 | setColor(); | 616 | setColor(); |
@@ -775,4 +780,4 @@ void Konsole::configMenuSelected(int iD) | |||
775 | { | 780 | { |
776 | // QString temp; | 781 | QString temp; |
777 | // qDebug( temp.sprintf("configmenu %d",iD)); | 782 | qDebug( temp.sprintf("configmenu %d",iD)); |
778 | TEWidget* te = getTe(); | 783 | TEWidget* te = getTe(); |
@@ -794,2 +799,16 @@ void Konsole::configMenuSelected(int iD) | |||
794 | } | 799 | } |
800 | if( iD == -29) { | ||
801 | cfg.setGroup("ScrollBar"); | ||
802 | bool b=cfg.readBoolEntry("HorzScroll",0); | ||
803 | b=!b; | ||
804 | cfg.writeEntry("HorzScroll", b ); | ||
805 | cfg.write(); | ||
806 | doWrap(); | ||
807 | if(cfg.readNumEntry("Position",2) == 0) { | ||
808 | te->setScrollbarLocation(1); | ||
809 | } else { | ||
810 | te->setScrollbarLocation(0); | ||
811 | } | ||
812 | te->setScrollbarLocation( cfg.readNumEntry("Position",2)); | ||
813 | } | ||
795 | } | 814 | } |
@@ -834,16 +853,17 @@ void Konsole::scrollMenuSelected(int index) | |||
834 | break; | 853 | break; |
835 | case -29: { | 854 | // case -29: { |
836 | bool b=cfg.readBoolEntry("HorzScroll",0); | 855 | // bool b=cfg.readBoolEntry("HorzScroll",0); |
837 | cfg.writeEntry("HorzScroll", !b ); | 856 | // cfg.writeEntry("HorzScroll", !b ); |
838 | cfg.write(); | 857 | // cfg.write(); |
839 | if(cfg.readNumEntry("Position",2) == 0) | 858 | // if(cfg.readNumEntry("Position",2) == 0) { |
840 | te->setScrollbarLocation(1); | 859 | // te->setScrollbarLocation(1); |
841 | else | 860 | // te->setWrapAt(0); |
842 | te->setScrollbarLocation(0); | 861 | // } else { |
843 | te->setScrollbarLocation( cfg.readNumEntry("Position",2)); | 862 | // te->setScrollbarLocation(0); |
844 | te->setWrapAt(120); | 863 | // te->setWrapAt(120); |
845 | } | 864 | // } |
846 | break; | 865 | // te->setScrollbarLocation( cfg.readNumEntry("Position",2)); |
866 | // } | ||
867 | // break; | ||
847 | }; | 868 | }; |
848 | |||
849 | } | 869 | } |
@@ -973 +993,15 @@ void Konsole::changeBackgroundColor(const QColor &color) { | |||
973 | } | 993 | } |
994 | |||
995 | void Konsole::doWrap() { | ||
996 | Config cfg("Konsole"); | ||
997 | cfg.setGroup("ScrollBar"); | ||
998 | TEWidget* te = getTe(); | ||
999 | if( !cfg.readBoolEntry("HorzScroll",0)) { | ||
1000 | te->setWrapAt(0); | ||
1001 | configMenu->setItemChecked(-29,FALSE); | ||
1002 | } else { | ||
1003 | te->setWrapAt(90); | ||
1004 | // te->setWrapAt(120); | ||
1005 | configMenu->setItemChecked(-29,TRUE); | ||
1006 | } | ||
1007 | } | ||
diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h index 0bf3fb3..4938159 100644 --- a/core/apps/embeddedkonsole/konsole.h +++ b/core/apps/embeddedkonsole/konsole.h | |||
@@ -83,2 +83,3 @@ private slots: | |||
83 | private: | 83 | private: |
84 | void doWrap(); | ||
84 | void init(const char* _pgm, QStrList & _args); | 85 | void init(const char* _pgm, QStrList & _args); |