5 files changed, 122 insertions, 5 deletions

diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index d272c3b..e7d2750 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -13,12 +13,13 @@
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qlistview.h>
+#include <qspinbox.h>
 
 #include <libmailwrapper/nntpwrapper.h>
 
 using namespace Opie::Core;
 
 AccountListItem::AccountListItem( QListView *parent, Account *a)
@@ -417,22 +418,33 @@ void POP3config::fillValues()
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
     ComboBox1->setCurrentItem( data->ConnectionType() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
+    localFolder->setText( data->getLocalFolder() );
+    int max = data->getMaxMailSize() ;
+    if ( max ) {
+        CheckBoxDown->setChecked( true );
+         SpinBoxDown->setValue ( max );
+    } else {
+        CheckBoxDown->setChecked( false );
+         SpinBoxDown->setValue ( 5 );
+    }
 }
 
 void POP3config::accept()
 {
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
     data->setConnectionType( ComboBox1->currentItem() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
+    data->setLocalFolder( localFolder->text() );
+    data->setMaxMailSize( CheckBoxDown->isChecked()?SpinBoxDown->value():0 ) ;
 
     QDialog::accept();
 }
 
 /**
  * SMTPconfig
diff --git a/kmicromail/libmailwrapper/pop3wrapper.cpp b/kmicromail/libmailwrapper/pop3wrapper.cpp
index 8d2f778..1edec9e 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.cpp
+++ b/kmicromail/libmailwrapper/pop3wrapper.cpp
@@ -119,13 +119,13 @@ void POP3wrapper::login()
         return;
 
     QString server,user, pass;
     uint16_t port;
     int err = MAILPOP3_NO_ERROR;
 
-    server = account->getServer().latin1();
+    server = account->getServer();
     port = account->getPort().toUInt();
 
     if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
         qApp->processEvents();
         LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
         login.show();
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp
index b0a539e..90e32fa 100644
--- a/kmicromail/libmailwrapper/settings.cpp
+++ b/kmicromail/libmailwrapper/settings.cpp
@@ -252,12 +252,17 @@ void POP3account::read()
     port = conf->readEntry( "Port" );
     ssl = conf->readBoolEntry( "SSL" );
     connectionType = conf->readNumEntry( "ConnectionType" );
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
     offline = conf->readBoolEntry("Offline",false);
+    localFolder = conf->readEntry( "LocalFolder" );
+    maxMailSize = conf->readNumEntry( "MaxSize",0 );
+    int lf = conf->readNumEntry( "LastFetch",0 );
+    QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) );
+    lastFetch = dt.addSecs( lf );
     delete conf;
 }
 
 void POP3account::save()
 {
     Settings::checkDirectory();
@@ -269,12 +274,17 @@ void POP3account::save()
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "ConnectionType", connectionType );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "Offline",offline);
+    conf->writeEntry( "LocalFolder", localFolder );
+    conf->writeEntry( "MaxSize", maxMailSize );
+    QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) );
+    int lf = dt.secsTo ( lastFetch );
+    conf->writeEntry( "LastFetch", lf );
     conf->write();
     delete conf;
 }
 
 
 QString POP3account::getFileName()
diff --git a/kmicromail/libmailwrapper/settings.h b/kmicromail/libmailwrapper/settings.h
index ba3ec89..c33c403 100644
--- a/kmicromail/libmailwrapper/settings.h
+++ b/kmicromail/libmailwrapper/settings.h
@@ -5,12 +5,13 @@
 
 /* OPIE */
 
 /* QT */
 #include <qobject.h>
 #include <qlist.h>
+#include <qdatetime.h>
 
 class Account
 {
 
 public:
     Account();
@@ -21,12 +22,15 @@ public:
     const QString&getAccountName()const{ return accountName; }
     MAILLIB::ATYPE getType()const{ return type; }
 
     void setServer(const QString&str){ server = str; }
     const QString&getServer()const{ return server; }
 
+    void setLocalFolder( QString name ) { localFolder = name; }
+    const QString& getLocalFolder()const{ return localFolder; }
+
     void setPort(const QString&str) { port = str; }
     const QString&getPort()const{ return port; }
 
     void setUser(const QString&str){ user = str; }
     const QString&getUser()const{ return user; }
 
@@ -36,12 +40,14 @@ public:
     void setSSL( bool b ) { ssl = b; }
     bool getSSL() { return ssl; }
 
     void setConnectionType( int x ) { connectionType = x; }
     int ConnectionType() { return connectionType; }
 
+    void setMaxMailSize( int x ) { maxMailSize = x; }
+    int getMaxMailSize() { return maxMailSize; }
 
     void setOffline(bool b) {offline = b;}
     bool getOffline()const{return offline;}
 
     virtual QString getFileName() { return accountName; }
     virtual void read() { ; }
@@ -50,12 +56,15 @@ public:
 protected:
     QString accountName, server, port, user, password;
     bool ssl;
     int connectionType;
     bool offline;
     MAILLIB::ATYPE type;
+    QString localFolder;
+    int maxMailSize;
+    QDateTime lastFetch;
 };
 
 class IMAPaccount : public Account
 {
 
 public:
diff --git a/kmicromail/pop3configui.ui b/kmicromail/pop3configui.ui
index 1014ef4..a2d43bd 100644
--- a/kmicromail/pop3configui.ui
+++ b/kmicromail/pop3configui.ui
@@ -8,14 +8,14 @@
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>314</width>
-            <height>410</height>
+            <width>322</width>
+            <height>404</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Configure POP3</string>
     </property>
@@ -25,17 +25,17 @@
     <property>
         <name>layoutSpacing</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>3</number>
+            <number>11</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>3</number>
+            <number>6</number>
         </property>
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Layout12</cstring>
@@ -316,12 +316,98 @@
                             </property>
                         </widget>
                     </vbox>
                 </widget>
             </hbox>
         </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout9</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel1_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Local storage folder:</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>localFolder</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string></string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout10</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QCheckBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>CheckBoxDown</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Download only messages smaller</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QSpinBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>SpinBoxDown</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>suffix</name>
+                        <string>kB</string>
+                    </property>
+                    <property stdset="1">
+                        <name>maxValue</name>
+                        <number>99999</number>
+                    </property>
+                    <property stdset="1">
+                        <name>minValue</name>
+                        <number>1</number>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
         <spacer>
             <property>
                 <name>name</name>
                 <cstring>spacer</cstring>
             </property>
             <property stdset="1">