Make the Modem take custom Ats again

Supply default values
set labels to richtext this way we achieve word wrap
IO_Layer added a closed(IOLayer*) signal
ProfileEditorDialog make Horizontal scrolling on the QScrollView
possible. Once the Vertical Scrollbar is there the Modem dialog
does not have enough space

8 files changed, 30 insertions, 25 deletions

diff --git a/noncore/apps/opie-console/atconfigdialog.cpp b/noncore/apps/opie-console/atconfigdialog.cpp
index 5c02692..e683ab3 100644
--- a/noncore/apps/opie-console/atconfigdialog.cpp
+++ b/noncore/apps/opie-console/atconfigdialog.cpp
@@ -153,6 +153,7 @@ QWidget* ATConfigDialog::tab1( QWidget* parent ) {
 
 
 void ATConfigDialog::readConfig( const Profile& config ) {
+    qWarning("config in atconfigdialog");
 
     initStringLine->setText( config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ) );
     resetStringLine->setText( config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING ) );
diff --git a/noncore/apps/opie-console/dialdialog.cpp b/noncore/apps/opie-console/dialdialog.cpp
index ac1e1db..b91727b 100644
--- a/noncore/apps/opie-console/dialdialog.cpp
+++ b/noncore/apps/opie-console/dialdialog.cpp
@@ -20,6 +20,7 @@ DialDialog::DialDialog(  QWidget* parent, const char* name, bool modal, WFlags f
     QVBoxLayout *mainLayout = new QVBoxLayout( this );
 
     QLabel *textLabel = new QLabel( this );
+    textLabel->setTextFormat( QLabel::RichText );
     textLabel->setText( tr("Enter the number you want to dial. When finished, press ok") );
 
     m_dialLine = new QLineEdit( this );
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp
index 8524422..67ad10e 100644
--- a/noncore/apps/opie-console/dialer.cpp
+++ b/noncore/apps/opie-console/dialer.cpp
@@ -13,6 +13,8 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#include "io_modem.h"
+
 // State machine:          | When an error occurs, we don't have to
 //                         | reset everything.
 // (init) <------+         | But if the user wants to reset,
@@ -53,14 +55,10 @@ Dialer::Dialer(const Profile& profile, int fd, QWidget *parent, const char *name
 	QVBoxLayout *vbox;
 	QLabel *desc;
 
-	//m_profile.writeEntry("InitString", "ATZ");
-	//m_profile.writeEntry("DialPrefix1", "ATDT");
-	//m_profile.writeEntry("Termination", "\n");
 
 	usercancel = 0;
 	cleanshutdown = 0;
 
-//	fcntl(m_fd, F_SETFL, O_NONBLOCK);
 
 	desc = new QLabel(QObject::tr("Dialing number: %1").arg(m_profile.readEntry("Number")), this);
 	progress = new QProgressBar(this);
@@ -89,7 +87,7 @@ void Dialer::setHangupOnly()
 {
 	state = state_cancel;
 	usercancel = 1;
-        send("+++ATH\r");
+        send( m_profile.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING )+"\r" );
 }
 
 void Dialer::slotCancel()
@@ -142,19 +140,15 @@ void Dialer::trydial(const QString& number)
 	if(state != state_cancel) switchState(state_preinit);
 	if(cleanshutdown)
 	{
-            qWarning("HangupString " + m_profile.readEntry("HangupString"));
-            //send(m_profile.readEntry("HangupString"));
-		send("+++ATH\r");
-		//send("");
+            qWarning("HangupString " + m_profile.readEntry("HangupString",  MODEM_DEFAULT_HANGUP_STRING));
+            send(m_profile.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ) + "\r");
 	}
 
 	if(state != state_cancel)
 	{
 		switchState(state_init);
-		//send("ATZ");
-                qWarning("Init String " + m_profile.readEntry("InitString") );
-//		send(m_profile.readEntry("InitString", "AT"));
-                send("AT\r");
+//                qWarning("Init String " + m_profile.readEntry("InitString") );
+		send(m_profile.readEntry("InitString",MODEM_DEFAULT_INIT_STRING ) + "\r");
 		QString response2 = receive();
 		if(!response2.contains("\nOK\r"))
 			reset();
@@ -187,8 +181,10 @@ void Dialer::trydial(const QString& number)
             qWarning("progress");
 		switchState(state_dialing);
 
-		send(QString("ATDT %1\r").arg(number));
-//		send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number));
+//		send(QString("ATDT %1\r").arg(number));
+		send(QString("%1 %2\r").arg(m_profile.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ))
+                     .arg(number));
+
 		QString response5 = receive();
 		if(!response5.contains("CONNECT") )
 		{
diff --git a/noncore/apps/opie-console/io_layer.h b/noncore/apps/opie-console/io_layer.h
index af61099..ed4478b 100644
--- a/noncore/apps/opie-console/io_layer.h
+++ b/noncore/apps/opie-console/io_layer.h
@@ -94,7 +94,13 @@ signals:
      */
     virtual void error( int, const QString& );
 
+
     virtual void closed();
+
+    /* signal emitted for closure of the IOLayer
+     * for some reasons
+     */
+    virtual void closed(IOLayer*);
 public slots:
     /**
      * send a QCString to the device
diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h
index 1328706..17228bd 100644
--- a/noncore/apps/opie-console/io_modem.h
+++ b/noncore/apps/opie-console/io_modem.h
@@ -13,7 +13,7 @@
 #define MODEM_DEFAULT_SBITS        1
 #define MODEM_DEFAULT_FLOW         0
 
-#define MODEM_DEFAULT_INIT_STRING  "ATZ"
+#define MODEM_DEFAULT_INIT_STRING  "AT"
 #define MODEM_DEFAULT_RESET_STRING "ATZ~"
 #define MODEM_DEFAULT_DIAL_PREFIX1 "ATDT"
 #define MODEM_DEFAULT_DIAL_SUFFIX1 ""
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp
index 03e92dd..ddd4994 100644
--- a/noncore/apps/opie-console/io_serial.cpp
+++ b/noncore/apps/opie-console/io_serial.cpp
@@ -166,11 +166,7 @@ void IOSerial::dataArrived() {
         close();
     if (len < 0)
         return;
-    qWarning("got from layer");
-    for (int i = 0; i < len; i++ ) {
-        printf("%c", array[i] );
-    }
-    printf("\n");
+
     array.resize( len );
     emit received(array);
 }
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp
index 37eb184..f7fb6f3 100644
--- a/noncore/apps/opie-console/modemconfigwidget.cpp
+++ b/noncore/apps/opie-console/modemconfigwidget.cpp
@@ -132,13 +132,14 @@ void ModemConfigWidget::load( const Profile& prof ) {
     }
 
 
-
+    atConf->readConfig( prof );
     if ( prof.readEntry( "Device" ).isEmpty() ) {
+        qWarning("device empty!");
         return;
     }
     setCurrent( prof.readEntry( "Device" ), m_deviceCmb );
 
-    atConf->readConfig( prof );
+
 }
 
 /*
@@ -234,6 +235,10 @@ void ModemConfigWidget::save( Profile& prof ) {
 
 void ModemConfigWidget::slotAT() {
     //  ATConfigDialog conf( this, "ATConfig", true );
+    // josef/Max I know why don't you create the stuff on the stack
+    // but making it a TopLevel Dialog and ignoring
+    // cancel is not fun either...
+    // what to do? FIXME!!! -zecke
     atConf->showMaximized();
     if ( atConf->exec() != QDialog::Accepted ) {
         // reload old settings
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 36daaef..fd04b6b 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -66,11 +66,11 @@ void ProfileEditorDialog::initUI()
 
     m_svCon = new QScrollView( m_tabCon );
     m_svCon->setResizePolicy( QScrollView::AutoOneFit );
-    m_svCon->setHScrollBarMode( QScrollView::AlwaysOff );
+    //m_svCon->setHScrollBarMode( QScrollView::AlwaysOff );
     m_svCon->setFrameShape( QFrame::NoFrame );
     m_svTerm = new QScrollView( m_tabTerm );
     m_svTerm->setResizePolicy( QScrollView::AutoOneFit );
-    m_svTerm->setHScrollBarMode( QScrollView::AlwaysOff );
+    //m_svTerm->setHScrollBarMode( QScrollView::AlwaysOff );
     m_svTerm->setFrameShape( QFrame::NoFrame );
 
     /* base layout for tabs */