6 files changed, 72 insertions, 19 deletions

diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index 90664bb..8359acf 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -281,7 +281,7 @@ void EmailClient::sendQuedMail()
   int count = 0;
 
   if (accountList.count() == 0) {
-    QMessageBox::warning(qApp->activeWindow(), "No account selected", "You must create an account", "OK\n");
+    QMessageBox::warning(qApp->activeWindow(), tr("No account selected"), tr("You must create an account"), "OK\n");
     return;
   }
   //traverse listview, find messages to send
@@ -321,8 +321,8 @@ void EmailClient::mailSent()
 void EmailClient::getNewMail() {
   
   if (accountList.count() == 0) {
-    QMessageBox::warning(qApp->activeWindow(),"No account selected",
-      "You must create an account", "OK\n");
+    QMessageBox::warning(qApp->activeWindow(),tr("No account selected"),
+      tr("You must create an account"), "OK\n");
     return;
   }
   
@@ -785,7 +785,7 @@ void EmailClient::selectAccount(int id)
     emit newCaption("Mailit - " + currentAccount->accountName);
     getNewMail();
   } else {
-    emit newCaption("Mailit ! No account defined");
+    emit newCaption( tr("Mailit ! No account defined") );
   }
 }
 
@@ -825,7 +825,7 @@ void EmailClient::deleteAccount(int id)
   QString message;
   
   newAccount = accountList.at(id);
-  message = "Delete account:\n" + newAccount->accountName;
+  message = tr("Delete account:\n") + newAccount->accountName;
   switch( QMessageBox::warning( this, "Mailit", message,
       "Yes", "No", 0, 0, 1 ) ) {
     
@@ -846,7 +846,7 @@ void EmailClient::updateAccounts()
   selectAccountMenu->clear();
   deleteAccountMenu->clear();
 
-  newAccountId = editAccountMenu->insertItem("New", this,
+  newAccountId = editAccountMenu->insertItem( tr("New"), this,
       SLOT(editAccount(int)) );
   editAccountMenu->insertSeparator();
   
diff --git a/noncore/unsupported/mailit/emaillistitem.cpp b/noncore/unsupported/mailit/emaillistitem.cpp
index fc9f766..a25f93a 100644
--- a/noncore/unsupported/mailit/emaillistitem.cpp
+++ b/noncore/unsupported/mailit/emaillistitem.cpp
@@ -38,7 +38,8 @@ EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox)
     setText(0, temp);
   }
   setText(1, mail.subject);
