an attempt to fix #1393 - line wrap issues - at least for the default profile.

i can't see a connectio from the emulation handler back to the GUI so it's probably
still broken for non-default profiles

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
@@ -15,3 +15,3 @@ EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const c
 	// use setWrapAt(80) for normal console with scrollbar
-	setWrap(prof.readNumEntry("Wrap", 0) ? 0 : 80);
+	setWrap(prof.readNumEntry("Wrap", 80) ? 0 : 80);
     m_teWid->setMinimumSize(150, 70 );
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
@@ -143,5 +143,6 @@ void MainWindow::initUI() {
      */
-    m_isWrapped = false;
-    m_wrap = new QAction( tr("Line wrap"), Resource::loadPixmap( "linewrap" ), QString::null, 0, this, 0 );
+    m_isWrapped = true;
+    m_wrap = new QAction( tr("Line wrap"), Resource::loadPixmap( "linewrap" ), QString::null, 0, this, 0, true );
     m_wrap->addTo( m_console );
+    m_wrap->setOn( true );
     connect( m_wrap, SIGNAL( activated() ), SLOT( slotWrap() ) );
@@ -154,3 +155,3 @@ void MainWindow::initUI() {
     m_fullscreen = new QAction( tr("Full screen"), Resource::loadPixmap( "fullscreen" )
-                           , QString::null, 0, this, 0);
+                           , QString::null, 0, this, 0, true );
     m_fullscreen->addTo( m_console );
@@ -536,3 +537,2 @@ void MainWindow::create( const Profile& prof ) {
 
-
     QWidget *w = currentSession()->widget();
@@ -636,12 +636,4 @@ void MainWindow::slotWrap()
         {
-            if(m_isWrapped)
-            {
-                e->setWrap(80);
-                m_isWrapped = false;
-            }
-            else
-            {
-                e->setWrap(0);
-                m_isWrapped = true;
-            }
+            e->setWrap( m_isWrapped ? 80:0 );
+            m_isWrapped = !m_isWrapped;
         }