-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index ff5c2f1..8207f23 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -588,78 +588,75 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
588 | SLOT(newSession()) ); | 588 | SLOT(newSession()) ); |
589 | 589 | ||
590 | // connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) )); | 590 | // connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) )); |
591 | connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) )); | 591 | connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) )); |
592 | connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) )); | 592 | connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) )); |
593 | connect( tabMenu, SIGNAL( activated(int) ), this, SLOT( tabMenuSelected(int) )); | 593 | connect( tabMenu, SIGNAL( activated(int) ), this, SLOT( tabMenuSelected(int) )); |
594 | connect( scrollMenu, SIGNAL(activated(int)),this,SLOT(scrollMenuSelected(int))); | 594 | connect( scrollMenu, SIGNAL(activated(int)),this,SLOT(scrollMenuSelected(int))); |
595 | connect( editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int))); | 595 | connect( editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int))); |
596 | connect( sessionList, SIGNAL(activated(int)), this, SLOT( sessionListSelected(int) ) ); | 596 | connect( sessionList, SIGNAL(activated(int)), this, SLOT( sessionListSelected(int) ) ); |
597 | 597 | ||
598 | menuBar->insertItem( tr("View"), configMenu ); | 598 | menuBar->insertItem( tr("View"), configMenu ); |
599 | menuBar->insertItem( tr("Fonts"), fontList ); | 599 | menuBar->insertItem( tr("Fonts"), fontList ); |
600 | menuBar->insertItem( tr("Sessions"), sessionList ); | 600 | menuBar->insertItem( tr("Sessions"), sessionList ); |
601 | 601 | ||
602 | toolBar = new QToolBar( this ); | 602 | toolBar = new QToolBar( this ); |
603 | 603 | ||
604 | QAction *a; | 604 | QAction *a; |
605 | 605 | ||
606 | // Button Commands | 606 | // Button Commands |
607 | a = new QAction( tr("New"), Resource::loadPixmap( "konsole/Terminal" ), QString::null, 0, this, 0 ); | 607 | a = new QAction( tr("New"), Resource::loadPixmap( "konsole/Terminal" ), QString::null, 0, this, 0 ); |
608 | connect( a, SIGNAL( activated() ), this, SLOT( newSession() ) ); | 608 | connect( a, SIGNAL( activated() ), this, SLOT( newSession() ) ); |
609 | a->addTo( toolBar ); | 609 | a->addTo( toolBar ); |
610 | 610 | ||
611 | a = new QAction( tr("Full Screen"), Resource::loadPixmap( "fullscreen" ), QString::null, 0, this, 0 ); | 611 | a = new QAction( tr("Full Screen"), Resource::loadPixmap( "fullscreen" ), QString::null, 0, this, 0 ); |
612 | connect( a, SIGNAL( activated() ), this, SLOT( toggleFullScreen() ) ); | 612 | connect( a, SIGNAL( activated() ), this, SLOT( toggleFullScreen() ) ); |
613 | a->addTo( toolBar ); | 613 | a->addTo( toolBar ); |
614 | 614 | ||
615 | a = new QAction( tr("Zoom"), Resource::loadPixmap( "zoom" ), QString::null, 0, this, 0 ); | 615 | a = new QAction( tr("Zoom"), Resource::loadPixmap( "zoom" ), QString::null, 0, this, 0 ); |
616 | connect( a, SIGNAL( activated() ), this, SLOT( cycleZoom() ) ); | 616 | connect( a, SIGNAL( activated() ), this, SLOT( cycleZoom() ) ); |
617 | a->addTo( toolBar ); | 617 | a->addTo( toolBar ); |
618 | 618 | ||
619 | 619 | ||
620 | /* | ||
621 | a = new QAction( tr("Enter"), Resource::loadPixmap( "konsole/enter" ), QString::null, 0, this, 0 ); | 620 | a = new QAction( tr("Enter"), Resource::loadPixmap( "konsole/enter" ), QString::null, 0, this, 0 ); |
622 | connect( a, SIGNAL( activated() ), this, SLOT( hitEnter() ) ); a->addTo( toolBar ); | 621 | connect( a, SIGNAL( activated() ), this, SLOT( hitEnter() ) ); a->addTo( toolBar ); |
623 | a = new QAction( tr("Space"), Resource::loadPixmap( "konsole/space" ), QString::null, 0, this, 0 ); | 622 | a = new QAction( tr("Space"), Resource::loadPixmap( "konsole/space" ), QString::null, 0, this, 0 ); |
624 | connect( a, SIGNAL( activated() ), this, SLOT( hitSpace() ) ); a->addTo( toolBar ); | 623 | connect( a, SIGNAL( activated() ), this, SLOT( hitSpace() ) ); a->addTo( toolBar ); |
625 | a = new QAction( tr("Tab"), Resource::loadPixmap( "konsole/tab" ), QString::null, 0, this, 0 ); | 624 | a = new QAction( tr("Tab"), Resource::loadPixmap( "konsole/tab" ), QString::null, 0, this, 0 ); |
626 | connect( a, SIGNAL( activated() ), this, SLOT( hitTab() ) ); a->addTo( toolBar ); | 625 | connect( a, SIGNAL( activated() ), this, SLOT( hitTab() ) ); a->addTo( toolBar ); |
627 | */ | ||
628 | /* | ||
629 | a = new QAction( tr("Up"), Resource::loadPixmap( "konsole/up" ), QString::null, 0, this, 0 ); | 626 | a = new QAction( tr("Up"), Resource::loadPixmap( "konsole/up" ), QString::null, 0, this, 0 ); |
630 | connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolBar ); | 627 | connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolBar ); |
631 | a = new QAction( tr("Down"), Resource::loadPixmap( "konsole/down" ), QString::null, 0, this, 0 ); | 628 | a = new QAction( tr("Down"), Resource::loadPixmap( "konsole/down" ), QString::null, 0, this, 0 ); |
632 | connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolBar ); | 629 | connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolBar ); |
633 | */ | 630 | |
634 | a = new QAction( tr("Paste"), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 ); | 631 | a = new QAction( tr("Paste"), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 ); |
635 | connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) ); | 632 | connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) ); |
636 | a->addTo( toolBar ); | 633 | a->addTo( toolBar ); |
637 | 634 | ||
638 | secondToolBar = new QToolBar( this ); | 635 | secondToolBar = new QToolBar( this ); |
639 | secondToolBar->setHorizontalStretchable( TRUE ); | 636 | secondToolBar->setHorizontalStretchable( TRUE ); |
640 | 637 | ||
641 | commonCombo = new QComboBox( secondToolBar ); | 638 | commonCombo = new QComboBox( secondToolBar ); |
642 | // commonCombo->setMaximumWidth(236); | 639 | // commonCombo->setMaximumWidth(236); |
643 | 640 | ||
644 | ec_quick = editCommandListMenu->insertItem( tr( "Quick Edit" ) ); | 641 | ec_quick = editCommandListMenu->insertItem( tr( "Quick Edit" ) ); |
645 | if( listHidden) | 642 | if( listHidden) |
646 | { | 643 | { |
647 | secondToolBar->hide(); | 644 | secondToolBar->hide(); |
648 | editCommandListMenu->setItemEnabled(ec_quick ,FALSE); | 645 | editCommandListMenu->setItemEnabled(ec_quick ,FALSE); |
649 | } | 646 | } |
650 | ec_edit = editCommandListMenu->insertItem(tr( "Edit..." ) ); | 647 | ec_edit = editCommandListMenu->insertItem(tr( "Edit..." ) ); |
651 | 648 | ||
652 | cfg.setGroup("Commands"); | 649 | cfg.setGroup("Commands"); |
653 | commonCombo->setInsertionPolicy(QComboBox::AtCurrent); | 650 | commonCombo->setInsertionPolicy(QComboBox::AtCurrent); |
654 | 651 | ||
655 | initCommandList(); | 652 | initCommandList(); |
656 | // for (int i = 0; commonCmds[i] != NULL; i++) { | 653 | // for (int i = 0; commonCmds[i] != NULL; i++) { |
657 | // commonCombo->insertItem( commonCmds[i], i ); | 654 | // commonCombo->insertItem( commonCmds[i], i ); |
658 | // tmp = cfg.readEntry( QString::number(i),""); | 655 | // tmp = cfg.readEntry( QString::number(i),""); |
659 | // if(tmp != "") | 656 | // if(tmp != "") |
660 | // commonCombo->changeItem( tmp,i ); | 657 | // commonCombo->changeItem( tmp,i ); |
661 | // } | 658 | // } |
662 | 659 | ||
663 | connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) )); | 660 | connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) )); |
664 | 661 | ||
665 | sm_none = scrollMenu->insertItem(tr( "None" )); | 662 | sm_none = scrollMenu->insertItem(tr( "None" )); |