summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index 06bee33..5a68c81 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -834,199 +834,199 @@ void Konsole::changeCommand(const QString &text, int c)
834 Config cfg("Konsole"); 834 Config cfg("Konsole");
835 cfg.setGroup("Commands"); 835 cfg.setGroup("Commands");
836 if(commonCmds[c] != text) { 836 if(commonCmds[c] != text) {
837 cfg.writeEntry(QString::number(c),text); 837 cfg.writeEntry(QString::number(c),text);
838 commonCombo->clearEdit(); 838 commonCombo->clearEdit();
839 commonCombo->setCurrentItem(c); 839 commonCombo->setCurrentItem(c);
840 } 840 }
841} 841}
842 842
843void Konsole::setColor() 843void Konsole::setColor()
844{ 844{
845 Config cfg("Konsole"); 845 Config cfg("Konsole");
846 cfg.setGroup("Colors"); 846 cfg.setGroup("Colors");
847 int scheme = cfg.readNumEntry("Schema",1); 847 int scheme = cfg.readNumEntry("Schema",1);
848 if(scheme != 1) colorMenuSelected( -scheme); 848 if(scheme != 1) colorMenuSelected( -scheme);
849} 849}
850 850
851void Konsole::scrollMenuSelected(int index) 851void Konsole::scrollMenuSelected(int index)
852{ 852{
853 qDebug( "scrollbar menu %d",index); 853 qDebug( "scrollbar menu %d",index);
854 TEWidget* te = getTe(); 854 TEWidget* te = getTe();
855 Config cfg("Konsole"); 855 Config cfg("Konsole");
856 cfg.setGroup("ScrollBar"); 856 cfg.setGroup("ScrollBar");
857 switch( index){ 857 switch( index){
858 case -25: 858 case -25:
859 te->setScrollbarLocation(0); 859 te->setScrollbarLocation(0);
860 cfg.writeEntry("Position",0); 860 cfg.writeEntry("Position",0);
861 break; 861 break;
862 case -26: 862 case -26:
863 te->setScrollbarLocation(1); 863 te->setScrollbarLocation(1);
864 cfg.writeEntry("Position",1); 864 cfg.writeEntry("Position",1);
865 break; 865 break;
866 case -27: 866 case -27:
867 te->setScrollbarLocation(2); 867 te->setScrollbarLocation(2);
868 cfg.writeEntry("Position",2); 868 cfg.writeEntry("Position",2);
869 break; 869 break;
870// case -29: { 870// case -29: {
871// bool b=cfg.readBoolEntry("HorzScroll",0); 871// bool b=cfg.readBoolEntry("HorzScroll",0);
872// cfg.writeEntry("HorzScroll", !b ); 872// cfg.writeEntry("HorzScroll", !b );
873// cfg.write(); 873// cfg.write();
874// if(cfg.readNumEntry("Position",2) == 0) { 874// if(cfg.readNumEntry("Position",2) == 0) {
875// te->setScrollbarLocation(1); 875// te->setScrollbarLocation(1);
876// te->setWrapAt(0); 876// te->setWrapAt(0);
877// } else { 877// } else {
878// te->setScrollbarLocation(0); 878// te->setScrollbarLocation(0);
879// te->setWrapAt(120); 879// te->setWrapAt(120);
880// } 880// }
881// te->setScrollbarLocation( cfg.readNumEntry("Position",2)); 881// te->setScrollbarLocation( cfg.readNumEntry("Position",2));
882// } 882// }
883// break; 883// break;
884 }; 884 };
885} 885}
886 886
887void Konsole::editCommandListMenuSelected(int iD) 887void Konsole::editCommandListMenuSelected(int iD)
888{ 888{
889// QString temp; 889// QString temp;
890// qDebug( temp.sprintf("edit command list %d",iD)); 890// qDebug( temp.sprintf("edit command list %d",iD));
891 TEWidget* te = getTe(); 891 TEWidget* te = getTe();
892 Config cfg("Konsole"); 892 Config cfg("Konsole");
893 cfg.setGroup("Menubar"); 893 cfg.setGroup("Menubar");
894 if( iD == -3) { 894 if( iD == -3) {
895 if(!secondToolBar->isHidden()) { 895 if(!secondToolBar->isHidden()) {
896 secondToolBar->hide(); 896 secondToolBar->hide();
897 configMenu->changeItem( iD,tr( "Show Command List" )); 897 configMenu->changeItem( iD,tr( "Show Command List" ));
898 cfg.writeEntry("Hidden","TRUE"); 898 cfg.writeEntry("Hidden","TRUE");
899 configMenu->setItemEnabled(-23 ,FALSE); 899 configMenu->setItemEnabled(-23 ,FALSE);
900 } else { 900 } else {
901 secondToolBar->show(); 901 secondToolBar->show();
902 configMenu->changeItem( iD,tr( "Hide Command List" )); 902 configMenu->changeItem( iD,tr( "Hide Command List" ));
903 cfg.writeEntry("Hidden","FALSE"); 903 cfg.writeEntry("Hidden","FALSE");
904 configMenu->setItemEnabled(-23 ,TRUE); 904 configMenu->setItemEnabled(-23 ,TRUE);
905 905
906 if(cfg.readEntry("EditEnabled","FALSE")=="TRUE") { 906 if(cfg.readEntry("EditEnabled","FALSE")=="TRUE") {
907 configMenu->setItemChecked(-23,TRUE); 907 configMenu->setItemChecked(-23,TRUE);
908 commonCombo->setEditable( TRUE ); 908 commonCombo->setEditable( TRUE );
909 } else { 909 } else {
910 configMenu->setItemChecked(-23,FALSE); 910 configMenu->setItemChecked(-23,FALSE);
911 commonCombo->setEditable( FALSE ); 911 commonCombo->setEditable( FALSE );
912 } 912 }
913 } 913 }
914 } 914 }
915 if( iD == -23) { 915 if( iD == -23) {
916 cfg.setGroup("Commands"); 916 cfg.setGroup("Commands");
917// qDebug("enableCommandEdit"); 917// qDebug("enableCommandEdit");
918 if( !configMenu->isItemChecked(iD) ) { 918 if( !configMenu->isItemChecked(iD) ) {
919 commonCombo->setEditable( TRUE ); 919 commonCombo->setEditable( TRUE );
920 configMenu->setItemChecked(iD,TRUE); 920 configMenu->setItemChecked(iD,TRUE);
921 commonCombo->setCurrentItem(0); 921 commonCombo->setCurrentItem(0);
922 cfg.writeEntry("EditEnabled","TRUE"); 922 cfg.writeEntry("EditEnabled","TRUE");
923 } else { 923 } else {
924 commonCombo->setEditable( FALSE ); 924 commonCombo->setEditable( FALSE );
925 configMenu->setItemChecked(iD,FALSE); 925 configMenu->setItemChecked(iD,FALSE);
926 cfg.writeEntry("EditEnabled","FALSE"); 926 cfg.writeEntry("EditEnabled","FALSE");
927 commonCombo->setFocusPolicy(QWidget::NoFocus); 927 commonCombo->setFocusPolicy(QWidget::NoFocus);
928 te->setFocus(); 928 te->setFocus();
929 } 929 }
930 } 930 }
931 if(iD == -24) { 931 if(iD == -24) {
932 // "edit commands" 932 // "edit commands"
933 CommandEditDialog *m = new CommandEditDialog(this); 933 CommandEditDialog *m = new CommandEditDialog(this);
934 connect(m,SIGNAL(commandsEdited()),this,SLOT(initCommandList())); 934 connect(m,SIGNAL(commandsEdited()),this,SLOT(initCommandList()));
935 m->showMaximized(); 935 m->showMaximized();
936 } 936 }
937 937
938} 938}
939 939
940// $QPEDIR/bin/qcop QPE/Application/embeddedkonsole 'setDocument(QString)' 'ssh -V' 940// $QPEDIR/bin/qcop QPE/Application/embeddedkonsole 'setDocument(QString)' 'ssh -V'
941void Konsole::setDocument( const QString &cmd) { 941void Konsole::setDocument( const QString &cmd) {
942 newSession(); 942 newSession();
943 TEWidget* te = getTe(); 943 TEWidget* te = getTe();
944 if(cmd.find("-e", 0, TRUE) != -1) { 944 if(cmd.find("-e", 0, TRUE) != -1) {
945 QString cmd2; 945 QString cmd2;
946 cmd2=cmd.right(cmd.length()-3)+" &"; 946 cmd2=cmd.right(cmd.length()-3)+" &";
947 system(cmd2.latin1()); 947 system(cmd2.latin1());
948 if(startUp <= 1 && nsessions < 2) { 948 if(startUp <= 1 && nsessions < 2) {
949 doneSession(getTe()->currentSession, 0); 949 doneSession(getTe()->currentSession, 0);
950 exit(0); 950 exit(0);
951 } else 951 } else
952 doneSession(getTe()->currentSession, 0); 952 doneSession(getTe()->currentSession, 0);
953 } else { 953 } else {
954 if (te != 0) { 954 if (te != 0) {
955 te->emitText(cmd+"\r"); 955 te->emitText(cmd+"\r");
956 } 956 }
957 } 957 }
958 startUp++; 958 startUp++;
959} 959}
960 960
961void Konsole::parseCommandLine() { 961void Konsole::parseCommandLine() {
962 QString cmd; 962 QString cmd;
963 // newSession(); 963 // newSession();
964 for (int i=1;i< qApp->argc();i++) { 964 for (int i=1;i< qApp->argc();i++) {
965 if( QString(qApp->argv()[i]) == "-e") { 965 if( QString(qApp->argv()[i]) == "-e") {
966 i++; 966 i++;
967 for ( int j=i;j< qApp->argc();j++) { 967 for ( int j=i;j< qApp->argc();j++) {
968 cmd+=QString(qApp->argv()[j])+" "; 968 cmd+=QString(qApp->argv()[j])+" ";
969 } 969 }
970 cmd.stripWhiteSpace(); 970 cmd.stripWhiteSpace();
971 system(cmd.latin1()); 971 system(cmd.latin1());
972 exit(0);//close(); 972 exit(0);//close();
973 } // end -e switch 973 } // end -e switch
974 } 974 }
975 startUp++; 975 startUp++;
976} 976}
977 977
978void Konsole::changeForegroundColor(const QColor &color) { 978void Konsole::changeForegroundColor(const QColor &color) {
979 Config cfg("Konsole"); 979 Config cfg("Konsole");
980 cfg.setGroup("Colors"); 980 cfg.setGroup("Colors");
981 int r, g, b; 981 int r, g, b;
982 color.rgb(&r,&g,&b); 982 color.rgb(&r,&g,&b);
983 foreground.setRgb(r,g,b); 983 foreground.setRgb(r,g,b);
984// QString colors; 984// QString colors;
985// colors.sprintf("%d,%d,%d"color.red,color.green,color.blue); 985// colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
986 cfg.writeEntry("foreground",color.name()); 986 cfg.writeEntry("foreground",color.name());
987 cfg.write(); 987 cfg.write();
988 988
989qDebug("do other dialog"); 989qDebug("do other dialog");
990#ifdef QWS_QT_OPIE 990#ifdef QWS_QT_OPIE
991 991
992 ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color"); 992 ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color");
993 connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this, 993 connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
994 SLOT(changeBackgroundColor(const QColor&))); 994 SLOT(changeBackgroundColor(const QColor&)));
995 penColorPopupMenu2->exec(); 995 penColorPopupMenu2->exec();
996#endif 996#endif
997} 997}
998 998
999void Konsole::changeBackgroundColor(const QColor &color) { 999void Konsole::changeBackgroundColor(const QColor &color) {
1000 1000
1001 qDebug("Change background"); 1001 qDebug("Change background");
1002 Config cfg("Konsole"); 1002 Config cfg("Konsole");
1003 cfg.setGroup("Colors"); 1003 cfg.setGroup("Colors");
1004 int r, g, b; 1004 int r, g, b;
1005 color.rgb(&r,&g,&b); 1005 color.rgb(&r,&g,&b);
1006 background.setRgb(r,g,b); 1006 background.setRgb(r,g,b);
1007// QString colors; 1007// QString colors;
1008// colors.sprintf("%d,%d,%d"color.red,color.green,color.blue); 1008// colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
1009 cfg.writeEntry("background",color.name()); 1009 cfg.writeEntry("background",color.name());
1010 cfg.write(); 1010 cfg.write();
1011} 1011}
1012 1012
1013void Konsole::doWrap() { 1013void Konsole::doWrap() {
1014int i; 1014int i;
1015#ifdef QWS_QT_OPIE 1015#ifdef QWS_QT_OPIE
1016i=-29; 1016i=-29;
1017#else 1017#else
1018i=-28; 1018i=-28;
1019#endif 1019#endif
1020 1020
1021 Config cfg("Konsole"); 1021 Config cfg("Konsole");
1022 cfg.setGroup("ScrollBar"); 1022 cfg.setGroup("ScrollBar");
1023 TEWidget* te = getTe(); 1023 TEWidget* te = getTe();
1024 if( !cfg.readBoolEntry("HorzScroll",0)) { 1024 if( !cfg.readBoolEntry("HorzScroll",0)) {
1025 te->setWrapAt(0); 1025 te->setWrapAt(0);
1026 configMenu->setItemChecked( i,FALSE); 1026 configMenu->setItemChecked( i,TRUE);
1027 } else { 1027 } else {
1028 te->setWrapAt(90); 1028 te->setWrapAt(90);
1029// te->setWrapAt(120); 1029// te->setWrapAt(120);
1030 configMenu->setItemChecked( i,TRUE); 1030 configMenu->setItemChecked( i,FALSE);
1031 } 1031 }
1032} 1032}