-rw-r--r-- | noncore/apps/opie-console/emulation_handler.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 20 |
2 files changed, 7 insertions, 15 deletions
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp index c8022b9..956ac76 100644 --- a/noncore/apps/opie-console/emulation_handler.cpp +++ b/noncore/apps/opie-console/emulation_handler.cpp | |||
@@ -14,5 +14,5 @@ EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const c | |||
14 | // use setWrapAt(0) for classic behaviour (wrap at screen width, no scrollbar) | 14 | // use setWrapAt(0) for classic behaviour (wrap at screen width, no scrollbar) |
15 | // use setWrapAt(80) for normal console with scrollbar | 15 | // use setWrapAt(80) for normal console with scrollbar |
16 | setWrap(prof.readNumEntry("Wrap", 0) ? 0 : 80); | 16 | setWrap(prof.readNumEntry("Wrap", 80) ? 0 : 80); |
17 | m_teWid->setMinimumSize(150, 70 ); | 17 | m_teWid->setMinimumSize(150, 70 ); |
18 | m_script = 0; | 18 | m_script = 0; |
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 | |||
@@ -142,7 +142,8 @@ void MainWindow::initUI() { | |||
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 | ||
@@ -153,5 +154,5 @@ void MainWindow::initUI() { | |||
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() ), |
@@ -535,5 +536,4 @@ void MainWindow::create( const Profile& prof ) { | |||
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(); |
@@ -635,14 +635,6 @@ void MainWindow::slotWrap() | |||
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 | } |