summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/config.in2
-rw-r--r--noncore/net/mail/libmailwrapper/.cvsignore6
-rw-r--r--noncore/net/mail/libmailwrapper/config.in4
-rw-r--r--noncore/net/mail/libmailwrapper/libmailwrapper.pro44
-rw-r--r--noncore/net/mail/libmailwrapper/mailwrapper.cpp15
-rw-r--r--noncore/net/mail/libmailwrapper/settings.cpp36
-rw-r--r--noncore/net/mail/libmailwrapper/smtpwrapper.cpp4
-rw-r--r--noncore/net/mail/mail.pro26
-rw-r--r--noncore/net/mail/mainwindow.cpp7
9 files changed, 99 insertions, 45 deletions
diff --git a/noncore/net/mail/config.in b/noncore/net/mail/config.in
index 43ecc6f..b5173ae 100644
--- a/noncore/net/mail/config.in
+++ b/noncore/net/mail/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-mail3 (a mail client)" 2 boolean "opie-mail3 (a mail client)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBMAILWRAPPER
diff --git a/noncore/net/mail/libmailwrapper/.cvsignore b/noncore/net/mail/libmailwrapper/.cvsignore
new file mode 100644
index 0000000..581c299
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/.cvsignore
@@ -0,0 +1,6 @@
1logindialogui.cpp
2logindialogui.h
3sendmailprogressui.cpp
4sendmailprogressui.h
5.moc
6Makefile
diff --git a/noncore/net/mail/libmailwrapper/config.in b/noncore/net/mail/libmailwrapper/config.in
new file mode 100644
index 0000000..790891e
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/config.in
@@ -0,0 +1,4 @@
1 config LIBMAILWRAPPER
2 boolean "libmailwrapper ( wrapper arround libetpan needed by mail3"
3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
new file mode 100644
index 0000000..4b4a4f1
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
@@ -0,0 +1,44 @@
1TEMPLATE = lib
2CONFIG += qt warn_on debug
3
4HEADERS = mailwrapper.h \
5 imapwrapper.h \
6 mailtypes.h \
7 pop3wrapper.h \
8 abstractmail.h \
9 smtpwrapper.h \
10 genericwrapper.h \
11 mboxwrapper.h \
12 settings.h \
13 logindialog.h \
14 sendmailprogress.h
15
16SOURCES = imapwrapper.cpp \
17 mailwrapper.cpp \
18 mailtypes.cpp \
19 pop3wrapper.cpp \
20 abstractmail.cpp \
21 smtpwrapper.cpp \
22 genericwrapper.cpp \
23 mboxwrapper.cpp \
24 settings.cpp \
25 logindialog.cpp \
26 sendmailprogress.cpp
27
28 INTERFACES = logindialogui.ui \
29 sendmailprogressui.ui
30
31
32INCLUDEPATH += $(OPIEDIR)/include
33
34CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
35contains( CONFTEST, y ){
36 LIBS += -lqpe -letpan -lssl -lcrypto -liconv
37}else{
38 LIBS += -lqpe -letpan -lssl -lcrypto
39}
40
41DESTDIR = $(OPIEDIR)/lib$(PROJMAK)
42TARGET = mailwrapper
43
44include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
index 9398823..75b9343 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
@@ -8,6 +8,17 @@
8 8
9#include "mailwrapper.h" 9#include "mailwrapper.h"
10#include "logindialog.h" 10//#include "logindialog.h"
11#include "defines.h" 11//#include "defines.h"
12
13#define UNDEFINED 64
14#define MAXLINE 76
15#define UTF16MASK 0x03FFUL
16#define UTF16SHIFT 10
17#define UTF16BASE 0x10000UL
18#define UTF16HIGHSTART 0xD800UL
19#define UTF16HIGHEND 0xDBFFUL
20#define UTF16LOSTART 0xDC00UL
21#define UTF16LOEND 0xDFFFUL
22
12 23
13Attachment::Attachment( DocLnk lnk ) 24Attachment::Attachment( DocLnk lnk )
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp
index 17aa1b0..c5187f5 100644
--- a/noncore/net/mail/libmailwrapper/settings.cpp
+++ b/noncore/net/mail/libmailwrapper/settings.cpp
@@ -5,5 +5,15 @@
5 5
6#include "settings.h" 6#include "settings.h"
7#include "defines.h" 7//#include "defines.h"
8
9#define IMAP_PORT "143"
10#define IMAP_SSL_PORT "993"
11#define SMTP_PORT "25"
12#define SMTP_SSL_PORT "465"
13#define POP3_PORT "110"
14#define POP3_SSL_PORT "995"
15#define NNTP_PORT "119"
16#define NNTP_SSL_PORT "563"
17
8 18
9Settings::Settings() 19Settings::Settings()
@@ -63,5 +73,5 @@ void Settings::updateAccounts()
63 accounts.append( account ); 73 accounts.append( account );
64 } 74 }
65 75
66 QStringList nntp = dir.entryList( "nntp-*" ); 76 QStringList nntp = dir.entryList( "nntp-*" );
67 for ( it = nntp.begin(); it != nntp.end(); it++ ) { 77 for ( it = nntp.begin(); it != nntp.end(); it++ ) {
@@ -70,5 +80,5 @@ void Settings::updateAccounts()
70 accounts.append( account ); 80 accounts.append( account );
71 } 81 }
72 82
73 readAccounts(); 83 readAccounts();
74} 84}
@@ -76,5 +86,5 @@ void Settings::updateAccounts()
76void Settings::saveAccounts() 86void Settings::saveAccounts()
77{ 87{
78 checkDirectory(); 88 checkDirectory();
79 Account *it; 89 Account *it;
80 90
@@ -86,5 +96,5 @@ void Settings::saveAccounts()
86void Settings::readAccounts() 96void Settings::readAccounts()
87{ 97{
88 checkDirectory(); 98 checkDirectory();
89 Account *it; 99 Account *it;
90 100
@@ -131,5 +141,5 @@ QString IMAPaccount::getUniqueFileName()
131 int num = 0; 141 int num = 0;
132 QString unique; 142 QString unique;
133 143
134 QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); 144 QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
135 145
@@ -165,5 +175,5 @@ void IMAPaccount::save()
165 qDebug( "saving " + getFileName() ); 175 qDebug( "saving " + getFileName() );
166 Settings::checkDirectory(); 176 Settings::checkDirectory();
167 177
168 Config *conf = new Config( getFileName(), Config::File ); 178 Config *conf = new Config( getFileName(), Config::File );
169 conf->setGroup( "IMAP Account" ); 179 conf->setGroup( "IMAP Account" );
@@ -208,5 +218,5 @@ QString POP3account::getUniqueFileName()
208 int num = 0; 218 int num = 0;
209 QString unique; 219 QString unique;
210 220
211 QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); 221 QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
212 222
@@ -235,5 +245,5 @@ void POP3account::save()
235 qDebug( "saving " + getFileName() ); 245 qDebug( "saving " + getFileName() );
236 Settings::checkDirectory(); 246 Settings::checkDirectory();
237 247
238 Config *conf = new Config( getFileName(), Config::File ); 248 Config *conf = new Config( getFileName(), Config::File );
239 conf->setGroup( "POP3 Account" ); 249 conf->setGroup( "POP3 Account" );
@@ -282,5 +292,5 @@ QString SMTPaccount::getUniqueFileName()
282 int num = 0; 292 int num = 0;
283 QString unique; 293 QString unique;
284 294
285 QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); 295 QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
286 296
@@ -310,5 +320,5 @@ void SMTPaccount::save()
310 qDebug( "saving " + getFileName() ); 320 qDebug( "saving " + getFileName() );
311 Settings::checkDirectory(); 321 Settings::checkDirectory();
312 322
313 Config *conf = new Config( getFileName(), Config::File ); 323 Config *conf = new Config( getFileName(), Config::File );
314 conf->setGroup( "SMTP Account" ); 324 conf->setGroup( "SMTP Account" );
@@ -355,5 +365,5 @@ QString NNTPaccount::getUniqueFileName()
355 int num = 0; 365 int num = 0;
356 QString unique; 366 QString unique;
357 367
358 QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); 368 QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
359 369
@@ -383,5 +393,5 @@ void NNTPaccount::save()
383 qDebug( "saving " + getFileName() ); 393 qDebug( "saving " + getFileName() );
384 Settings::checkDirectory(); 394 Settings::checkDirectory();
385 395
386 Config *conf = new Config( getFileName(), Config::File ); 396 Config *conf = new Config( getFileName(), Config::File );
387 conf->setGroup( "NNTP Account" ); 397 conf->setGroup( "NNTP Account" );
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 7e03af9..b9c4ff2 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -18,7 +18,9 @@
18#include "logindialog.h" 18#include "logindialog.h"
19#include "mailtypes.h" 19#include "mailtypes.h"
20#include "defines.h" 20//#include "defines.h"
21#include "sendmailprogress.h" 21#include "sendmailprogress.h"
22 22
23#define USER_AGENT "OpieMail v0.1"
24
23progressMailSend*SMTPwrapper::sendProgress = 0; 25progressMailSend*SMTPwrapper::sendProgress = 0;
24 26
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index 2c15a7b..69e1450 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -2,8 +2,5 @@ CONFIG += qt warn_on debug quick-app
2 2
3HEADERS = defines.h \ 3HEADERS = defines.h \
4 logindialog.h \
5 settings.h \
6 editaccounts.h \ 4 editaccounts.h \
7 mailwrapper.h \
8 composemail.h \ 5 composemail.h \
9 accountview.h \ 6 accountview.h \
@@ -12,15 +9,7 @@ HEADERS = defines.h \
12 viewmailbase.h \ 9 viewmailbase.h \
13 opiemail.h \ 10 opiemail.h \
14 imapwrapper.h \
15 mailtypes.h \
16 mailistviewitem.h \ 11 mailistviewitem.h \
17 pop3wrapper.h \
18 abstractmail.h \
19 settingsdialog.h \ 12 settingsdialog.h \
20 statuswidget.h \ 13 statuswidget.h \
21 smtpwrapper.h \
22 genericwrapper.h \
23 mboxwrapper.h \
24 sendmailprogress.h \
25 newmaildir.h 14 newmaildir.h
26 15
@@ -30,21 +19,10 @@ SOURCES = main.cpp \
30 accountview.cpp \ 19 accountview.cpp \
31 composemail.cpp \ 20 composemail.cpp \
32 mailwrapper.cpp \
33 imapwrapper.cpp \
34 addresspicker.cpp \ 21 addresspicker.cpp \
35 editaccounts.cpp \ 22 editaccounts.cpp \
36 logindialog.cpp \
37 viewmail.cpp \ 23 viewmail.cpp \
38 viewmailbase.cpp \ 24 viewmailbase.cpp \
39 settings.cpp \
40 mailtypes.cpp \
41 pop3wrapper.cpp \
42 abstractmail.cpp \
43 settingsdialog.cpp \ 25 settingsdialog.cpp \
44 statuswidget.cpp \ 26 statuswidget.cpp \
45 smtpwrapper.cpp \
46 genericwrapper.cpp \
47 mboxwrapper.cpp \
48 sendmailprogress.cpp \
49 newmaildir.cpp 27 newmaildir.cpp
50 28
@@ -56,9 +34,7 @@ INTERFACES = editaccountsui.ui \
56 smtpconfigui.ui \ 34 smtpconfigui.ui \
57 addresspickerui.ui \ 35 addresspickerui.ui \
58 logindialogui.ui \
59 composemailui.ui \ 36 composemailui.ui \
60 settingsdialogui.ui \ 37 settingsdialogui.ui \
61 statuswidgetui.ui \ 38 statuswidgetui.ui \
62 sendmailprogressui.ui \
63 newmaildirui.ui 39 newmaildirui.ui
64 40
@@ -69,5 +45,5 @@ contains( CONFTEST, y ){
69 LIBS += -lqpe -letpan -lssl -lcrypto -lopie -liconv 45 LIBS += -lqpe -letpan -lssl -lcrypto -lopie -liconv
70}else{ 46}else{
71 LIBS += -lqpe -letpan -lssl -lcrypto -lopie 47 LIBS += -lqpe -lopie -llibmailwrapper
72} 48}
73 49
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 2a74286..6511b1f 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -20,4 +20,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
20 : QMainWindow( parent, name, flags ) 20 : QMainWindow( parent, name, flags )
21{ 21{
22
22 setCaption( tr( "Mail" ) ); 23 setCaption( tr( "Mail" ) );
23 setToolBarsMovable( false ); 24 setToolBarsMovable( false );
@@ -117,12 +118,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
117 118
118 slotAdjustLayout(); 119 slotAdjustLayout();
119 120
120 QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold); 121 QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold);
121 QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold); 122 QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold);
122 123
123 connect( mailView, SIGNAL( mouseButtonClicked(int, QListViewItem *,const QPoint&,int ) ),this, 124 connect( mailView, SIGNAL( mouseButtonClicked(int, QListViewItem *,const QPoint&,int ) ),this,
124 SLOT( mailLeftClicked( int, QListViewItem *,const QPoint&,int ) ) ); 125 SLOT( mailLeftClicked( int, QListViewItem *,const QPoint&,int ) ) );
125 connect( mailView, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int ) ),this, 126 connect( mailView, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int ) ),this,
126 SLOT( mailHold( int, QListViewItem *,const QPoint&,int ) ) ); 127 SLOT( mailHold( int, QListViewItem *,const QPoint&,int ) ) );
127 connect(folderView, SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*))); 128 connect(folderView, SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*)));
128 129