new connection setting stuff for imap too

5 files changed, 129 insertions, 91 deletions

diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 9fc97e8..1cb202e 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -266,13 +266,22 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
 
     fillValues();
 
-    connect( sslBox, SIGNAL( toggled( bool ) ), SLOT( slotSSL( bool ) ) );
+    connect( ComboBox1, SIGNAL( activated( int ) ), SLOT( slotConnectionToggle( int ) ) );
+    ComboBox1->insertItem( "Only if available", 0 );
+    ComboBox1->insertItem( "Always, Negotiated", 1 );
+    ComboBox1->insertItem( "Connect on secure port", 2 );
+    ComboBox1->insertItem( "Run command instead", 3 );
+    CommandEdit->hide();
+    ComboBox1->setCurrentItem( data->ConnectionType() );
 }
 
-void IMAPconfig::slotSSL( bool enabled )
+void IMAPconfig::slotConnectionToggle( int index )
 {
-    if ( enabled ) {
-        portLine->setText( IMAP_SSL_PORT );
+    if ( index == 2 ) {
+       portLine->setText( IMAP_SSL_PORT );
+    } else if (  index == 3 ) {
+        portLine->setText( IMAP_PORT );
+        CommandEdit->show();
     } else {
         portLine->setText( IMAP_PORT );
     }
@@ -283,7 +292,7 @@ void IMAPconfig::fillValues()
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
-    sslBox->setChecked( data->getSSL() );
+    ComboBox1->setCurrentItem( data->ConnectionType() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
     prefixLine->setText(data->getPrefix());
@@ -294,7 +303,7 @@ void IMAPconfig::accept()
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
-    data->setSSL( sslBox->isChecked() );
+    data->setConnectionType( ComboBox1->currentItem() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
     data->setPrefix(prefixLine->text());
diff --git a/noncore/net/mail/editaccounts.h b/noncore/net/mail/editaccounts.h
index d51e299..d8e1219 100644
--- a/noncore/net/mail/editaccounts.h
+++ b/noncore/net/mail/editaccounts.h
@@ -79,7 +79,7 @@ public slots:
     void fillValues();
 
 protected slots:
-    void slotSSL( bool enabled );
+    void slotConnectionToggle( int index );
     void accept();
 
 private:
diff --git a/noncore/net/mail/imapconfigui.ui b/noncore/net/mail/imapconfigui.ui
index ac0297f..a96c1a2 100644
--- a/noncore/net/mail/imapconfigui.ui
+++ b/noncore/net/mail/imapconfigui.ui
@@ -11,8 +11,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>228</width>
-            <height>320</height>
+            <width>425</width>
+            <height>428</height>
         </rect>
     </property>
     <property stdset="1">
@@ -32,30 +32,8 @@
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>2</number>
+            <number>3</number>
         </property>
-        <widget row="6"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>userLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>User</string>
-            </property>
-        </widget>
-        <widget row="4"  column="1" >
-            <class>QCheckBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>sslBox</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Use SSL</string>
-            </property>
-        </widget>
         <widget row="2"  column="1" >
             <class>QLineEdit</class>
             <property stdset="1">
@@ -63,24 +41,6 @@
                 <cstring>serverLine</cstring>
             </property>
         </widget>
-        <widget row="6"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>userLine</cstring>
-            </property>
-        </widget>
-        <widget row="7"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>passLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Password</string>
-            </property>
-        </widget>
         <widget row="3"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
@@ -110,18 +70,40 @@
                 <cstring>portLine</cstring>
             </property>
         </widget>
-        <widget row="7"  column="1" >
+        <widget row="0"  column="1" >
             <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>passLine</cstring>
+                <cstring>accountLine</cstring>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string>Name of the Account</string>
             </property>
+        </widget>
+        <widget row="0"  column="0" >
+            <class>QLabel</class>
             <property stdset="1">
-                <name>echoMode</name>
-                <enum>Password</enum>
+                <name>name</name>
+                <cstring>accountLabel</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Account</string>
+            </property>
+        </widget>
+        <widget row="1"  column="0"  rowspan="1"  colspan="2" >
+            <class>Line</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>line1</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
             </property>
         </widget>
-        <spacer row="10"  column="1" >
+        <spacer row="12"  column="1" >
             <property>
                 <name>name</name>
                 <cstring>spacer</cstring>
@@ -142,58 +124,54 @@
                 </size>
             </property>
         </spacer>
-        <widget row="0"  column="1" >
+        <widget row="8"  column="1" >
             <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>accountLine</cstring>
-            </property>
-            <property>
-                <name>toolTip</name>
-                <string>Name of the Account</string>
+                <cstring>userLine</cstring>
             </property>
         </widget>
-        <widget row="0"  column="0" >
-            <class>QLabel</class>
+        <widget row="9"  column="1" >
+            <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>accountLabel</cstring>
+                <cstring>passLine</cstring>
             </property>
             <property stdset="1">
-                <name>text</name>
-                <string>Account</string>
+                <name>echoMode</name>
+                <enum>Password</enum>
             </property>
         </widget>
-        <widget row="1"  column="0"  rowspan="1"  colspan="2" >
-            <class>Line</class>
+        <widget row="11"  column="0" >
+            <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>line1</cstring>
+                <cstring>prefixLabel</cstring>
             </property>
             <property stdset="1">
-                <name>orientation</name>
-                <enum>Horizontal</enum>
+                <name>text</name>
+                <string>Prefix</string>
             </property>
         </widget>
-        <widget row="9"  column="1" >
+        <widget row="11"  column="1" >
             <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>prefixLine</cstring>
             </property>
         </widget>
-        <widget row="9"  column="0" >
+        <widget row="8"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>prefixLabel</cstring>
+                <cstring>userLabel</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Prefix</string>
+                <string>User</string>
             </property>
         </widget>
-        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
+        <widget row="7"  column="0"  rowspan="1"  colspan="2" >
             <class>Line</class>
             <property stdset="1">
                 <name>name</name>
@@ -218,7 +196,7 @@
                 <name>layoutSpacing</name>
             </property>
         </widget>
-        <widget row="8"  column="0"  rowspan="1"  colspan="2" >
+        <widget row="10"  column="0"  rowspan="1"  colspan="2" >
             <class>Line</class>
             <property stdset="1">
                 <name>name</name>
@@ -229,13 +207,52 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
+        <widget row="9"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>passLabel</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Password</string>
+            </property>
+        </widget>
+        <widget row="6"  column="0"  rowspan="1"  colspan="2" >
+            <class>QLineEdit</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>CommandEdit</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>ssh $SERVER exec</string>
+            </property>
+        </widget>
+        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
+            <class>QComboBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>ComboBox1</cstring>
+            </property>
+        </widget>
+        <widget row="4"  column="0"  rowspan="1"  colspan="2" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>TextLabel1</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Use secure sockets:</string>
+            </property>
+        </widget>
     </grid>
 </widget>
 <tabstops>
     <tabstop>accountLine</tabstop>
     <tabstop>serverLine</tabstop>
     <tabstop>portLine</tabstop>
-    <tabstop>sslBox</tabstop>
     <tabstop>userLine</tabstop>
     <tabstop>passLine</tabstop>
 </tabstops>
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 4b633ea..1c22c26 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -80,8 +80,18 @@ void IMAPwrapper::login()
 
     m_imap = mailimap_new( 20, &imap_progress );
 
+
+
     /* connect */
-    if (account->getSSL()) {
+
+    bool ssl = false;
+
+    if  ( account->ConnectionType() == 2 ) {
+        ssl = true;
+    }
+
+    if ( ssl ) {
+        qDebug(  "using ssl" );
         err = mailimap_ssl_connect( m_imap, (char*)server, port );
     } else {
         err = mailimap_socket_connect( m_imap, (char*)server, port );
@@ -369,7 +379,7 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
             QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec));
             qDebug("%i %i %i - %i %i %i",d->dt_year,d->dt_month,d->dt_day,d->dt_hour,d->dt_min,d->dt_sec);
             qDebug(da.toString());
-#endif            
+#endif
         } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) {
             size = item->att_data.att_static->att_data.att_rfc822_size;
         }
@@ -408,7 +418,7 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail)
     if ( err != MAILIMAP_NO_ERROR ) {
         return body;
     }
- 
+
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
     fetchAtt = mailimap_fetch_att_new_bodystructure();
@@ -495,9 +505,9 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>
         }
     }
     set = mailimap_set_new_single(mail.getNumber());
