Diffstat (limited to 'core/apps/embeddedkonsole/konsole.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 90 |
1 files changed, 62 insertions, 28 deletions
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 | |||
@@ -358,10 +358,13 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
358 | scrollMenu->insertItem(tr( "None" )); | 358 | scrollMenu->insertItem(tr( "None" )); |
359 | scrollMenu->insertItem(tr( "Left" )); | 359 | scrollMenu->insertItem(tr( "Left" )); |
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); |
366 | // cfg.setGroup("ScrollBar"); | 369 | // cfg.setGroup("ScrollBar"); |
367 | // if(cfg.readBoolEntry("HorzScroll",0)) { | 370 | // if(cfg.readBoolEntry("HorzScroll",0)) { |
@@ -399,6 +402,7 @@ void Konsole::show() | |||
399 | newSession(); | 402 | newSession(); |
400 | } | 403 | } |
401 | QMainWindow::show(); | 404 | QMainWindow::show(); |
405 | |||
402 | } | 406 | } |
403 | 407 | ||
404 | void Konsole::initSession(const char*, QStrList &) | 408 | void Konsole::initSession(const char*, QStrList &) |
@@ -598,17 +602,18 @@ void Konsole::newSession() { | |||
598 | if(nsessions < 15) { // seems to be something weird about 16 tabs on the Zaurus.... memory? | 602 | if(nsessions < 15) { // seems to be something weird about 16 tabs on the Zaurus.... memory? |
599 | TEWidget* te = new TEWidget(tab); | 603 | TEWidget* te = new TEWidget(tab); |
600 | // te->setBackgroundMode(PaletteBase); //we want transparent!! | 604 | // te->setBackgroundMode(PaletteBase); //we want transparent!! |
601 | te->setVTFont(fonts.at(cfont)->getFont()); | 605 | te->setVTFont(fonts.at(cfont)->getFont()); |
602 | tab->addTab(te); | 606 | tab->addTab(te); |
603 | TESession* se = new TESession(this, te, se_pgm, se_args, "xterm"); | 607 | TESession* se = new TESession(this, te, se_pgm, se_args, "xterm"); |
604 | te->currentSession = se; | 608 | te->currentSession = se; |
605 | connect( se, SIGNAL(done(TESession*,int)), this, SLOT(doneSession(TESession*,int)) ); | 609 | connect( se, SIGNAL(done(TESession*,int)), this, SLOT(doneSession(TESession*,int)) ); |
606 | se->run(); | 610 | se->run(); |
607 | se->setConnect(TRUE); | 611 | se->setConnect(TRUE); |
608 | se->setHistory(b_scroll); | 612 | se->setHistory(b_scroll); |
609 | tab->setCurrentPage(nsessions); | 613 | tab->setCurrentPage(nsessions); |
610 | nsessions++; | 614 | nsessions++; |
611 | setColor(); | 615 | doWrap(); |
616 | setColor(); | ||
612 | } | 617 | } |
613 | } | 618 | } |
614 | 619 | ||
@@ -773,8 +778,8 @@ void Konsole::colorMenuSelected(int iD) | |||
773 | 778 | ||
774 | void Konsole::configMenuSelected(int iD) | 779 | 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(); |
779 | Config cfg("Konsole"); | 784 | Config cfg("Konsole"); |
780 | cfg.setGroup("Menubar"); | 785 | cfg.setGroup("Menubar"); |
@@ -792,6 +797,20 @@ void Konsole::configMenuSelected(int iD) | |||
792 | cfg.writeEntry("Position","Top"); | 797 | cfg.writeEntry("Position","Top"); |
793 | } | 798 | } |
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 | } |
796 | 815 | ||
797 | void Konsole::changeCommand(const QString &text, int c) | 816 | void Konsole::changeCommand(const QString &text, int c) |
@@ -832,20 +851,21 @@ void Konsole::scrollMenuSelected(int index) | |||
832 | te->setScrollbarLocation(2); | 851 | te->setScrollbarLocation(2); |
833 | cfg.writeEntry("Position",2); | 852 | cfg.writeEntry("Position",2); |
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 | } |
850 | 870 | ||
851 | void Konsole::editCommandListMenuSelected(int iD) | 871 | void Konsole::editCommandListMenuSelected(int iD) |
@@ -971,3 +991,17 @@ void Konsole::changeBackgroundColor(const QColor &color) { | |||
971 | cfg.writeEntry("background",color.name()); | 991 | cfg.writeEntry("background",color.name()); |
972 | cfg.write(); | 992 | cfg.write(); |
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 | } | ||