summaryrefslogtreecommitdiff
authorleseb <leseb>2002-07-07 18:38:50 (UTC)
committer leseb <leseb>2002-07-07 18:38:50 (UTC)
commit29afb9794560f9aa2342bf971ece66336d052b17 (patch) (unidiff)
tree33a82050f295eded341ae9f81ddb281b98d2cc89
parent5a6d27d4ef5a00dfa041323938acdbdf80c726fd (diff)
downloadopie-29afb9794560f9aa2342bf971ece66336d052b17.zip
opie-29afb9794560f9aa2342bf971ece66336d052b17.tar.gz
opie-29afb9794560f9aa2342bf971ece66336d052b17.tar.bz2
Fix menu item index (again...)
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 36b9b1e..63073c4 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -725,223 +725,223 @@ void Konsole::colorMenuSelected(int iD)
725 if(iD==-19) {// Custom 725 if(iD==-19) {// Custom
726 qDebug("do custom"); 726 qDebug("do custom");
727 if(fromMenu) { 727 if(fromMenu) {
728 ColorPopupMenu* penColorPopupMenu = new ColorPopupMenu(Qt::black, this, "foreground color"); 728 ColorPopupMenu* penColorPopupMenu = new ColorPopupMenu(Qt::black, this, "foreground color");
729 connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, 729 connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this,
730 SLOT(changeForegroundColor(const QColor&))); 730 SLOT(changeForegroundColor(const QColor&)));
731 penColorPopupMenu->exec(); 731 penColorPopupMenu->exec();
732 } 732 }
733 cfg.writeEntry("Schema","19"); 733 cfg.writeEntry("Schema","19");
734 if(!fromMenu) { 734 if(!fromMenu) {
735 foreground.setNamedColor(cfg.readEntry("foreground","")); 735 foreground.setNamedColor(cfg.readEntry("foreground",""));
736 background.setNamedColor(cfg.readEntry("background","")); 736 background.setNamedColor(cfg.readEntry("background",""));
737 } 737 }
738 fromMenu=FALSE; 738 fromMenu=FALSE;
739 colorMenu->setItemChecked(-19,TRUE); 739 colorMenu->setItemChecked(-19,TRUE);
740 } 740 }
741 741
742 for (i = 0; i < TABLE_COLORS; i++) { 742 for (i = 0; i < TABLE_COLORS; i++) {
743 if(i==0 || i == 10) { 743 if(i==0 || i == 10) {
744 m_table[i].color = foreground; 744 m_table[i].color = foreground;
745 } 745 }
746 else if(i==1 || i == 11) { 746 else if(i==1 || i == 11) {
747 m_table[i].color = background; m_table[i].transparent=0; 747 m_table[i].color = background; m_table[i].transparent=0;
748 } 748 }
749 else 749 else
750 m_table[i].color = defaultCt[i].color; 750 m_table[i].color = defaultCt[i].color;
751 } 751 }
752 } 752 }
753 lastSelectedMenu = iD; 753 lastSelectedMenu = iD;
754 te->setColorTable(m_table); 754 te->setColorTable(m_table);
755 update(); 755 update();
756 756
757} 757}
758 758
759void Konsole::configMenuSelected(int iD) 759void Konsole::configMenuSelected(int iD)
760{ 760{
761// QString temp; 761// QString temp;
762// qDebug( temp.sprintf("configmenu %d",iD)); 762// qDebug( temp.sprintf("configmenu %d",iD));
763 TEWidget* te = getTe(); 763 TEWidget* te = getTe();
764 Config cfg("Konsole"); 764 Config cfg("Konsole");
765 cfg.setGroup("Menubar"); 765 cfg.setGroup("Menubar");
766 if( iD == -4) { 766 if( iD == -4) {
767 cfg.setGroup("Tabs"); 767 cfg.setGroup("Tabs");
768 QString tmp=cfg.readEntry("Position","Bottom"); 768 QString tmp=cfg.readEntry("Position","Bottom");
769 769
770 if(tmp=="Top") { 770 if(tmp=="Top") {
771 tab->setTabPosition(QTabWidget::Bottom); 771 tab->setTabPosition(QTabWidget::Bottom);
772 configMenu->changeItem( iD,"Tabs on Top"); 772 configMenu->changeItem( iD,"Tabs on Top");
773 cfg.writeEntry("Position","Bottom"); 773 cfg.writeEntry("Position","Bottom");
774 } else { 774 } else {
775 tab->setTabPosition(QTabWidget::Top); 775 tab->setTabPosition(QTabWidget::Top);
776 configMenu->changeItem( iD,"Tabs on Bottom"); 776 configMenu->changeItem( iD,"Tabs on Bottom");
777 cfg.writeEntry("Position","Top"); 777 cfg.writeEntry("Position","Top");
778 } 778 }
779 } 779 }
780} 780}
781 781
782void Konsole::changeCommand(const QString &text, int c) 782void Konsole::changeCommand(const QString &text, int c)
783{ 783{
784 Config cfg("Konsole"); 784 Config cfg("Konsole");
785 cfg.setGroup("Commands"); 785 cfg.setGroup("Commands");
786 if(commonCmds[c] != text) { 786 if(commonCmds[c] != text) {
787 cfg.writeEntry(QString::number(c),text); 787 cfg.writeEntry(QString::number(c),text);
788 commonCombo->clearEdit(); 788 commonCombo->clearEdit();
789 commonCombo->setCurrentItem(c); 789 commonCombo->setCurrentItem(c);
790 } 790 }
791} 791}
792 792
793void Konsole::setColor() 793void Konsole::setColor()
794{ 794{
795 Config cfg("Konsole"); 795 Config cfg("Konsole");
796 cfg.setGroup("Colors"); 796 cfg.setGroup("Colors");
797 int scheme = cfg.readNumEntry("Schema",1); 797 int scheme = cfg.readNumEntry("Schema",1);
798 if(scheme != 1) colorMenuSelected( -scheme); 798 if(scheme != 1) colorMenuSelected( -scheme);
799} 799}
800 800
801void Konsole::scrollMenuSelected(int index) 801void Konsole::scrollMenuSelected(int index)
802{ 802{
803// QString temp; 803// QString temp;
804// qDebug( temp.sprintf("scrollbar menu %d",index)); 804// qDebug( temp.sprintf("scrollbar menu %d",index));
805 TEWidget* te = getTe(); 805 TEWidget* te = getTe();
806 Config cfg("Konsole"); 806 Config cfg("Konsole");
807 cfg.setGroup("ScrollBar"); 807 cfg.setGroup("ScrollBar");
808 switch( index){ 808 switch( index){
809 case -25: 809 case -25:
810 te->setScrollbarLocation(0); 810 te->setScrollbarLocation(0);
811 cfg.writeEntry("Position",0); 811 cfg.writeEntry("Position",0);
812 break; 812 break;
813 case -26: 813 case -26:
814 te->setScrollbarLocation(1); 814 te->setScrollbarLocation(1);
815 cfg.writeEntry("Position",1); 815 cfg.writeEntry("Position",1);
816 break; 816 break;
817 case -27: 817 case -27:
818 te->setScrollbarLocation(2); 818 te->setScrollbarLocation(2);
819 cfg.writeEntry("Position",2); 819 cfg.writeEntry("Position",2);
820 break; 820 break;
821 }; 821 };
822 822
823} 823}
824 824
825void Konsole::editCommandListMenuSelected(int iD) 825void Konsole::editCommandListMenuSelected(int iD)
826{ 826{
827// QString temp; 827// QString temp;
828// qDebug( temp.sprintf("edit command list %d",iD)); 828// qDebug( temp.sprintf("edit command list %d",iD));
829 TEWidget* te = getTe(); 829 TEWidget* te = getTe();
830 Config cfg("Konsole"); 830 Config cfg("Konsole");
831 cfg.setGroup("Menubar"); 831 cfg.setGroup("Menubar");
832 if( iD == -3) { 832 if( iD == -3) {
833 if(!secondToolBar->isHidden()) { 833 if(!secondToolBar->isHidden()) {
834 secondToolBar->hide(); 834 secondToolBar->hide();
835 configMenu->changeItem( iD,tr( "Show Command List" )); 835 configMenu->changeItem( iD,tr( "Show Command List" ));
836 cfg.writeEntry("Hidden","TRUE"); 836 cfg.writeEntry("Hidden","TRUE");
837 configMenu->setItemEnabled(-22 ,FALSE); 837 configMenu->setItemEnabled(-22 ,FALSE);
838 } else { 838 } else {
839 secondToolBar->show(); 839 secondToolBar->show();
840 configMenu->changeItem( iD,tr( "Hide Command List" )); 840 configMenu->changeItem( iD,tr( "Hide Command List" ));
841 cfg.writeEntry("Hidden","FALSE"); 841 cfg.writeEntry("Hidden","FALSE");
842 configMenu->setItemEnabled(-22 ,TRUE); 842 configMenu->setItemEnabled(-22 ,TRUE);
843 843
844 if(cfg.readEntry("EditEnabled","FALSE")=="TRUE") { 844 if(cfg.readEntry("EditEnabled","FALSE")=="TRUE") {
845 configMenu->setItemChecked(-22,TRUE); 845 configMenu->setItemChecked(-22,TRUE);
846 commonCombo->setEditable( TRUE ); 846 commonCombo->setEditable( TRUE );
847 } else { 847 } else {
848 configMenu->setItemChecked(-22,FALSE); 848 configMenu->setItemChecked(-22,FALSE);
849 commonCombo->setEditable( FALSE ); 849 commonCombo->setEditable( FALSE );
850 } 850 }
851 } 851 }
852 } 852 }
853 if( iD == -22) { 853 if( iD == -23) {
854 cfg.setGroup("Commands"); 854 cfg.setGroup("Commands");
855// qDebug("enableCommandEdit"); 855// qDebug("enableCommandEdit");
856 if( !configMenu->isItemChecked(iD) ) { 856 if( !configMenu->isItemChecked(iD) ) {
857 commonCombo->setEditable( TRUE ); 857 commonCombo->setEditable( TRUE );
858 configMenu->setItemChecked(iD,TRUE); 858 configMenu->setItemChecked(iD,TRUE);
859 commonCombo->setCurrentItem(0); 859 commonCombo->setCurrentItem(0);
860 cfg.writeEntry("EditEnabled","TRUE"); 860 cfg.writeEntry("EditEnabled","TRUE");
861 } else { 861 } else {
862 commonCombo->setEditable( FALSE ); 862 commonCombo->setEditable( FALSE );
863 configMenu->setItemChecked(iD,FALSE); 863 configMenu->setItemChecked(iD,FALSE);
864 cfg.writeEntry("EditEnabled","FALSE"); 864 cfg.writeEntry("EditEnabled","FALSE");
865 commonCombo->setFocusPolicy(QWidget::NoFocus); 865 commonCombo->setFocusPolicy(QWidget::NoFocus);
866 te->setFocus(); 866 te->setFocus();
867 } 867 }
868 } 868 }
869 if(iD == -23) { 869 if(iD == -24) {
870 // "edit commands" 870 // "edit commands"
871 CommandEditDialog *m = new CommandEditDialog(this); 871 CommandEditDialog *m = new CommandEditDialog(this);
872 connect(m,SIGNAL(commandsEdited()),this,SLOT(initCommandList())); 872 connect(m,SIGNAL(commandsEdited()),this,SLOT(initCommandList()));
873 m->showMaximized(); 873 m->showMaximized();
874 } 874 }
875 875
876} 876}
877 877
878// $QPEDIR/bin/qcop QPE/Application/embeddedkonsole 'setDocument(QString)' 'ssh -V' 878// $QPEDIR/bin/qcop QPE/Application/embeddedkonsole 'setDocument(QString)' 'ssh -V'
879void Konsole::setDocument( const QString &cmd) { 879void Konsole::setDocument( const QString &cmd) {
880 newSession(); 880 newSession();
881 TEWidget* te = getTe(); 881 TEWidget* te = getTe();
882 if(cmd.find("-e", 0, TRUE) != -1) { 882 if(cmd.find("-e", 0, TRUE) != -1) {
883 QString cmd2; 883 QString cmd2;
884 cmd2=cmd.right(cmd.length()-3)+" &"; 884 cmd2=cmd.right(cmd.length()-3)+" &";
885 system(cmd2.latin1()); 885 system(cmd2.latin1());
886 if(startUp <= 1 && nsessions < 2) { 886 if(startUp <= 1 && nsessions < 2) {
887 doneSession(getTe()->currentSession, 0); 887 doneSession(getTe()->currentSession, 0);
888 exit(0); 888 exit(0);
889 } else 889 } else
890 doneSession(getTe()->currentSession, 0); 890 doneSession(getTe()->currentSession, 0);
891 } else { 891 } else {
892 if (te != 0) { 892 if (te != 0) {
893 te->emitText(cmd+"\r"); 893 te->emitText(cmd+"\r");
894 } 894 }
895 } 895 }
896 startUp++; 896 startUp++;
897} 897}
898 898
899void Konsole::parseCommandLine() { 899void Konsole::parseCommandLine() {
900 QString cmd; 900 QString cmd;
901 // newSession(); 901 // newSession();
902 for (int i=1;i< qApp->argc();i++) { 902 for (int i=1;i< qApp->argc();i++) {
903 if( QString(qApp->argv()[i]) == "-e") { 903 if( QString(qApp->argv()[i]) == "-e") {
904 i++; 904 i++;
905 for ( int j=i;j< qApp->argc();j++) { 905 for ( int j=i;j< qApp->argc();j++) {
906 cmd+=QString(qApp->argv()[j])+" "; 906 cmd+=QString(qApp->argv()[j])+" ";
907 } 907 }
908 cmd.stripWhiteSpace(); 908 cmd.stripWhiteSpace();
909 system(cmd.latin1()); 909 system(cmd.latin1());
910 exit(0);//close(); 910 exit(0);//close();
911 } // end -e switch 911 } // end -e switch
912 } 912 }
913 startUp++; 913 startUp++;
914} 914}
915 915
916void Konsole::changeForegroundColor(const QColor &color) { 916void Konsole::changeForegroundColor(const QColor &color) {
917 Config cfg("Konsole"); 917 Config cfg("Konsole");
918 cfg.setGroup("Colors"); 918 cfg.setGroup("Colors");
919 int r, g, b; 919 int r, g, b;
920 color.rgb(&r,&g,&b); 920 color.rgb(&r,&g,&b);
921 foreground.setRgb(r,g,b); 921 foreground.setRgb(r,g,b);
922// QString colors; 922// QString colors;
923// colors.sprintf("%d,%d,%d"color.red,color.green,color.blue); 923// colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
924 cfg.writeEntry("foreground",color.name()); 924 cfg.writeEntry("foreground",color.name());
925 cfg.write(); 925 cfg.write();
926 926
927qDebug("do other dialog"); 927qDebug("do other dialog");
928 ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color"); 928 ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color");
929 connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this, 929 connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
930 SLOT(changeBackgroundColor(const QColor&))); 930 SLOT(changeBackgroundColor(const QColor&)));
931 penColorPopupMenu2->exec(); 931 penColorPopupMenu2->exec();
932 932
933} 933}
934 934
935void Konsole::changeBackgroundColor(const QColor &color) { 935void Konsole::changeBackgroundColor(const QColor &color) {
936 936
937 qDebug("Change background"); 937 qDebug("Change background");
938 Config cfg("Konsole"); 938 Config cfg("Konsole");
939 cfg.setGroup("Colors"); 939 cfg.setGroup("Colors");
940 int r, g, b; 940 int r, g, b;
941 color.rgb(&r,&g,&b); 941 color.rgb(&r,&g,&b);
942 background.setRgb(r,g,b); 942 background.setRgb(r,g,b);
943// QString colors; 943// QString colors;
944// colors.sprintf("%d,%d,%d"color.red,color.green,color.blue); 944// colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
945 cfg.writeEntry("background",color.name()); 945 cfg.writeEntry("background",color.name());
946 cfg.write(); 946 cfg.write();
947} 947}