-  setText(2,mail.date);
+  // setText(2,mail.date);
+  setText(2,dateFromULCString(mail.date));
   
   if (mailIn.files.count()>0)
   {
@@ -97,3 +98,61 @@ void EmailListItem::paintCell( QPainter *p, const QColorGroup &cg,
 
     _cg.setColor( QColorGroup::Text, c );
 }
+
+/*
+ * Converts an E-Mail date (ULC) RFC 2822 conform to a QDateTime.
+ * Returning a QString with formatting of "YYYY-MM-DD HH:MM:SS"
+ * (zodiac: This method was tested with more than 300 inbox mails,
+ * it didn't slow down the loading of mail-it.)
+ */
+QString EmailListItem::dateFromULCString( QString ulcDate )
+{
+        QString sTemp, sTime;
+        int iPos, iDay, iMon=1, iYear;
+
+        iPos=ulcDate.find(',');
+        if (iPos) { // it has a day-of-week
+                ulcDate=ulcDate.remove(0,++iPos); //.stripWhiteSpace();
+        }
+
+        QStringList dateEntries = QStringList::split(" ",ulcDate,FALSE);
+        QStringList::Iterator iter = dateEntries.begin();
+
+        // Get day as DD
+        iDay = (*iter++).toInt();
+
+        // Get month as string Mmm
+        sTemp = (*iter++);
+        if (sTemp =="Jan") {iMon=1;} else
+        if (sTemp =="Feb") {iMon=2;} else
+        if (sTemp =="Mar") {iMon=3;} else
+        if (sTemp =="Apr") {iMon=4;} else
+        if (sTemp =="May") {iMon=5;} else
+        if (sTemp =="Jun") {iMon=6;} else
+        if (sTemp =="Jul") {iMon=7;} else
+        if (sTemp =="Aug") {iMon=8;} else
+        if (sTemp =="Sep") {iMon=9;} else
+        if (sTemp =="Oct") {iMon=10;} else
+        if (sTemp =="Nov") {iMon=11;} else
+        if (sTemp =="Dec") {iMon=12;}
+
+        // Get year as YYYY or YY
+        iYear = (*iter++).toInt();
+
+        QDate date = QDate(iYear, iMon, iDay);
+
+        // Convert timestring into a QTime
+        QStringList timeEntries = QStringList::split(":",(*iter++),FALSE);
+        QStringList::Iterator iterTime = timeEntries.begin();
+        iYear=(*iterTime++).toInt(); // var reuse.. *cough*
+        iMon=(*iterTime++).toInt();
+        iDay=(*iterTime++).toInt();
+        QTime time = QTime(iYear,iMon,iDay);
+
+        return QString::number(date.year())+"-"
+                +QString::number(date.month()).rightJustify(2,'0')+"-"
+                +QString::number(date.day()).rightJustify(2,'0')+" "
+                +time.toString();
+}
+
+
diff --git a/noncore/unsupported/mailit/emaillistitem.h b/noncore/unsupported/mailit/emaillistitem.h
index 642932c..129a774 100644
--- a/noncore/unsupported/mailit/emaillistitem.h
+++ b/noncore/unsupported/mailit/emaillistitem.h
@@ -39,6 +39,7 @@ protected:
 private:
         Email mail;
         bool selected;
+        QString dateFromULCString( QString ulc );
 };
 
 #endif
diff --git a/noncore/unsupported/mailit/mailit.pro b/noncore/unsupported/mailit/mailit.pro
index 5e9a83a..0224886 100644
--- a/noncore/unsupported/mailit/mailit.pro
+++ b/noncore/unsupported/mailit/mailit.pro
@@ -1,6 +1,5 @@
-TEMPLATE  = app
 TARGET = mailit
-CONFIG    = qt warn_on release
+CONFIG    = qt warn_on release quick-app
 HEADERS   = emailclient.h \
       emailhandler.h \
       emaillistitem.h \
@@ -37,9 +36,6 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
 LIBS            += -lqpe -lopie
 # -lssl
-MOC_DIR=qpeobj
-OBJECTS_DIR=qpeobj
-DESTDIR=$(OPIEDIR)/bin
 
 TRANSLATIONS = ../../../i18n/de/mailit.ts \
          ../../../i18n/nl/mailit.ts \
diff --git a/noncore/unsupported/mailit/mailitwindow.h b/noncore/unsupported/mailit/mailitwindow.h
index e818d32..11e56b9 100644
--- a/noncore/unsupported/mailit/mailitwindow.h
+++ b/noncore/unsupported/mailit/mailitwindow.h
@@ -33,6 +33,7 @@ class MailItWindow: public QMainWindow
 {
         Q_OBJECT
 public:
+        static QString appName() { return QString::fromLatin1("mailit"); }
         MailItWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
         ~MailItWindow();
 
diff --git a/noncore/unsupported/mailit/main.cpp b/noncore/unsupported/mailit/main.cpp
index 3a3e1fc..71f8877 100644
--- a/noncore/unsupported/mailit/main.cpp
+++ b/noncore/unsupported/mailit/main.cpp
@@ -20,10 +20,6 @@
 #include <qpe/qpeapplication.h>
 #include "mailitwindow.h"
 
-int main(int argc, char* argv[])
-{
-    QPEApplication a( argc, argv );
-    MailItWindow mw(0, 0);
-    a.showMainDocumentWidget(&mw);
-    return a.exec();
-}
+#include <opie/oapplicationfactory.h>
+
+OPIE_EXPORT_APP( OApplicationFactory<MailItWindow> )
\ No newline at end of file