-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index 1102ef3..f3f0c29 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -552,211 +552,211 @@ TEWidget* Konsole::getTe() { | |||
552 | if (nsessions) { | 552 | if (nsessions) { |
553 | return (TEWidget *) tab->currentPage(); | 553 | return (TEWidget *) tab->currentPage(); |
554 | } else { | 554 | } else { |
555 | return 0; | 555 | return 0; |
556 | } | 556 | } |
557 | } | 557 | } |
558 | 558 | ||
559 | void Konsole::switchSession(QWidget* w) { | 559 | void Konsole::switchSession(QWidget* w) { |
560 | TEWidget* te = (TEWidget *) w; | 560 | TEWidget* te = (TEWidget *) w; |
561 | 561 | ||
562 | QFont teFnt = te->getVTFont(); | 562 | QFont teFnt = te->getVTFont(); |
563 | for(uint i = 0; i < fonts.count(); i++) { | 563 | for(uint i = 0; i < fonts.count(); i++) { |
564 | VTFont *fnt = fonts.at(i); | 564 | VTFont *fnt = fonts.at(i); |
565 | bool cf = fnt->getFont() == teFnt; | 565 | bool cf = fnt->getFont() == teFnt; |
566 | fontList->setItemChecked(i, cf); | 566 | fontList->setItemChecked(i, cf); |
567 | if (cf) { | 567 | if (cf) { |
568 | cfont = i; | 568 | cfont = i; |
569 | } | 569 | } |
570 | } | 570 | } |
571 | } | 571 | } |
572 | 572 | ||
573 | /// ------------------------------- some new stuff by L.J. Potter | 573 | /// ------------------------------- some new stuff by L.J. Potter |
574 | void Konsole::colorMenuSelected(int iD) | 574 | void Konsole::colorMenuSelected(int iD) |
575 | { // this is NOT pretty, elegant or anything else besides functional | 575 | { // this is NOT pretty, elegant or anything else besides functional |
576 | // QString temp; | 576 | // QString temp; |
577 | // temp.sprintf("%d", iD); | 577 | // temp.sprintf("%d", iD); |
578 | // qDebug(temp); | 578 | // qDebug(temp); |
579 | TEWidget* te = getTe(); | 579 | TEWidget* te = getTe(); |
580 | Config cfg("Konsole"); | 580 | Config cfg("Konsole"); |
581 | cfg.setGroup("Colors"); | 581 | cfg.setGroup("Colors"); |
582 | QColor foreground; | 582 | QColor foreground; |
583 | QColor background; | 583 | QColor background; |
584 | colorMenu->setItemChecked(lastSelectedMenu,FALSE); | 584 | colorMenu->setItemChecked(lastSelectedMenu,FALSE); |
585 | ColorEntry m_table[TABLE_COLORS]; | 585 | ColorEntry m_table[TABLE_COLORS]; |
586 | const ColorEntry * defaultCt=te->getdefaultColorTable(); | 586 | const ColorEntry * defaultCt=te->getdefaultColorTable(); |
587 | /////////// fore back | 587 | /////////// fore back |
588 | int i; | 588 | int i; |
589 | if(iD==-8) { // default default | 589 | if(iD==-8) { // default default |
590 | for (i = 0; i < TABLE_COLORS; i++) { | 590 | for (i = 0; i < TABLE_COLORS; i++) { |
591 | m_table[i].color = defaultCt[i].color; | 591 | m_table[i].color = defaultCt[i].color; |
592 | if(i==1 || i == 11) | 592 | if(i==1 || i == 11) |
593 | m_table[i].transparent=1; | 593 | m_table[i].transparent=1; |
594 | cfg.writeEntry("Schema","8"); | 594 | cfg.writeEntry("Schema","8"); |
595 | colorMenu->setItemChecked(-8,TRUE); | 595 | colorMenu->setItemChecked(-8,TRUE); |
596 | } | 596 | } |
597 | } else { | 597 | } else { |
598 | if(iD==-5) { // green black | 598 | if(iD==-5) { // green black |
599 | foreground.setRgb(0x18,255,0x18); | 599 | foreground.setRgb(0x18,255,0x18); |
600 | background.setRgb(0x00,0x00,0x00); | 600 | background.setRgb(0x00,0x00,0x00); |
601 | cfg.writeEntry("Schema","5"); | 601 | cfg.writeEntry("Schema","5"); |
602 | colorMenu->setItemChecked(-5,TRUE); | 602 | colorMenu->setItemChecked(-5,TRUE); |
603 | } | 603 | } |
604 | if(iD==-6) { // black white | 604 | if(iD==-6) { // black white |
605 | foreground.setRgb(0x00,0x00,0x00); | 605 | foreground.setRgb(0x00,0x00,0x00); |
606 | background.setRgb(0xFF,0xFF,0xFF); | 606 | background.setRgb(0xFF,0xFF,0xFF); |
607 | cfg.writeEntry("Schema","6"); | 607 | cfg.writeEntry("Schema","6"); |
608 | colorMenu->setItemChecked(-6,TRUE); | 608 | colorMenu->setItemChecked(-6,TRUE); |
609 | } | 609 | } |
610 | if(iD==-7) { // white black | 610 | if(iD==-7) { // white black |
611 | foreground.setRgb(0xFF,0xFF,0xFF); | 611 | foreground.setRgb(0xFF,0xFF,0xFF); |
612 | background.setRgb(0x00,0x00,0x00); | 612 | background.setRgb(0x00,0x00,0x00); |
613 | cfg.writeEntry("Schema","7"); | 613 | cfg.writeEntry("Schema","7"); |
614 | colorMenu->setItemChecked(-7,TRUE); | 614 | colorMenu->setItemChecked(-7,TRUE); |
615 | } | 615 | } |
616 | if(iD==-9) {// Black, Red | 616 | if(iD==-9) {// Black, Red |
617 | foreground.setRgb(0x00,0x00,0x00); | 617 | foreground.setRgb(0x00,0x00,0x00); |
618 | background.setRgb(0xB2,0x18,0x18); | 618 | background.setRgb(0xB2,0x18,0x18); |
619 | cfg.writeEntry("Schema","9"); | 619 | cfg.writeEntry("Schema","9"); |
620 | colorMenu->setItemChecked(-9,TRUE); | 620 | colorMenu->setItemChecked(-9,TRUE); |
621 | } | 621 | } |
622 | if(iD==-10) {// Red, Black | 622 | if(iD==-10) {// Red, Black |
623 | foreground.setRgb(230,31,31); //0xB2,0x18,0x18 | 623 | foreground.setRgb(230,31,31); //0xB2,0x18,0x18 |
624 | background.setRgb(0x00,0x00,0x00); | 624 | background.setRgb(0x00,0x00,0x00); |
625 | cfg.writeEntry("Schema","10"); | 625 | cfg.writeEntry("Schema","10"); |
626 | colorMenu->setItemChecked(-10,TRUE); | 626 | colorMenu->setItemChecked(-10,TRUE); |
627 | } | 627 | } |
628 | if(iD==-11) {// Green, Yellow - is ugly | 628 | if(iD==-11) {// Green, Yellow - is ugly |
629 | // foreground.setRgb(0x18,0xB2,0x18); | 629 | // foreground.setRgb(0x18,0xB2,0x18); |
630 | foreground.setRgb(36,139,10); | 630 | foreground.setRgb(36,139,10); |
631 | // background.setRgb(0xB2,0x68,0x18); | 631 | // background.setRgb(0xB2,0x68,0x18); |
632 | background.setRgb(255,255,0); | 632 | background.setRgb(255,255,0); |
633 | cfg.writeEntry("Schema","11"); | 633 | cfg.writeEntry("Schema","11"); |
634 | colorMenu->setItemChecked(-11,TRUE); | 634 | colorMenu->setItemChecked(-11,TRUE); |
635 | } | 635 | } |
636 | if(iD==-12) {// Blue, Magenta | 636 | if(iD==-12) {// Blue, Magenta |
637 | foreground.setRgb(0x18,0xB2,0xB2); | 637 | foreground.setRgb(0x18,0xB2,0xB2); |
638 | background.setRgb(0x18,0x18,0xB2); | 638 | background.setRgb(0x18,0x18,0xB2); |
639 | cfg.writeEntry("Schema","12"); | 639 | cfg.writeEntry("Schema","12"); |
640 | colorMenu->setItemChecked(-12,TRUE); | 640 | colorMenu->setItemChecked(-12,TRUE); |
641 | } | 641 | } |
642 | if(iD==-13) {// Magenta, Blue | 642 | if(iD==-13) {// Magenta, Blue |
643 | foreground.setRgb(0x18,0x18,0xB2); | 643 | foreground.setRgb(0x18,0x18,0xB2); |
644 | background.setRgb(0x18,0xB2,0xB2); | 644 | background.setRgb(0x18,0xB2,0xB2); |
645 | cfg.writeEntry("Schema","13"); | 645 | cfg.writeEntry("Schema","13"); |
646 | colorMenu->setItemChecked(-13,TRUE); | 646 | colorMenu->setItemChecked(-13,TRUE); |
647 | } | 647 | } |
648 | if(iD==-14) {// Cyan, White | 648 | if(iD==-14) {// Cyan, White |
649 | foreground.setRgb(0x18,0xB2,0xB2); | 649 | foreground.setRgb(0x18,0xB2,0xB2); |
650 | background.setRgb(0xFF,0xFF,0xFF); | 650 | background.setRgb(0xFF,0xFF,0xFF); |
651 | cfg.writeEntry("Schema","14"); | 651 | cfg.writeEntry("Schema","14"); |
652 | colorMenu->setItemChecked(-14,TRUE); | 652 | colorMenu->setItemChecked(-14,TRUE); |
653 | } | 653 | } |
654 | if(iD==-15) {// White, Cyan | 654 | if(iD==-15) {// White, Cyan |
655 | background.setRgb(0x18,0xB2,0xB2); | 655 | background.setRgb(0x18,0xB2,0xB2); |
656 | foreground.setRgb(0xFF,0xFF,0xFF); | 656 | foreground.setRgb(0xFF,0xFF,0xFF); |
657 | cfg.writeEntry("Schema","15"); | 657 | cfg.writeEntry("Schema","15"); |
658 | colorMenu->setItemChecked(-15,TRUE); | 658 | colorMenu->setItemChecked(-15,TRUE); |
659 | } | 659 | } |
660 | if(iD==-16) {// Black, Blue | 660 | if(iD==-16) {// Black, Blue |
661 | background.setRgb(0x00,0x00,0x00); | 661 | background.setRgb(0x00,0x00,0x00); |
662 | foreground.setRgb(0x18,0xB2,0xB2); | 662 | foreground.setRgb(0x18,0xB2,0xB2); |
663 | cfg.writeEntry("Schema","16"); | 663 | cfg.writeEntry("Schema","16"); |
664 | colorMenu->setItemChecked(-16,TRUE); | 664 | colorMenu->setItemChecked(-16,TRUE); |
665 | } | 665 | } |
666 | 666 | ||
667 | for (i = 0; i < TABLE_COLORS; i++) { | 667 | for (i = 0; i < TABLE_COLORS; i++) { |
668 | if(i==0 || i == 10) { | 668 | if(i==0 || i == 10) { |
669 | m_table[i].color = foreground; | 669 | m_table[i].color = foreground; |
670 | } | 670 | } |
671 | else if(i==1 || i == 11) { | 671 | else if(i==1 || i == 11) { |
672 | m_table[i].color = background; m_table[i].transparent=0; | 672 | m_table[i].color = background; m_table[i].transparent=0; |
673 | } | 673 | } |
674 | else | 674 | else |
675 | m_table[i].color = defaultCt[i].color; | 675 | m_table[i].color = defaultCt[i].color; |
676 | } | 676 | } |
677 | } | 677 | } |
678 | lastSelectedMenu = iD; | 678 | lastSelectedMenu = iD; |
679 | te->setColorTable(m_table); | 679 | te->setColorTable(m_table); |
680 | // update(); | 680 | update(); |
681 | } | 681 | } |
682 | 682 | ||
683 | void Konsole::configMenuSelected(int iD) | 683 | void Konsole::configMenuSelected(int iD) |
684 | { | 684 | { |
685 | // QString temp; | 685 | // QString temp; |
686 | // temp.sprintf("%d",iD); | 686 | // temp.sprintf("%d",iD); |
687 | // qDebug(temp); | 687 | // qDebug(temp); |
688 | TEWidget* te = getTe(); | 688 | TEWidget* te = getTe(); |
689 | Config cfg("Konsole"); | 689 | Config cfg("Konsole"); |
690 | cfg.setGroup("Menubar"); | 690 | cfg.setGroup("Menubar"); |
691 | if( iD == -2) { | 691 | if( iD == -2) { |
692 | if(!secondToolBar->isHidden()) { | 692 | if(!secondToolBar->isHidden()) { |
693 | secondToolBar->hide(); | 693 | secondToolBar->hide(); |
694 | configMenu->changeItem( iD,"Show Command List"); | 694 | configMenu->changeItem( iD,"Show Command List"); |
695 | cfg.writeEntry("Hidden","TRUE"); | 695 | cfg.writeEntry("Hidden","TRUE"); |
696 | configMenu->setItemEnabled(-20 ,FALSE); | 696 | configMenu->setItemEnabled(-20 ,FALSE); |
697 | } else { | 697 | } else { |
698 | secondToolBar->show(); | 698 | secondToolBar->show(); |
699 | configMenu->changeItem( iD,"Hide Command List"); | 699 | configMenu->changeItem( iD,"Hide Command List"); |
700 | cfg.writeEntry("Hidden","FALSE"); | 700 | cfg.writeEntry("Hidden","FALSE"); |
701 | configMenu->setItemEnabled(-20 ,TRUE); | 701 | configMenu->setItemEnabled(-20 ,TRUE); |
702 | 702 | ||
703 | if(cfg.readEntry("EditEnabled","FALSE")=="TRUE") { | 703 | if(cfg.readEntry("EditEnabled","FALSE")=="TRUE") { |
704 | configMenu->setItemChecked(-16,TRUE); | 704 | configMenu->setItemChecked(-16,TRUE); |
705 | commonCombo->setEditable( TRUE ); | 705 | commonCombo->setEditable( TRUE ); |
706 | } else { | 706 | } else { |
707 | configMenu->setItemChecked(-20,FALSE); | 707 | configMenu->setItemChecked(-20,FALSE); |
708 | commonCombo->setEditable( FALSE ); | 708 | commonCombo->setEditable( FALSE ); |
709 | } | 709 | } |
710 | } | 710 | } |
711 | } | 711 | } |
712 | if( iD == -3) { | 712 | if( iD == -3) { |
713 | cfg.setGroup("Tabs"); | 713 | cfg.setGroup("Tabs"); |
714 | QString tmp=cfg.readEntry("Position","Top"); | 714 | QString tmp=cfg.readEntry("Position","Top"); |
715 | 715 | ||
716 | if(tmp=="Top") { | 716 | if(tmp=="Top") { |
717 | tab->setTabPosition(QTabWidget::Bottom); | 717 | tab->setTabPosition(QTabWidget::Bottom); |
718 | configMenu->changeItem( iD,"Tabs on Top"); | 718 | configMenu->changeItem( iD,"Tabs on Top"); |
719 | cfg.writeEntry("Position","Bottom"); | 719 | cfg.writeEntry("Position","Bottom"); |
720 | } else { | 720 | } else { |
721 | tab->setTabPosition(QTabWidget::Top); | 721 | tab->setTabPosition(QTabWidget::Top); |
722 | configMenu->changeItem( iD,"Tabs on Bottom"); | 722 | configMenu->changeItem( iD,"Tabs on Bottom"); |
723 | cfg.writeEntry("Position","Top"); | 723 | cfg.writeEntry("Position","Top"); |
724 | } | 724 | } |
725 | } | 725 | } |
726 | if( iD == -20) { | 726 | if( iD == -20) { |
727 | cfg.setGroup("Commands"); | 727 | cfg.setGroup("Commands"); |
728 | // qDebug("enableCommandEdit"); | 728 | // qDebug("enableCommandEdit"); |
729 | if( !configMenu->isItemChecked(iD) ) { | 729 | if( !configMenu->isItemChecked(iD) ) { |
730 | commonCombo->setEditable( TRUE ); | 730 | commonCombo->setEditable( TRUE ); |
731 | configMenu->setItemChecked(iD,TRUE); | 731 | configMenu->setItemChecked(iD,TRUE); |
732 | commonCombo->setCurrentItem(0); | 732 | commonCombo->setCurrentItem(0); |
733 | cfg.writeEntry("EditEnabled","TRUE"); | 733 | cfg.writeEntry("EditEnabled","TRUE"); |
734 | } else { | 734 | } else { |
735 | commonCombo->setEditable( FALSE ); | 735 | commonCombo->setEditable( FALSE ); |
736 | configMenu->setItemChecked(iD,FALSE); | 736 | configMenu->setItemChecked(iD,FALSE); |
737 | cfg.writeEntry("EditEnabled","FALSE"); | 737 | cfg.writeEntry("EditEnabled","FALSE"); |
738 | commonCombo->setFocusPolicy(QWidget::NoFocus); | 738 | commonCombo->setFocusPolicy(QWidget::NoFocus); |
739 | te->setFocus(); | 739 | te->setFocus(); |
740 | } | 740 | } |
741 | } | 741 | } |
742 | } | 742 | } |
743 | 743 | ||
744 | void Konsole::changeCommand(const QString &text, int c) | 744 | void Konsole::changeCommand(const QString &text, int c) |
745 | { | 745 | { |
746 | Config cfg("Konsole"); | 746 | Config cfg("Konsole"); |
747 | cfg.setGroup("Commands"); | 747 | cfg.setGroup("Commands"); |
748 | if(commonCmds[c] != text) { | 748 | if(commonCmds[c] != text) { |
749 | cfg.writeEntry(QString::number(c),text); | 749 | cfg.writeEntry(QString::number(c),text); |
750 | commonCombo->clearEdit(); | 750 | commonCombo->clearEdit(); |
751 | commonCombo->setCurrentItem(c); | 751 | commonCombo->setCurrentItem(c); |
752 | } | 752 | } |
753 | } | 753 | } |
754 | 754 | ||
755 | void Konsole::setColor() | 755 | void Konsole::setColor() |
756 | { | 756 | { |
757 | Config cfg("Konsole"); | 757 | Config cfg("Konsole"); |
758 | cfg.setGroup("Colors"); | 758 | cfg.setGroup("Colors"); |
759 | int scheme = cfg.readNumEntry("Schema",1); | 759 | int scheme = cfg.readNumEntry("Schema",1); |
760 | if(scheme != 1) colorMenuSelected( -scheme); | 760 | if(scheme != 1) colorMenuSelected( -scheme); |
761 | 761 | ||
762 | } | 762 | } |