-    
+
     clist*id_list = 0;
-    
+
     /* if path == empty then its a request for the whole rfc822 mail and generates
        a "fetch <id> (body[])" statement on imap server */
     if (path.count()>0 ) {
@@ -510,17 +520,17 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>
         section_part =  mailimap_section_part_new(id_list);
         section_spec =  mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL);
     }
-    
+
     section =  mailimap_section_new(section_spec);
     fetch_att = mailimap_fetch_att_new_body_section(section);
     fetchType = mailimap_fetch_type_new_fetch_att(fetch_att);
-    
+
     clist*result = 0;
-    
+
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
-    
+
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
@@ -535,7 +545,7 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>
                     res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length);
                 }
             }
-        }         
+        }
     } else {
         qDebug("error fetching text: %s",m_imap->imap_response);
     }
@@ -664,11 +674,11 @@ void IMAPwrapper::fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*w
     qDebug("Message part");
     /* we set this type to text/plain */
     target_part.setLines(which->bd_lines);
-    fillBodyFields(target_part,which->bd_fields);    
+    fillBodyFields(target_part,which->bd_fields);
 }
 
 void IMAPwrapper::fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*which)
-{       
+{
     if (!which) return;
     QString sub = which->bd_media_subtype;
     target_part.setSubtype(sub.lower());
@@ -680,7 +690,7 @@ void IMAPwrapper::fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*whi
             if (param) {
                 target_part.addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
             }
-        }        
+        }
     }
 }
 
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp
index 7b6a58d..3279f39 100644
--- a/noncore/net/mail/libmailwrapper/settings.cpp
+++ b/noncore/net/mail/libmailwrapper/settings.cpp
@@ -164,6 +164,7 @@ void IMAPaccount::read()
     if (server.isNull()) server="";
     port = conf->readEntry( "Port","" );
     if (port.isNull()) port="143";
+    connectionType = conf->readNumEntry( "ConnectionType" );
     ssl = conf->readBoolEntry( "SSL",false );
     user = conf->readEntry( "User","" );
     if (user.isNull()) user = "";
@@ -186,6 +187,7 @@ void IMAPaccount::save()
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
+    conf->writeEntry( "ConnectionType", connectionType );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "MailPrefix",prefix);