summaryrefslogtreecommitdiff
path: root/core/apps/embeddedkonsole/konsole.cpp
Unidiff
Diffstat (limited to 'core/apps/embeddedkonsole/konsole.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp68
1 files changed, 40 insertions, 28 deletions
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
@@ -350,48 +350,52 @@ void Konsole::init(const char* _pgm, QStrList & _args)
350 editCommandListMenu->insertItem(tr( "Edit" ) ); 350 editCommandListMenu->insertItem(tr( "Edit" ) );
351 351
352 cfg.setGroup("Commands"); 352 cfg.setGroup("Commands");
353 commonCombo->setInsertionPolicy(QComboBox::AtCurrent); 353 commonCombo->setInsertionPolicy(QComboBox::AtCurrent);
354 354
355 initCommandList(); 355 initCommandList();
356// for (int i = 0; commonCmds[i] != NULL; i++) { 356// for (int i = 0; commonCmds[i] != NULL; i++) {
357// commonCombo->insertItem( commonCmds[i], i ); 357// commonCombo->insertItem( commonCmds[i], i );
358// tmp = cfg.readEntry( QString::number(i),""); 358// tmp = cfg.readEntry( QString::number(i),"");
359// if(tmp != "") 359// if(tmp != "")
360// commonCombo->changeItem( tmp,i ); 360// commonCombo->changeItem( tmp,i );
361// } 361// }
362 362
363 connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) )); 363 connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) ));
364 364
365 scrollMenu->insertItem(tr( "None" )); 365 scrollMenu->insertItem(tr( "None" ));
366 scrollMenu->insertItem(tr( "Left" )); 366 scrollMenu->insertItem(tr( "Left" ));
367 scrollMenu->insertItem(tr( "Right" )); 367 scrollMenu->insertItem(tr( "Right" ));
368// scrollMenu->insertSeparator(4); 368// scrollMenu->insertSeparator(4);
369// scrollMenu->insertItem(tr( "Horizontal" )); 369// scrollMenu->insertItem(tr( "Horizontal" ));
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)) {
378// if(cfg.readNumEntry("Position",2) == 0) 382// if(cfg.readNumEntry("Position",2) == 0)
379// te->setScrollbarLocation(1); 383// te->setScrollbarLocation(1);
380// else 384// else
381// te->setScrollbarLocation(0); 385// te->setScrollbarLocation(0);
382// te->setScrollbarLocation( cfg.readNumEntry("Position",2)); 386// te->setScrollbarLocation( cfg.readNumEntry("Position",2));
383// te->setWrapAt(120); 387// te->setWrapAt(120);
384// } 388// }
385 // create applications ///////////////////////////////////////////////////// 389 // create applications /////////////////////////////////////////////////////
386 setCentralWidget(tab); 390 setCentralWidget(tab);
387 391
388 // load keymaps //////////////////////////////////////////////////////////// 392 // load keymaps ////////////////////////////////////////////////////////////
389 KeyTrans::loadAll(); 393 KeyTrans::loadAll();
390 for (int i = 0; i < KeyTrans::count(); i++) 394 for (int i = 0; i < KeyTrans::count(); i++)
391 { KeyTrans* s = KeyTrans::find(i); 395 { KeyTrans* s = KeyTrans::find(i);
392 assert( s ); 396 assert( s );
393 } 397 }
394 398
395 se_pgm = _pgm; 399 se_pgm = _pgm;
396 se_args = _args; 400 se_args = _args;
397 se_args.prepend("--login"); 401 se_args.prepend("--login");
@@ -766,88 +770,97 @@ void Konsole::colorMenuSelected(int iD)
766 } 770 }
767 fromMenu=FALSE; 771 fromMenu=FALSE;
768 colorMenu->setItemChecked(-19,TRUE); 772 colorMenu->setItemChecked(-19,TRUE);
769 } 773 }
770#endif 774#endif
771 for (i = 0; i < TABLE_COLORS; i++) { 775 for (i = 0; i < TABLE_COLORS; i++) {
772 if(i==0 || i == 10) { 776 if(i==0 || i == 10) {
773 m_table[i].color = foreground; 777 m_table[i].color = foreground;
774 } 778 }
775 else if(i==1 || i == 11) { 779 else if(i==1 || i == 11) {
776 m_table[i].color = background; m_table[i].transparent=0; 780 m_table[i].color = background; m_table[i].transparent=0;
777 } 781 }
778 else 782 else
779 m_table[i].color = defaultCt[i].color; 783 m_table[i].color = defaultCt[i].color;
780 } 784 }
781 } 785 }
782 lastSelectedMenu = iD; 786 lastSelectedMenu = iD;
783 te->setColorTable(m_table); 787 te->setColorTable(m_table);
784 update(); 788 update();
785 789
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();
822 doWrap(); 826 doWrap();
823 if(cfg.readNumEntry("Position",2) == 0) { 827 if(cfg.readNumEntry("Position",2) == 0) {
824 te->setScrollbarLocation(1); 828 te->setScrollbarLocation(1);
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{
834 Config cfg("Konsole"); 847 Config cfg("Konsole");
835 cfg.setGroup("Commands"); 848 cfg.setGroup("Commands");
836 if(commonCmds[c] != text) { 849 if(commonCmds[c] != text) {
837 cfg.writeEntry(QString::number(c),text); 850 cfg.writeEntry(QString::number(c),text);
838 commonCombo->clearEdit(); 851 commonCombo->clearEdit();
839 commonCombo->setCurrentItem(c); 852 commonCombo->setCurrentItem(c);
840 } 853 }
841} 854}
842 855
843void Konsole::setColor() 856void Konsole::setColor()
844{ 857{
845 Config cfg("Konsole"); 858 Config cfg("Konsole");
846 cfg.setGroup("Colors"); 859 cfg.setGroup("Colors");
847 int scheme = cfg.readNumEntry("Schema",1); 860 int scheme = cfg.readNumEntry("Schema",1);
848 if(scheme != 1) colorMenuSelected( -scheme); 861 if(scheme != 1) colorMenuSelected( -scheme);
849} 862}
850 863
851void Konsole::scrollMenuSelected(int index) 864void Konsole::scrollMenuSelected(int index)
852{ 865{
853 qDebug( "scrollbar menu %d",index); 866 qDebug( "scrollbar menu %d",index);
@@ -960,73 +973,72 @@ void Konsole::setDocument( const QString &cmd) {
960 973
961void Konsole::parseCommandLine() { 974void Konsole::parseCommandLine() {
962 QString cmd; 975 QString cmd;
963 // newSession(); 976 // newSession();
964 for (int i=1;i< qApp->argc();i++) { 977 for (int i=1;i< qApp->argc();i++) {
965 if( QString(qApp->argv()[i]) == "-e") { 978 if( QString(qApp->argv()[i]) == "-e") {
966 i++; 979 i++;
967 for ( int j=i;j< qApp->argc();j++) { 980 for ( int j=i;j< qApp->argc();j++) {
968 cmd+=QString(qApp->argv()[j])+" "; 981 cmd+=QString(qApp->argv()[j])+" ";
969 } 982 }
970 cmd.stripWhiteSpace(); 983 cmd.stripWhiteSpace();
971 system(cmd.latin1()); 984 system(cmd.latin1());
972 exit(0);//close(); 985 exit(0);//close();
973 } // end -e switch 986 } // end -e switch
974 } 987 }
975 startUp++; 988 startUp++;
976} 989}
977 990
978void Konsole::changeForegroundColor(const QColor &color) { 991void Konsole::changeForegroundColor(const QColor &color) {
979 Config cfg("Konsole"); 992 Config cfg("Konsole");
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
991 1004
992 ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color"); 1005 ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color");
993 connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this, 1006 connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
994 SLOT(changeBackgroundColor(const QColor&))); 1007 SLOT(changeBackgroundColor(const QColor&)));
995 penColorPopupMenu2->exec(); 1008 penColorPopupMenu2->exec();
996#endif 1009#endif
997} 1010}
998 1011
999void Konsole::changeBackgroundColor(const QColor &color) { 1012void Konsole::changeBackgroundColor(const QColor &color) {
1000 1013
1001 qDebug("Change background"); 1014 qDebug("Change background");
1002 Config cfg("Konsole"); 1015 Config cfg("Konsole");
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() {
1014int i; 1026int i;
1015#ifdef QWS_QT_OPIE 1027#ifdef QWS_QT_OPIE
1016i=-29; 1028i=-29;
1017#else 1029#else
1018i=-28; 1030i=-28;
1019#endif 1031#endif
1020 1032
1021 Config cfg("Konsole"); 1033 Config cfg("Konsole");
1022 cfg.setGroup("ScrollBar"); 1034 cfg.setGroup("ScrollBar");
1023 TEWidget* te = getTe(); 1035 TEWidget* te = getTe();
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}