-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 2 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/opie-embeddedkonsole.control | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index 80c8223..5cfd644 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -512,193 +512,193 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
512 | QMenuBar *menuBar = new QMenuBar( menuToolBar ); | 512 | QMenuBar *menuBar = new QMenuBar( menuToolBar ); |
513 | 513 | ||
514 | setFont(cfont); | 514 | setFont(cfont); |
515 | 515 | ||
516 | configMenu = new QPopupMenu( this); | 516 | configMenu = new QPopupMenu( this); |
517 | colorMenu = new QPopupMenu( this); | 517 | colorMenu = new QPopupMenu( this); |
518 | scrollMenu = new QPopupMenu( this); | 518 | scrollMenu = new QPopupMenu( this); |
519 | editCommandListMenu = new QPopupMenu( this); | 519 | editCommandListMenu = new QPopupMenu( this); |
520 | 520 | ||
521 | configMenu->insertItem(tr("Command List"), editCommandListMenu); | 521 | configMenu->insertItem(tr("Command List"), editCommandListMenu); |
522 | 522 | ||
523 | bool listHidden; | 523 | bool listHidden; |
524 | cfg.setGroup("Menubar"); | 524 | cfg.setGroup("Menubar"); |
525 | if( cfg.readEntry("Hidden","FALSE") == "TRUE") | 525 | if( cfg.readEntry("Hidden","FALSE") == "TRUE") |
526 | { | 526 | { |
527 | ec_cmdlist = editCommandListMenu->insertItem( tr( "Show command list" )); | 527 | ec_cmdlist = editCommandListMenu->insertItem( tr( "Show command list" )); |
528 | listHidden=TRUE; | 528 | listHidden=TRUE; |
529 | } | 529 | } |
530 | else | 530 | else |
531 | { | 531 | { |
532 | ec_cmdlist = editCommandListMenu->insertItem( tr( "Hide command list" )); | 532 | ec_cmdlist = editCommandListMenu->insertItem( tr( "Hide command list" )); |
533 | listHidden=FALSE; | 533 | listHidden=FALSE; |
534 | } | 534 | } |
535 | 535 | ||
536 | cfg.setGroup("Tabs"); | 536 | cfg.setGroup("Tabs"); |
537 | 537 | ||
538 | tabMenu = new QPopupMenu(this); | 538 | tabMenu = new QPopupMenu(this); |
539 | tm_bottom = tabMenu->insertItem(tr("Bottom" )); | 539 | tm_bottom = tabMenu->insertItem(tr("Bottom" )); |
540 | tm_top = tabMenu->insertItem(tr("Top")); | 540 | tm_top = tabMenu->insertItem(tr("Top")); |
541 | tm_hidden = tabMenu->insertItem(tr("Hidden")); | 541 | tm_hidden = tabMenu->insertItem(tr("Hidden")); |
542 | 542 | ||
543 | configMenu->insertItem(tr("Tabs"), tabMenu); | 543 | configMenu->insertItem(tr("Tabs"), tabMenu); |
544 | 544 | ||
545 | tmp=cfg.readEntry("Position","Top"); | 545 | tmp=cfg.readEntry("Position","Top"); |
546 | if(tmp=="Top") | 546 | if(tmp=="Top") |
547 | { | 547 | { |
548 | tab->setTabPosition(QTabWidget::Top); | 548 | tab->setTabPosition(QTabWidget::Top); |
549 | tab->getTabBar()->show(); | 549 | tab->getTabBar()->show(); |
550 | tabPos = tm_top; | 550 | tabPos = tm_top; |
551 | } | 551 | } |
552 | else if (tmp=="Bottom") | 552 | else if (tmp=="Bottom") |
553 | { | 553 | { |
554 | tab->setTabPosition(QTabWidget::Bottom); | 554 | tab->setTabPosition(QTabWidget::Bottom); |
555 | tab->getTabBar()->show(); | 555 | tab->getTabBar()->show(); |
556 | tabPos = tm_bottom; | 556 | tabPos = tm_bottom; |
557 | } | 557 | } |
558 | else | 558 | else |
559 | { | 559 | { |
560 | tab->getTabBar()->hide(); | 560 | tab->getTabBar()->hide(); |
561 | tab->setMargin(tab->margin()); | 561 | tab->setMargin(tab->margin()); |
562 | tabPos = tm_hidden; | 562 | tabPos = tm_hidden; |
563 | } | 563 | } |
564 | 564 | ||
565 | cm_bw = colorMenu->insertItem(tr( "Black on White")); | 565 | cm_bw = colorMenu->insertItem(tr( "Black on White")); |
566 | cm_wb = colorMenu->insertItem(tr( "White on Black")); | 566 | cm_wb = colorMenu->insertItem(tr( "White on Black")); |
567 | cm_gb = colorMenu->insertItem(tr( "Green on Black")); | 567 | cm_gb = colorMenu->insertItem(tr( "Green on Black")); |
568 | // cm_bt = colorMenu->insertItem(tr( "Black on Transparent")); | 568 | // cm_bt = colorMenu->insertItem(tr( "Black on Transparent")); |
569 | cm_br = colorMenu->insertItem(tr( "Black on Pink")); | 569 | cm_br = colorMenu->insertItem(tr( "Black on Pink")); |
570 | cm_rb = colorMenu->insertItem(tr( "Pink on Black")); | 570 | cm_rb = colorMenu->insertItem(tr( "Pink on Black")); |
571 | cm_gy = colorMenu->insertItem(tr( "Green on Yellow")); | 571 | cm_gy = colorMenu->insertItem(tr( "Green on Yellow")); |
572 | cm_bm = colorMenu->insertItem(tr( "Blue on Magenta")); | 572 | cm_bm = colorMenu->insertItem(tr( "Blue on Magenta")); |
573 | cm_mb = colorMenu->insertItem(tr( "Magenta on Blue")); | 573 | cm_mb = colorMenu->insertItem(tr( "Magenta on Blue")); |
574 | cm_cw = colorMenu->insertItem(tr( "Cyan on White")); | 574 | cm_cw = colorMenu->insertItem(tr( "Cyan on White")); |
575 | cm_wc = colorMenu->insertItem(tr( "White on Cyan")); | 575 | cm_wc = colorMenu->insertItem(tr( "White on Cyan")); |
576 | cm_bb = colorMenu->insertItem(tr( "Blue on Black")); | 576 | cm_bb = colorMenu->insertItem(tr( "Blue on Black")); |
577 | cm_ab = colorMenu->insertItem(tr( "Amber on Black")); | 577 | cm_ab = colorMenu->insertItem(tr( "Amber on Black")); |
578 | cm_default = colorMenu->insertItem(tr("default")); | 578 | cm_default = colorMenu->insertItem(tr("default")); |
579 | 579 | ||
580 | #ifdef QT_QWS_OPIE | 580 | #ifdef QT_QWS_OPIE |
581 | 581 | ||
582 | colorMenu->insertItem(tr( "Custom")); | 582 | colorMenu->insertItem(tr( "Custom")); |
583 | #endif | 583 | #endif |
584 | 584 | ||
585 | configMenu->insertItem(tr( "Colors") ,colorMenu); | 585 | configMenu->insertItem(tr( "Colors") ,colorMenu); |
586 | 586 | ||
587 | sessionList = new QPopupMenu(this); | 587 | sessionList = new QPopupMenu(this); |
588 | sessionList-> insertItem ( Resource::loadPixmap ( "konsole/Terminal" ), tr( "new session" ), this, | 588 | sessionList-> insertItem ( Resource::loadPixmap ( "konsole/Terminal" ), tr( "new session" ), this, |
589 | SLOT(newSession()) ); | 589 | SLOT(newSession()) ); |
590 | 590 | ||
591 | // connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) )); | 591 | // connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) )); |
592 | connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) )); | 592 | connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) )); |
593 | connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) )); | 593 | connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) )); |
594 | connect( tabMenu, SIGNAL( activated(int) ), this, SLOT( tabMenuSelected(int) )); | 594 | connect( tabMenu, SIGNAL( activated(int) ), this, SLOT( tabMenuSelected(int) )); |
595 | connect( scrollMenu, SIGNAL(activated(int)),this,SLOT(scrollMenuSelected(int))); | 595 | connect( scrollMenu, SIGNAL(activated(int)),this,SLOT(scrollMenuSelected(int))); |
596 | connect( editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int))); | 596 | connect( editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int))); |
597 | connect( sessionList, SIGNAL(activated(int)), this, SLOT( sessionListSelected(int) ) ); | 597 | connect( sessionList, SIGNAL(activated(int)), this, SLOT( sessionListSelected(int) ) ); |
598 | 598 | ||
599 | menuBar->insertItem( tr("View"), configMenu ); | 599 | menuBar->insertItem( tr("View"), configMenu ); |
600 | menuBar->insertItem( tr("Fonts"), fontList ); | 600 | menuBar->insertItem( tr("Fonts"), fontList ); |
601 | menuBar->insertItem( tr("Sessions"), sessionList ); | 601 | menuBar->insertItem( tr("Sessions"), sessionList ); |
602 | 602 | ||
603 | toolBar = new QToolBar( this ); | 603 | toolBar = new QToolBar( this ); |
604 | 604 | ||
605 | QAction *a; | 605 | QAction *a; |
606 | 606 | ||
607 | // Button Commands | 607 | // Button Commands |
608 | a = new QAction( tr("New"), Resource::loadPixmap( "konsole/Terminal" ), QString::null, 0, this, 0 ); | 608 | a = new QAction( tr("New"), Resource::loadPixmap( "konsole/konsole" ), QString::null, 0, this, 0 ); |
609 | connect( a, SIGNAL( activated() ), this, SLOT( newSession() ) ); | 609 | connect( a, SIGNAL( activated() ), this, SLOT( newSession() ) ); |
610 | a->addTo( toolBar ); | 610 | a->addTo( toolBar ); |
611 | 611 | ||
612 | a = new QAction( tr("Full Screen"), Resource::loadPixmap( "fullscreen" ), QString::null, 0, this, 0 ); | 612 | a = new QAction( tr("Full Screen"), Resource::loadPixmap( "fullscreen" ), QString::null, 0, this, 0 ); |
613 | connect( a, SIGNAL( activated() ), this, SLOT( toggleFullScreen() ) ); | 613 | connect( a, SIGNAL( activated() ), this, SLOT( toggleFullScreen() ) ); |
614 | a->addTo( toolBar ); | 614 | a->addTo( toolBar ); |
615 | 615 | ||
616 | a = new QAction( tr("Zoom"), Resource::loadPixmap( "zoom" ), QString::null, 0, this, 0 ); | 616 | a = new QAction( tr("Zoom"), Resource::loadPixmap( "zoom" ), QString::null, 0, this, 0 ); |
617 | connect( a, SIGNAL( activated() ), this, SLOT( cycleZoom() ) ); | 617 | connect( a, SIGNAL( activated() ), this, SLOT( cycleZoom() ) ); |
618 | a->addTo( toolBar ); | 618 | a->addTo( toolBar ); |
619 | 619 | ||
620 | 620 | ||
621 | a = new QAction( tr("Enter"), Resource::loadPixmap( "konsole/enter" ), QString::null, 0, this, 0 ); | 621 | 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 ); | 622 | 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 ); | 623 | 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 ); | 624 | 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 ); | 625 | 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 ); | 626 | connect( a, SIGNAL( activated() ), this, SLOT( hitTab() ) ); a->addTo( toolBar ); |
627 | a = new QAction( tr("Up"), Resource::loadPixmap( "konsole/up" ), QString::null, 0, this, 0 ); | 627 | a = new QAction( tr("Up"), Resource::loadPixmap( "konsole/up" ), QString::null, 0, this, 0 ); |
628 | connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolBar ); | 628 | connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolBar ); |
629 | a = new QAction( tr("Down"), Resource::loadPixmap( "konsole/down" ), QString::null, 0, this, 0 ); | 629 | a = new QAction( tr("Down"), Resource::loadPixmap( "konsole/down" ), QString::null, 0, this, 0 ); |
630 | connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolBar ); | 630 | connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolBar ); |
631 | 631 | ||
632 | a = new QAction( tr("Paste"), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 ); | 632 | a = new QAction( tr("Paste"), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 ); |
633 | connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) ); | 633 | connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) ); |
634 | a->addTo( toolBar ); | 634 | a->addTo( toolBar ); |
635 | 635 | ||
636 | secondToolBar = new QToolBar( this ); | 636 | secondToolBar = new QToolBar( this ); |
637 | secondToolBar->setHorizontalStretchable( TRUE ); | 637 | secondToolBar->setHorizontalStretchable( TRUE ); |
638 | 638 | ||
639 | commonCombo = new QComboBox( secondToolBar ); | 639 | commonCombo = new QComboBox( secondToolBar ); |
640 | // commonCombo->setMaximumWidth(236); | 640 | // commonCombo->setMaximumWidth(236); |
641 | 641 | ||
642 | ec_quick = editCommandListMenu->insertItem( tr( "Quick Edit" ) ); | 642 | ec_quick = editCommandListMenu->insertItem( tr( "Quick Edit" ) ); |
643 | if( listHidden) | 643 | if( listHidden) |
644 | { | 644 | { |
645 | secondToolBar->hide(); | 645 | secondToolBar->hide(); |
646 | editCommandListMenu->setItemEnabled(ec_quick ,FALSE); | 646 | editCommandListMenu->setItemEnabled(ec_quick ,FALSE); |
647 | } | 647 | } |
648 | ec_edit = editCommandListMenu->insertItem(tr( "Edit..." ) ); | 648 | ec_edit = editCommandListMenu->insertItem(tr( "Edit..." ) ); |
649 | 649 | ||
650 | cfg.setGroup("Commands"); | 650 | cfg.setGroup("Commands"); |
651 | commonCombo->setInsertionPolicy(QComboBox::AtCurrent); | 651 | commonCombo->setInsertionPolicy(QComboBox::AtCurrent); |
652 | 652 | ||
653 | initCommandList(); | 653 | initCommandList(); |
654 | // for (int i = 0; commonCmds[i] != NULL; i++) { | 654 | // for (int i = 0; commonCmds[i] != NULL; i++) { |
655 | // commonCombo->insertItem( commonCmds[i], i ); | 655 | // commonCombo->insertItem( commonCmds[i], i ); |
656 | // tmp = cfg.readEntry( QString::number(i),""); | 656 | // tmp = cfg.readEntry( QString::number(i),""); |
657 | // if(tmp != "") | 657 | // if(tmp != "") |
658 | // commonCombo->changeItem( tmp,i ); | 658 | // commonCombo->changeItem( tmp,i ); |
659 | // } | 659 | // } |
660 | 660 | ||
661 | connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) )); | 661 | connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) )); |
662 | 662 | ||
663 | sm_none = scrollMenu->insertItem(tr( "None" )); | 663 | sm_none = scrollMenu->insertItem(tr( "None" )); |
664 | sm_left = scrollMenu->insertItem(tr( "Left" )); | 664 | sm_left = scrollMenu->insertItem(tr( "Left" )); |
665 | sm_right = scrollMenu->insertItem(tr( "Right" )); | 665 | sm_right = scrollMenu->insertItem(tr( "Right" )); |
666 | // scrollMenu->insertSeparator(4); | 666 | // scrollMenu->insertSeparator(4); |
667 | // scrollMenu->insertItem(tr( "Horizontal" )); | 667 | // scrollMenu->insertItem(tr( "Horizontal" )); |
668 | 668 | ||
669 | configMenu->insertItem(tr( "ScrollBar" ),scrollMenu); | 669 | configMenu->insertItem(tr( "ScrollBar" ),scrollMenu); |
670 | 670 | ||
671 | configMenu->insertItem(tr( "History..." ), this, SLOT(historyDialog())); | 671 | configMenu->insertItem(tr( "History..." ), this, SLOT(historyDialog())); |
672 | 672 | ||
673 | cm_wrap = configMenu->insertItem(tr( "Wrap" )); | 673 | cm_wrap = configMenu->insertItem(tr( "Wrap" )); |
674 | cfg.setGroup("ScrollBar"); | 674 | cfg.setGroup("ScrollBar"); |
675 | configMenu->setItemChecked(cm_wrap, cfg.readBoolEntry("HorzScroll",0)); | 675 | configMenu->setItemChecked(cm_wrap, cfg.readBoolEntry("HorzScroll",0)); |
676 | 676 | ||
677 | cm_beep = configMenu->insertItem(tr( "Use Beep" )); | 677 | cm_beep = configMenu->insertItem(tr( "Use Beep" )); |
678 | cfg.setGroup("Menubar"); | 678 | cfg.setGroup("Menubar"); |
679 | configMenu->setItemChecked(cm_beep, cfg.readBoolEntry("useBeep",0)); | 679 | configMenu->setItemChecked(cm_beep, cfg.readBoolEntry("useBeep",0)); |
680 | 680 | ||
681 | fullscreen_msg = new QLabel(this); | 681 | fullscreen_msg = new QLabel(this); |
682 | fullscreen_msg-> setAlignment ( AlignCenter | SingleLine ); | 682 | fullscreen_msg-> setAlignment ( AlignCenter | SingleLine ); |
683 | fullscreen_msg-> hide(); | 683 | fullscreen_msg-> hide(); |
684 | fullscreen_msg-> setSizePolicy ( QSizePolicy ( QSizePolicy::Expanding, QSizePolicy::Expanding )); | 684 | fullscreen_msg-> setSizePolicy ( QSizePolicy ( QSizePolicy::Expanding, QSizePolicy::Expanding )); |
685 | fullscreen_msg-> setAutoResize(true); | 685 | fullscreen_msg-> setAutoResize(true); |
686 | fullscreen_msg-> setFrameStyle(QFrame::PopupPanel | QFrame::Raised); | 686 | fullscreen_msg-> setFrameStyle(QFrame::PopupPanel | QFrame::Raised); |
687 | fullscreen_msg-> setText(tr("To exit fullscreen, tap here.")); | 687 | fullscreen_msg-> setText(tr("To exit fullscreen, tap here.")); |
688 | 688 | ||
689 | fullscreen_timer = new QTimer(this); | 689 | fullscreen_timer = new QTimer(this); |
690 | connect(fullscreen_timer, SIGNAL(timeout()), | 690 | connect(fullscreen_timer, SIGNAL(timeout()), |
691 | this, SLOT(fullscreenTimeout())); | 691 | this, SLOT(fullscreenTimeout())); |
692 | show_fullscreen_msg = true; | 692 | show_fullscreen_msg = true; |
693 | 693 | ||
694 | //scrollMenuSelected(-29); | 694 | //scrollMenuSelected(-29); |
695 | // cfg.setGroup("ScrollBar"); | 695 | // cfg.setGroup("ScrollBar"); |
696 | // if(cfg.readBoolEntry("HorzScroll",0)) { | 696 | // if(cfg.readBoolEntry("HorzScroll",0)) { |
697 | // if(cfg.readNumEntry("Position",2) == 0) | 697 | // if(cfg.readNumEntry("Position",2) == 0) |
698 | // te->setScrollbarLocation(1); | 698 | // te->setScrollbarLocation(1); |
699 | // else | 699 | // else |
700 | // te->setScrollbarLocation(0); | 700 | // te->setScrollbarLocation(0); |
701 | // te->setScrollbarLocation( cfg.readNumEntry("Position",2)); | 701 | // te->setScrollbarLocation( cfg.readNumEntry("Position",2)); |
702 | // te->setWrapAt(120); | 702 | // te->setWrapAt(120); |
703 | // } | 703 | // } |
704 | // create applications ///////////////////////////////////////////////////// | 704 | // create applications ///////////////////////////////////////////////////// |
diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control index a338e19..8456ff7 100644 --- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control +++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-embeddedkonsole | 1 | Package: opie-embeddedkonsole |
2 | Files: plugins/application/libembeddedkonsole.so* bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole | 2 | Files: plugins/application/libembeddedkonsole.so* bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole/Terminal.png pics/konsole/down.png pics/konsole/enter.png pics/konsole/konsole.png pics/konsole/space.png pics/konsole/tab.png pics/konsole/up.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: L.J. Potter <lpotter@trolltech.com> | 5 | Maintainer: L.J. Potter <lpotter@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal, libopiecore2, libqtaux2, opie-keytabs | 7 | Depends: task-opie-minimal, libopiecore2, libqtaux2, opie-keytabs |
8 | Description: KDE's konsole (shell terminal) | 8 | Description: KDE's konsole (shell terminal) |
9 | Ported to the Opie environment. | 9 | Ported to the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |