-rw-r--r-- | kmicromail/opiemail.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index bdbd93a..70fbcb2 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -1,154 +1,154 @@ | |||
1 | 1 | ||
2 | #include "settingsdialog.h" | 2 | #include "settingsdialog.h" |
3 | #include "opiemail.h" | 3 | #include "opiemail.h" |
4 | #include "editaccounts.h" | 4 | #include "editaccounts.h" |
5 | #include "composemail.h" | 5 | #include "composemail.h" |
6 | #include "mailistviewitem.h" | 6 | #include "mailistviewitem.h" |
7 | #include "viewmail.h" | 7 | #include "viewmail.h" |
8 | #include "selectstore.h" | 8 | #include "selectstore.h" |
9 | #include "selectsmtp.h" | 9 | #include "selectsmtp.h" |
10 | 10 | ||
11 | #include <qmessagebox.h> | 11 | #include <qmessagebox.h> |
12 | 12 | ||
13 | #include <qpe/qpeapplication.h> | 13 | #include <qpe/qpeapplication.h> |
14 | #include <libmailwrapper/smtpwrapper.h> | 14 | #include <libmailwrapper/smtpwrapper.h> |
15 | #include <libmailwrapper/mailtypes.h> | 15 | #include <libmailwrapper/mailtypes.h> |
16 | #include <libmailwrapper/abstractmail.h> | 16 | #include <libmailwrapper/abstractmail.h> |
17 | /* OPIE */ | 17 | /* OPIE */ |
18 | //#include <qpe/resource.h> | 18 | //#include <qpe/resource.h> |
19 | #include <qpe/qpeapplication.h> | 19 | #include <qpe/qpeapplication.h> |
20 | 20 | ||
21 | /* QT */ | 21 | /* QT */ |
22 | 22 | ||
23 | using namespace Opie::Core; | 23 | using namespace Opie::Core; |
24 | 24 | ||
25 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) | 25 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) |
26 | : MainWindow( parent, name, WStyle_ContextHelp ) | 26 | : MainWindow( parent, name) //, WStyle_ContextHelp ) |
27 | { | 27 | { |
28 | settings = new Settings(); | 28 | settings = new Settings(); |
29 | 29 | ||
30 | folderView->populate( settings->getAccounts() ); | 30 | folderView->populate( settings->getAccounts() ); |
31 | 31 | ||
32 | } | 32 | } |
33 | 33 | ||
34 | OpieMail::~OpieMail() | 34 | OpieMail::~OpieMail() |
35 | { | 35 | { |
36 | if (settings) delete settings; | 36 | if (settings) delete settings; |
37 | } | 37 | } |
38 | 38 | ||
39 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | 39 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) |
40 | { | 40 | { |
41 | 41 | ||
42 | } | 42 | } |
43 | #include <stdlib.h> | 43 | #include <stdlib.h> |
44 | void OpieMail::message(const QCString &msg, const QByteArray &data) | 44 | void OpieMail::message(const QCString &msg, const QByteArray &data) |
45 | { | 45 | { |
46 | // copied from old mail2 | 46 | // copied from old mail2 |
47 | static int ii = 0; | 47 | static int ii = 0; |
48 | 48 | ||
49 | // block second call | 49 | // block second call |
50 | if ( ii < 2 ) { | 50 | if ( ii < 2 ) { |
51 | ++ii; | 51 | ++ii; |
52 | if ( ii > 1 ) { | 52 | if ( ii > 1 ) { |
53 | qDebug("qcop call blocked "); | 53 | qDebug("qcop call blocked "); |
54 | return; | 54 | return; |
55 | } | 55 | } |
56 | } | 56 | } |
57 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); | 57 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); |
58 | if (msg == "writeMail(QString,QString)") | 58 | if (msg == "writeMail(QString,QString)") |
59 | { | 59 | { |
60 | QDataStream stream(data,IO_ReadOnly); | 60 | QDataStream stream(data,IO_ReadOnly); |
61 | QString name, email; | 61 | QString name, email; |
62 | stream >> name >> email; | 62 | stream >> name >> email; |
63 | // removing the whitespaces at beginning and end is needed! | 63 | // removing the whitespaces at beginning and end is needed! |
64 | slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); | 64 | slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); |
65 | } | 65 | } |
66 | else if (msg == "newMail()") | 66 | else if (msg == "newMail()") |
67 | { | 67 | { |
68 | slotComposeMail(); | 68 | slotComposeMail(); |
69 | } | 69 | } |
70 | else if (msg == "newMail(QString)") | 70 | else if (msg == "newMail(QString)") |
71 | { | 71 | { |
72 | QDataStream stream(data,IO_ReadOnly); | 72 | QDataStream stream(data,IO_ReadOnly); |
73 | QString nameemail; | 73 | QString nameemail; |
74 | stream >> nameemail; | 74 | stream >> nameemail; |
75 | // the format is | 75 | // the format is |
76 | // NAME <EMAIL>:SUBJECT | 76 | // NAME <EMAIL>:SUBJECT |
77 | //qDebug("message %s ", nameemail.latin1()); | 77 | //qDebug("message %s ", nameemail.latin1()); |
78 | 78 | ||
79 | slotwriteMail2( nameemail ); | 79 | slotwriteMail2( nameemail ); |
80 | } | 80 | } |
81 | } | 81 | } |
82 | void OpieMail::slotwriteMail2(const QString& namemail ) | 82 | void OpieMail::slotwriteMail2(const QString& namemail ) |
83 | { | 83 | { |
84 | // qDebug("OpieMail::slotwriteMail2 "); | 84 | // qDebug("OpieMail::slotwriteMail2 "); |
85 | qApp->processEvents(); | 85 | qApp->processEvents(); |
86 | ComposeMail compose( settings, this, 0, true ); | 86 | ComposeMail compose( settings, this, 0, true ); |
87 | if ( !namemail.isEmpty() ) { | 87 | if ( !namemail.isEmpty() ) { |
88 | QString to = namemail; | 88 | QString to = namemail; |
89 | if ( namemail.find( " <") > 1 ) { | 89 | if ( namemail.find( " <") > 1 ) { |
90 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; | 90 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; |
91 | } else | 91 | } else |
92 | if ( namemail.find( "<") > 1 ) { | 92 | if ( namemail.find( "<") > 1 ) { |
93 | to = "\"" +to.replace( QRegExp( "<"), "\" <") ; | 93 | to = "\"" +to.replace( QRegExp( "<"), "\" <") ; |
94 | } | 94 | } |
95 | int sub = to.find( ">:"); | 95 | int sub = to.find( ">:"); |
96 | if ( sub > 0 ) { | 96 | if ( sub > 0 ) { |
97 | compose.setTo( to.left(sub+1) ); | 97 | compose.setTo( to.left(sub+1) ); |
98 | compose.setSubject( to.mid(sub+2) ); | 98 | compose.setSubject( to.mid(sub+2) ); |
99 | } else | 99 | } else |
100 | compose.setTo( to ); | 100 | compose.setTo( to ); |
101 | } | 101 | } |
102 | compose.slotAdjustColumns(); | 102 | compose.slotAdjustColumns(); |
103 | compose.showMaximized(); | 103 | compose.showMaximized(); |
104 | compose.exec(); | 104 | compose.exec(); |
105 | //qDebug("retttich "); | 105 | //qDebug("retttich "); |
106 | } | 106 | } |
107 | void OpieMail::slotwriteMail(const QString&name,const QString&email) | 107 | void OpieMail::slotwriteMail(const QString&name,const QString&email) |
108 | { | 108 | { |
109 | // qDebug("OpieMail::slotwriteMail "); | 109 | // qDebug("OpieMail::slotwriteMail "); |
110 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); | 110 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); |
111 | if (!email.isEmpty()) | 111 | if (!email.isEmpty()) |
112 | { | 112 | { |
113 | if (!name.isEmpty()) | 113 | if (!name.isEmpty()) |
114 | { | 114 | { |
115 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); | 115 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); |
116 | } | 116 | } |
117 | else | 117 | else |
118 | { | 118 | { |
119 | compose.setTo(email); | 119 | compose.setTo(email); |
120 | } | 120 | } |
121 | } | 121 | } |
122 | compose.slotAdjustColumns(); | 122 | compose.slotAdjustColumns(); |
123 | compose.showMaximized(); | 123 | compose.showMaximized(); |
124 | compose.exec(); | 124 | compose.exec(); |
125 | } | 125 | } |
126 | 126 | ||
127 | void OpieMail::slotComposeMail() | 127 | void OpieMail::slotComposeMail() |
128 | { | 128 | { |
129 | slotwriteMail2( QString () ); | 129 | slotwriteMail2( QString () ); |
130 | //slotwriteMail(0l,0l); | 130 | //slotwriteMail(0l,0l); |
131 | } | 131 | } |
132 | 132 | ||
133 | void OpieMail::slotSendQueued() | 133 | void OpieMail::slotSendQueued() |
134 | { | 134 | { |
135 | SMTPaccount *smtp = 0; | 135 | SMTPaccount *smtp = 0; |
136 | 136 | ||
137 | QList<Account> list = settings->getAccounts(); | 137 | QList<Account> list = settings->getAccounts(); |
138 | QList<SMTPaccount> smtpList; | 138 | QList<SMTPaccount> smtpList; |
139 | smtpList.setAutoDelete(false); | 139 | smtpList.setAutoDelete(false); |
140 | Account *it; | 140 | Account *it; |
141 | for ( it = list.first(); it; it = list.next() ) | 141 | for ( it = list.first(); it; it = list.next() ) |
142 | { | 142 | { |
143 | if ( it->getType() == MAILLIB::A_SMTP ) | 143 | if ( it->getType() == MAILLIB::A_SMTP ) |
144 | { | 144 | { |
145 | smtp = static_cast<SMTPaccount *>(it); | 145 | smtp = static_cast<SMTPaccount *>(it); |
146 | smtpList.append(smtp); | 146 | smtpList.append(smtp); |
147 | } | 147 | } |
148 | } | 148 | } |
149 | if (smtpList.count()==0) | 149 | if (smtpList.count()==0) |
150 | { | 150 | { |
151 | QMessageBox::information(0,tr("Info"),tr("Define a smtp account first!\n")); | 151 | QMessageBox::information(0,tr("Info"),tr("Define a smtp account first!\n")); |
152 | return; | 152 | return; |
153 | } | 153 | } |
154 | if (smtpList.count()==1) | 154 | if (smtpList.count()==1) |