Diffstat (limited to 'core/apps/embeddedkonsole/konsole.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index 7f3ea65..f4ca0bf 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -601,51 +601,54 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
601 | a->addTo( toolBar ); | 601 | a->addTo( toolBar ); |
602 | 602 | ||
603 | a = new QAction( tr("Zoom"), Opie::Core::OResource::loadPixmap( "zoom", Opie::Core::OResource::SmallIcon ), | 603 | a = new QAction( tr("Zoom"), Opie::Core::OResource::loadPixmap( "zoom", Opie::Core::OResource::SmallIcon ), |
604 | QString::null, 0, this, 0 ); | 604 | QString::null, 0, this, 0 ); |
605 | connect( a, SIGNAL( activated() ), this, SLOT( cycleZoom() ) ); | 605 | connect( a, SIGNAL( activated() ), this, SLOT( cycleZoom() ) ); |
606 | a->addTo( toolBar ); | 606 | a->addTo( toolBar ); |
607 | 607 | ||
608 | 608 | ||
609 | a = new QAction( tr("Enter"), Opie::Core::OResource::loadPixmap( "konsole/enter", Opie::Core::OResource::SmallIcon ), | 609 | a = new QAction( tr("Enter"), Opie::Core::OResource::loadPixmap( "konsole/enter", Opie::Core::OResource::SmallIcon ), |
610 | QString::null, 0, this, 0 ); | 610 | QString::null, 0, this, 0 ); |
611 | connect( a, SIGNAL( activated() ), this, SLOT( hitEnter() ) ); a->addTo( toolBar ); | 611 | connect( a, SIGNAL( activated() ), this, SLOT( hitEnter() ) ); a->addTo( toolBar ); |
612 | a = new QAction( tr("Space"), Opie::Core::OResource::loadPixmap( "konsole/space", Opie::Core::OResource::SmallIcon ), | 612 | a = new QAction( tr("Space"), Opie::Core::OResource::loadPixmap( "konsole/space", Opie::Core::OResource::SmallIcon ), |
613 | QString::null, 0, this, 0 ); | 613 | QString::null, 0, this, 0 ); |
614 | connect( a, SIGNAL( activated() ), this, SLOT( hitSpace() ) ); a->addTo( toolBar ); | 614 | connect( a, SIGNAL( activated() ), this, SLOT( hitSpace() ) ); a->addTo( toolBar ); |
615 | a = new QAction( tr("Tab"), Opie::Core::OResource::loadPixmap( "konsole/tab", Opie::Core::OResource::SmallIcon ), | 615 | a = new QAction( tr("Tab"), Opie::Core::OResource::loadPixmap( "konsole/tab", Opie::Core::OResource::SmallIcon ), |
616 | QString::null, 0, this, 0 ); | 616 | QString::null, 0, this, 0 ); |
617 | connect( a, SIGNAL( activated() ), this, SLOT( hitTab() ) ); a->addTo( toolBar ); | 617 | connect( a, SIGNAL( activated() ), this, SLOT( hitTab() ) ); a->addTo( toolBar ); |
618 | a = new QAction( tr("Up"), Opie::Core::OResource::loadPixmap( "konsole/up", Opie::Core::OResource::SmallIcon ), | 618 | a = new QAction( tr("Up"), Opie::Core::OResource::loadPixmap( "konsole/up", Opie::Core::OResource::SmallIcon ), |
619 | QString::null, 0, this, 0 ); | 619 | QString::null, 0, this, 0 ); |
620 | connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolBar ); | 620 | connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolBar ); |
621 | a = new QAction( tr("Down"), Opie::Core::OResource::loadPixmap( "konsole/down", Opie::Core::OResource::SmallIcon ), | 621 | a = new QAction( tr("Down"), Opie::Core::OResource::loadPixmap( "konsole/down", Opie::Core::OResource::SmallIcon ), |
622 | QString::null, 0, this, 0 ); | 622 | QString::null, 0, this, 0 ); |
623 | connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolBar ); | 623 | connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolBar ); |
624 | 624 | ||
625 | a = new QAction( tr("Paste"), Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ), | 625 | a = new QAction( tr("Paste"), Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); |
626 | QString::null, 0, this, 0 ); | ||
627 | connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) ); | 626 | connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) ); |
627 | |||
628 | a = new QAction( tr("Close"), Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),QString::null, 0, this, 0 ); | ||
629 | connect( a, SIGNAL( activated() ), this, SLOT( closeSession() ) ); | ||
630 | |||
628 | a->addTo( toolBar ); | 631 | a->addTo( toolBar ); |
629 | 632 | ||
630 | secondToolBar = new QToolBar( this ); | 633 | secondToolBar = new QToolBar( this ); |
631 | secondToolBar->setHorizontalStretchable( TRUE ); | 634 | secondToolBar->setHorizontalStretchable( TRUE ); |
632 | 635 | ||
633 | commonCombo = new QComboBox( secondToolBar ); | 636 | commonCombo = new QComboBox( secondToolBar ); |
634 | // commonCombo->setMaximumWidth(236); | 637 | // commonCombo->setMaximumWidth(236); |
635 | 638 | ||
636 | ec_quick = editCommandListMenu->insertItem( tr( "Quick Edit" ) ); | 639 | ec_quick = editCommandListMenu->insertItem( tr( "Quick Edit" ) ); |
637 | if( listHidden) | 640 | if( listHidden) |
638 | { | 641 | { |
639 | secondToolBar->hide(); | 642 | secondToolBar->hide(); |
640 | editCommandListMenu->setItemEnabled(ec_quick ,FALSE); | 643 | editCommandListMenu->setItemEnabled(ec_quick ,FALSE); |
641 | } | 644 | } |
642 | ec_edit = editCommandListMenu->insertItem(tr( "Edit..." ) ); | 645 | ec_edit = editCommandListMenu->insertItem(tr( "Edit..." ) ); |
643 | 646 | ||
644 | cfg.setGroup("Commands"); | 647 | cfg.setGroup("Commands"); |
645 | commonCombo->setInsertionPolicy(QComboBox::AtCurrent); | 648 | commonCombo->setInsertionPolicy(QComboBox::AtCurrent); |
646 | 649 | ||
647 | initCommandList(); | 650 | initCommandList(); |
648 | // for (int i = 0; commonCmds[i] != NULL; i++) { | 651 | // for (int i = 0; commonCmds[i] != NULL; i++) { |
649 | // commonCombo->insertItem( commonCmds[i], i ); | 652 | // commonCombo->insertItem( commonCmds[i], i ); |
650 | // tmp = cfg.readEntry( QString::number(i),""); | 653 | // tmp = cfg.readEntry( QString::number(i),""); |
651 | // if(tmp != "") | 654 | // if(tmp != "") |
@@ -1895,24 +1898,27 @@ void Konsole::changeBackgroundColor(const QColor &color) | |||
1895 | color.rgb(&r,&g,&b); | 1898 | color.rgb(&r,&g,&b); |
1896 | background.setRgb(r,g,b); | 1899 | background.setRgb(r,g,b); |
1897 | cfg.writeEntry("background",color.name()); | 1900 | cfg.writeEntry("background",color.name()); |
1898 | odebug << "background "+color.name() << oendl; | 1901 | odebug << "background "+color.name() << oendl; |
1899 | cfg.write(); | 1902 | cfg.write(); |
1900 | } | 1903 | } |
1901 | 1904 | ||
1902 | void Konsole::doWrap() | 1905 | void Konsole::doWrap() |
1903 | { | 1906 | { |
1904 | Config cfg( "Konsole" ); | 1907 | Config cfg( "Konsole" ); |
1905 | cfg.setGroup("ScrollBar"); | 1908 | cfg.setGroup("ScrollBar"); |
1906 | TEWidget* te = getTe(); | 1909 | TEWidget* te = getTe(); |
1907 | if( !cfg.readBoolEntry("HorzScroll",0)) | 1910 | if( !cfg.readBoolEntry("HorzScroll",0)) |
1908 | { | 1911 | { |
1909 | te->setWrapAt(0); | 1912 | te->setWrapAt(0); |
1910 | configMenu->setItemChecked( cm_wrap,TRUE); | 1913 | configMenu->setItemChecked( cm_wrap,TRUE); |
1911 | } | 1914 | } |
1912 | else | 1915 | else |
1913 | { | 1916 | { |
1914 | // te->setWrapAt(90); | 1917 | // te->setWrapAt(90); |
1915 | te->setWrapAt(120); | 1918 | te->setWrapAt(120); |
1916 | configMenu->setItemChecked( cm_wrap,FALSE); | 1919 | configMenu->setItemChecked( cm_wrap,FALSE); |
1917 | } | 1920 | } |
1918 | } | 1921 | } |
1922 | void Konsole::closeSession() { | ||
1923 | doneSession(getTe(), 0); | ||
1924 | } | ||