Diffstat (limited to 'noncore/apps/opie-console/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index b160604..15290ce 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -138,24 +138,25 @@ void MainWindow::initUI() { | |||
138 | 138 | ||
139 | 139 | ||
140 | 140 | ||
141 | /* | 141 | /* |
142 | * immediate change of line wrap policy | 142 | * immediate change of line wrap policy |
143 | */ | 143 | */ |
144 | m_isWrapped = false; | 144 | m_isWrapped = true; |
145 | m_wrap = new QAction( tr("Line wrap"), Resource::loadPixmap( "linewrap" ), QString::null, 0, this, 0 ); | 145 | m_wrap = new QAction( tr("Line wrap"), Resource::loadPixmap( "linewrap" ), QString::null, 0, this, 0, true ); |
146 | m_wrap->addTo( m_console ); | 146 | m_wrap->addTo( m_console ); |
147 | m_wrap->setOn( true ); | ||
147 | connect( m_wrap, SIGNAL( activated() ), SLOT( slotWrap() ) ); | 148 | connect( m_wrap, SIGNAL( activated() ), SLOT( slotWrap() ) ); |
148 | 149 | ||
149 | /* | 150 | /* |
150 | * fullscreen | 151 | * fullscreen |
151 | */ | 152 | */ |
152 | m_isFullscreen = false; | 153 | m_isFullscreen = false; |
153 | 154 | ||
154 | m_fullscreen = new QAction( tr("Full screen"), Resource::loadPixmap( "fullscreen" ) | 155 | m_fullscreen = new QAction( tr("Full screen"), Resource::loadPixmap( "fullscreen" ) |
155 | , QString::null, 0, this, 0); | 156 | , QString::null, 0, this, 0, true ); |
156 | m_fullscreen->addTo( m_console ); | 157 | m_fullscreen->addTo( m_console ); |
157 | connect( m_fullscreen, SIGNAL( activated() ), | 158 | connect( m_fullscreen, SIGNAL( activated() ), |
158 | this, SLOT( slotFullscreen() ) ); | 159 | this, SLOT( slotFullscreen() ) ); |
159 | 160 | ||
160 | m_console->insertSeparator(); | 161 | m_console->insertSeparator(); |
161 | 162 | ||
@@ -531,13 +532,12 @@ void MainWindow::create( const Profile& prof ) { | |||
531 | // is io_layer wants direct connection, then autoconnect | 532 | // is io_layer wants direct connection, then autoconnect |
532 | //if ( ( m_curSession->layer() )->supports()[0] == 1 ) { | 533 | //if ( ( m_curSession->layer() )->supports()[0] == 1 ) { |
533 | if (prof.autoConnect()) { | 534 | if (prof.autoConnect()) { |
534 | slotConnect(); | 535 | slotConnect(); |
535 | } | 536 | } |
536 | 537 | ||
537 | |||
538 | QWidget *w = currentSession()->widget(); | 538 | QWidget *w = currentSession()->widget(); |
539 | if(w) w->setFocus(); | 539 | if(w) w->setFocus(); |
540 | 540 | ||
541 | if(currentSession()->profile().readNumEntry("Wrap", 80)){ | 541 | if(currentSession()->profile().readNumEntry("Wrap", 80)){ |
542 | m_isWrapped = true; | 542 | m_isWrapped = true; |
543 | } else { | 543 | } else { |
@@ -631,22 +631,14 @@ void MainWindow::slotWrap() | |||
631 | { | 631 | { |
632 | if(m_curSession) | 632 | if(m_curSession) |
633 | { | 633 | { |
634 | EmulationHandler *e = m_curSession->emulationHandler(); | 634 | EmulationHandler *e = m_curSession->emulationHandler(); |
635 | if(e) | 635 | if(e) |
636 | { | 636 | { |
637 | if(m_isWrapped) | 637 | e->setWrap( m_isWrapped ? 80:0 ); |
638 | { | 638 | m_isWrapped = !m_isWrapped; |
639 | e->setWrap(80); | ||
640 | m_isWrapped = false; | ||
641 | } | ||
642 | else | ||
643 | { | ||
644 | e->setWrap(0); | ||
645 | m_isWrapped = true; | ||
646 | } | ||
647 | } | 639 | } |
648 | } | 640 | } |
649 | } | 641 | } |
650 | 642 | ||
651 | void MainWindow::slotFullscreen() { | 643 | void MainWindow::slotFullscreen() { |
652 | 644 | ||