author | zautrix <zautrix> | 2004-10-30 11:40:54 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-30 11:40:54 (UTC) |
commit | 632b43950f1ac2980c281eb8901d797deb0ba971 (patch) (unidiff) | |
tree | 72534bf865fbef61a29d5e8b2e65672c15b432c0 /kmicromail | |
parent | 0057c2a8e90346583f606491730cae819d2313ac (diff) | |
download | kdepimpi-632b43950f1ac2980c281eb8901d797deb0ba971.zip kdepimpi-632b43950f1ac2980c281eb8901d797deb0ba971.tar.gz kdepimpi-632b43950f1ac2980c281eb8901d797deb0ba971.tar.bz2 |
made ompi compiling on desktop
-rw-r--r-- | kmicromail/composemail.cpp | 13 | ||||
-rw-r--r-- | kmicromail/kmicromail.pro | 77 | ||||
-rw-r--r-- | kmicromail/libetpan/libetpan.pro | 274 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/generatemail.h | 5 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/libmailwrapper.pro | 64 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mailwrapper.h | 2 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mhwrapper.cpp | 22 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mhwrapper.h | 6 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/settings.h | 1 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 15 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.h | 2 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/storemail.h | 2 | ||||
-rw-r--r-- | kmicromail/mainwindow.cpp | 4 | ||||
-rw-r--r-- | kmicromail/mainwindow.h | 1 | ||||
-rw-r--r-- | kmicromail/opiemail.cpp | 6 | ||||
-rw-r--r-- | kmicromail/qpe/global.cpp | 12 | ||||
-rw-r--r-- | kmicromail/qpe/global.h | 12 | ||||
-rw-r--r-- | kmicromail/qpe/qpeapplication.h | 5 | ||||
-rw-r--r-- | kmicromail/viewmail.cpp | 1 |
19 files changed, 488 insertions, 36 deletions
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index 8eb6d27..0cd0b23 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp | |||
@@ -30,10 +30,10 @@ | |||
30 | #include <kabc/stdaddressbook.h> | 30 | #include <kabc/stdaddressbook.h> |
31 | #include <kabc/addressee.h> | 31 | #include <kabc/addressee.h> |
32 | #ifdef DESKTOP_VERSION | 32 | #ifdef DESKTOP_VERSION |
33 | #include <qapplication.h> | ||
33 | #include <kabc/addresseedialog.h> | 34 | #include <kabc/addresseedialog.h> |
34 | #else //DESKTOP_VERSION | ||
35 | #include <libkdepim/externalapphandler.h> | ||
36 | #endif //DESKTOP_VERSION | 35 | #endif //DESKTOP_VERSION |
36 | #include <libkdepim/externalapphandler.h> | ||
37 | 37 | ||
38 | #include "koprefs.h" | 38 | #include "koprefs.h" |
39 | 39 | ||
@@ -114,12 +114,13 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
114 | QIconSet icon; | 114 | QIconSet icon; |
115 | //icon = SmallIcon("fileexport"); | 115 | //icon = SmallIcon("fileexport"); |
116 | icon = SmallIcon("filesave"); | 116 | icon = SmallIcon("filesave"); |
117 | if ( QApplication::desktop()->width() < 320 ) | 117 | SaveButton->setIconSet (icon ) ; |
118 | if ( QApplication::desktop()->width() < 320 ) { | ||
118 | SaveButton->setText ("") ; | 119 | SaveButton->setText ("") ; |
120 | SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ; | ||
121 | } | ||
119 | else | 122 | else |
120 | SaveButton->setText (i18n("Save")) ; | 123 | SaveButton->setText (i18n("Save")); |
121 | SaveButton->setIconSet (icon ) ; | ||
122 | SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ; | ||
123 | #ifndef DESKTOP_VERSION | 124 | #ifndef DESKTOP_VERSION |
124 | QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold ); | 125 | QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold ); |
125 | QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold ); | 126 | QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold ); |
diff --git a/kmicromail/kmicromail.pro b/kmicromail/kmicromail.pro new file mode 100644 index 0000000..cd5a3c1 --- a/dev/null +++ b/kmicromail/kmicromail.pro | |||
@@ -0,0 +1,77 @@ | |||
1 | CONFIG += qt warn_on | ||
2 | TEMPLATE= app | ||
3 | HEADERS = defines.h \ | ||
4 | editaccounts.h \ | ||
5 | composemail.h \ | ||
6 | accountview.h \ | ||
7 | accountitem.h \ | ||
8 | mainwindow.h \ | ||
9 | viewmail.h \ | ||
10 | viewmailbase.h \ | ||
11 | opiemail.h \ | ||
12 | mailistviewitem.h \ | ||
13 | settingsdialog.h \ | ||
14 | statuswidget.h \ | ||
15 | newmaildir.h \ | ||
16 | selectstore.h \ | ||
17 | selectsmtp.h \ | ||
18 | nntpgroups.h \ | ||
19 | koprefs.h \ | ||
20 | koprefsdialog.h \ | ||
21 | nntpgroupsdlg.h | ||
22 | |||
23 | SOURCES = main.cpp \ | ||
24 | opiemail.cpp \ | ||
25 | mainwindow.cpp \ | ||
26 | accountview.cpp \ | ||
27 | accountitem.cpp \ | ||
28 | composemail.cpp \ | ||
29 | editaccounts.cpp \ | ||
30 | viewmail.cpp \ | ||
31 | viewmailbase.cpp \ | ||
32 | mailistviewitem.cpp \ | ||
33 | settingsdialog.cpp \ | ||
34 | statuswidget.cpp \ | ||
35 | newmaildir.cpp \ | ||
36 | selectstore.cpp \ | ||
37 | selectsmtp.cpp \ | ||
38 | nntpgroups.cpp \ | ||
39 | koprefs.cpp\ | ||
40 | koprefsdialog.cpp\ | ||
41 | nntpgroupsdlg.cpp | ||
42 | |||
43 | INTERFACES = editaccountsui.ui \ | ||
44 | selectmailtypeui.ui \ | ||
45 | imapconfigui.ui \ | ||
46 | pop3configui.ui \ | ||
47 | nntpconfigui.ui \ | ||
48 | smtpconfigui.ui \ | ||
49 | composemailui.ui \ | ||
50 | settingsdialogui.ui \ | ||
51 | statuswidgetui.ui \ | ||
52 | newmaildirui.ui \ | ||
53 | selectstoreui.ui \ | ||
54 | nntpgroupsui.ui | ||
55 | |||
56 | |||
57 | INCLUDEPATH += . .. ../libkdepim ../microkde ../microkde/kdecore libetpan/include ../microkde/kdeui | ||
58 | LIBS += -L../bin -lmicromailwrapper -lmicrolibetpan -lmicrokde -lssl -lcrypto -lmicrokdepim -lmicrokabc | ||
59 | |||
60 | DESTDIR= ../bin | ||
61 | TARGET = ompi | ||
62 | |||
63 | DEFINES += DESKTOP_VERSION | ||
64 | unix : { | ||
65 | OBJECTS_DIR = obj/unix | ||
66 | MOC_DIR = moc/unix | ||
67 | } | ||
68 | win32: { | ||
69 | DEFINES += _WIN32_ | ||
70 | LIBS += mfc71u.lib | ||
71 | QMAKE_LINK += /NODEFAULTLIB:LIBC | ||
72 | #QMAKE_LINK += /NODEFAULTLIB:MSVCRT | ||
73 | #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib | ||
74 | OBJECTS_DIR = obj/win | ||
75 | MOC_DIR = moc/win | ||
76 | } | ||
77 | |||
diff --git a/kmicromail/libetpan/libetpan.pro b/kmicromail/libetpan/libetpan.pro new file mode 100644 index 0000000..dfafa07 --- a/dev/null +++ b/kmicromail/libetpan/libetpan.pro | |||
@@ -0,0 +1,274 @@ | |||
1 | ###################################################################### | ||
2 | # Automatically generated by qmake (1.07a) Thu Jul 1 00:54:03 2004 | ||
3 | ###################################################################### | ||
4 | |||
5 | TEMPLATE = lib | ||
6 | TARGET = microlibetpan | ||
7 | |||
8 | OBJECTS_DIR = obj | ||
9 | MOC_DIR = moc | ||
10 | DESTDIR=../../bin | ||
11 | |||
12 | DEPENDPATH += generic \ | ||
13 | imap \ | ||
14 | imf \ | ||
15 | maildir \ | ||
16 | mbox \ | ||
17 | mh \ | ||
18 | mime \ | ||
19 | nntp \ | ||
20 | pop3 \ | ||
21 | smtp \ | ||
22 | tests \ | ||
23 | tools \ | ||
24 | include/libetpan | ||
25 | INCLUDEPATH += . \ | ||
26 | generic \ | ||
27 | include \ | ||
28 | tools \ | ||
29 | imf \ | ||
30 | imap \ | ||
31 | mime \ | ||
32 | maildir \ | ||
33 | mbox \ | ||
34 | mh \ | ||
35 | nntp \ | ||
36 | pop3 \ | ||
37 | smtp \ | ||
38 | tests | ||
39 | |||
40 | # Input | ||
41 | HEADERS += generic/data_message_driver.h \ | ||
42 | generic/generic_cache.h \ | ||
43 | generic/generic_cache_types.h \ | ||
44 | generic/imapdriver.h \ | ||
45 | generic/imapdriver_cached.h \ | ||
46 | generic/imapdriver_cached_message.h \ | ||
47 | generic/imapdriver_message.h \ | ||
48 | generic/imapdriver_tools.h \ | ||
49 | generic/imapdriver_types.h \ | ||
50 | generic/imapstorage.h \ | ||
51 | generic/imfcache.h \ | ||
52 | generic/libetpan.h \ | ||
53 | generic/libetpan_version.h \ | ||
54 | generic/maildirdriver.h \ | ||
55 | generic/maildirdriver_cached.h \ | ||
56 | generic/maildirdriver_cached_message.h \ | ||
57 | generic/maildirdriver_message.h \ | ||
58 | generic/maildirdriver_tools.h \ | ||
59 | generic/maildirdriver_types.h \ | ||
60 | generic/maildirstorage.h \ | ||
61 | generic/maildriver.h \ | ||
62 | generic/maildriver_errors.h \ | ||
63 | generic/maildriver_tools.h \ | ||
64 | generic/maildriver_types.h \ | ||
65 | generic/maildriver_types_helper.h \ | ||
66 | generic/mailfolder.h \ | ||
67 | generic/mailmessage.h \ | ||
68 | generic/mailmessage_tools.h \ | ||
69 | generic/mailmessage_types.h \ | ||
70 | generic/mailstorage.h \ | ||
71 | generic/mailstorage_tools.h \ | ||
72 | generic/mailstorage_types.h \ | ||
73 | generic/mailthread.h \ | ||
74 | generic/mailthread_types.h \ | ||
75 | generic/mboxdriver.h \ | ||
76 | generic/mboxdriver_cached.h \ | ||
77 | generic/mboxdriver_cached_message.h \ | ||
78 | generic/mboxdriver_message.h \ | ||
79 | generic/mboxdriver_tools.h \ | ||
80 | generic/mboxdriver_types.h \ | ||
81 | generic/mboxstorage.h \ | ||
82 | generic/mhdriver.h \ | ||
83 | generic/mhdriver_cached.h \ | ||
84 | generic/mhdriver_cached_message.h \ | ||
85 | generic/mhdriver_message.h \ | ||
86 | generic/mhdriver_tools.h \ | ||
87 | generic/mhdriver_types.h \ | ||
88 | generic/mhstorage.h \ | ||
89 | generic/mime_message_driver.h \ | ||
90 | generic/nntpdriver.h \ | ||
91 | generic/nntpdriver_cached.h \ | ||
92 | generic/nntpdriver_cached_message.h \ | ||
93 | generic/nntpdriver_message.h \ | ||
94 | generic/nntpdriver_tools.h \ | ||
95 | generic/nntpdriver_types.h \ | ||
96 | generic/nntpstorage.h \ | ||
97 | generic/pop3driver.h \ | ||
98 | generic/pop3driver_cached.h \ | ||
99 | generic/pop3driver_cached_message.h \ | ||
100 | generic/pop3driver_message.h \ | ||
101 | generic/pop3driver_tools.h \ | ||
102 | generic/pop3driver_types.h \ | ||
103 | generic/pop3storage.h \ | ||
104 | imap/mailimap.h \ | ||
105 | imap/mailimap_helper.h \ | ||
106 | imap/mailimap_keywords.h \ | ||
107 | imap/mailimap_parser.h \ | ||
108 | imap/mailimap_print.h \ | ||
109 | imap/mailimap_sender.h \ | ||
110 | imap/mailimap_socket.h \ | ||
111 | imap/mailimap_ssl.h \ | ||
112 | imap/mailimap_types.h \ | ||
113 | imap/mailimap_types_helper.h \ | ||
114 | imf/mailimf.h \ | ||
115 | imf/mailimf_types.h \ | ||
116 | imf/mailimf_types_helper.h \ | ||
117 | imf/mailimf_write.h \ | ||
118 | maildir/maildir.h \ | ||
119 | maildir/maildir_types.h \ | ||
120 | mbox/mailmbox.h \ | ||
121 | mbox/mailmbox_parse.h \ | ||
122 | mbox/mailmbox_types.h \ | ||
123 | mh/mailmh.h \ | ||
124 | mime/mailmime.h \ | ||
125 | mime/mailmime_content.h \ | ||
126 | mime/mailmime_decode.h \ | ||
127 | mime/mailmime_disposition.h \ | ||
128 | mime/mailmime_types.h \ | ||
129 | mime/mailmime_types_helper.h \ | ||
130 | mime/mailmime_write.h \ | ||
131 | nntp/newsnntp.h \ | ||
132 | nntp/newsnntp_socket.h \ | ||
133 | nntp/newsnntp_ssl.h \ | ||
134 | nntp/newsnntp_types.h \ | ||
135 | pop3/mailpop3.h \ | ||
136 | pop3/mailpop3_helper.h \ | ||
137 | pop3/mailpop3_socket.h \ | ||
138 | pop3/mailpop3_ssl.h \ | ||
139 | pop3/mailpop3_types.h \ | ||
140 | smtp/mailsmtp.h \ | ||
141 | smtp/mailsmtp_helper.h \ | ||
142 | smtp/mailsmtp_socket.h \ | ||
143 | smtp/mailsmtp_ssl.h \ | ||
144 | smtp/mailsmtp_types.h \ | ||
145 | tools/base64.h \ | ||
146 | tools/carray.h \ | ||
147 | tools/charconv.h \ | ||
148 | tools/chash.h \ | ||
149 | tools/cinthash.h \ | ||
150 | tools/clist.h \ | ||
151 | tools/connect.h \ | ||
152 | tools/hmac-md5.h \ | ||
153 | tools/mail.h \ | ||
154 | tools/mail_cache_db.h \ | ||
155 | tools/mail_cache_db_types.h \ | ||
156 | tools/maillock.h \ | ||
157 | tools/mailstream.h \ | ||
158 | tools/mailstream_helper.h \ | ||
159 | tools/mailstream_low.h \ | ||
160 | tools/mailstream_socket.h \ | ||
161 | tools/mailstream_ssl.h \ | ||
162 | tools/mailstream_types.h \ | ||
163 | tools/mapping.h \ | ||
164 | tools/md5.h \ | ||
165 | tools/md5global.h \ | ||
166 | tools/mmapstring.h \ | ||
167 | |||
168 | SOURCES += generic/data_message_driver.c \ | ||
169 | generic/generic_cache.c \ | ||
170 | generic/imapdriver.c \ | ||
171 | generic/imapdriver_cached.c \ | ||
172 | generic/imapdriver_cached_message.c \ | ||
173 | generic/imapdriver_message.c \ | ||
174 | generic/imapdriver_tools.c \ | ||
175 | generic/imapstorage.c \ | ||
176 | generic/imfcache.c \ | ||
177 | generic/libetpan_version.c \ | ||
178 | generic/maildirdriver.c \ | ||
179 | generic/maildirdriver_cached.c \ | ||
180 | generic/maildirdriver_cached_message.c \ | ||
181 | generic/maildirdriver_message.c \ | ||
182 | generic/maildirdriver_tools.c \ | ||
183 | generic/maildirstorage.c \ | ||
184 | generic/maildriver.c \ | ||
185 | generic/maildriver_tools.c \ | ||
186 | generic/maildriver_types.c \ | ||
187 | generic/maildriver_types_helper.c \ | ||
188 | generic/mailfolder.c \ | ||
189 | generic/mailmessage.c \ | ||
190 | generic/mailmessage_tools.c \ | ||
191 | generic/mailmessage_types.c \ | ||
192 | generic/mailstorage.c \ | ||
193 | generic/mailstorage_tools.c \ | ||
194 | generic/mailthread.c \ | ||
195 | generic/mailthread_types.c \ | ||
196 | generic/mboxdriver.c \ | ||
197 | generic/mboxdriver_cached.c \ | ||
198 | generic/mboxdriver_cached_message.c \ | ||
199 | generic/mboxdriver_message.c \ | ||
200 | generic/mboxdriver_tools.c \ | ||
201 | generic/mboxstorage.c \ | ||
202 | generic/mhdriver.c \ | ||
203 | generic/mhdriver_cached.c \ | ||
204 | generic/mhdriver_cached_message.c \ | ||
205 | generic/mhdriver_message.c \ | ||
206 | generic/mhdriver_tools.c \ | ||
207 | generic/mhstorage.c \ | ||
208 | generic/mime_message_driver.c \ | ||
209 | generic/nntpdriver.c \ | ||
210 | generic/nntpdriver_cached.c \ | ||
211 | generic/nntpdriver_cached_message.c \ | ||
212 | generic/nntpdriver_message.c \ | ||
213 | generic/nntpdriver_tools.c \ | ||
214 | generic/nntpstorage.c \ | ||
215 | generic/pop3driver.c \ | ||
216 | generic/pop3driver_cached.c \ | ||
217 | generic/pop3driver_cached_message.c \ | ||
218 | generic/pop3driver_message.c \ | ||
219 | generic/pop3driver_tools.c \ | ||
220 | generic/pop3storage.c \ | ||
221 | imap/mailimap.c \ | ||
222 | imap/mailimap_helper.c \ | ||
223 | imap/mailimap_keywords.c \ | ||
224 | imap/mailimap_parser.c \ | ||
225 | imap/mailimap_print.c \ | ||
226 | imap/mailimap_sender.c \ | ||
227 | imap/mailimap_socket.c \ | ||
228 | imap/mailimap_ssl.c \ | ||
229 | imap/mailimap_types.c \ | ||
230 | imap/mailimap_types_helper.c \ | ||
231 | imf/mailimf.c \ | ||
232 | imf/mailimf_types.c \ | ||
233 | imf/mailimf_types_helper.c \ | ||
234 | imf/mailimf_write.c \ | ||
235 | maildir/maildir.c \ | ||
236 | mbox/mailmbox.c \ | ||
237 | mbox/mailmbox_parse.c \ | ||
238 | mbox/mailmbox_types.c \ | ||
239 | mh/mailmh.c \ | ||
240 | mime/mailmime.c \ | ||
241 | mime/mailmime_content.c \ | ||
242 | mime/mailmime_decode.c \ | ||
243 | mime/mailmime_disposition.c \ | ||
244 | mime/mailmime_types.c \ | ||
245 | mime/mailmime_types_helper.c \ | ||
246 | mime/mailmime_write.c \ | ||
247 | nntp/newsnntp.c \ | ||
248 | nntp/newsnntp_socket.c \ | ||
249 | nntp/newsnntp_ssl.c \ | ||
250 | pop3/mailpop3.c \ | ||
251 | pop3/mailpop3_helper.c \ | ||
252 | pop3/mailpop3_socket.c \ | ||
253 | pop3/mailpop3_ssl.c \ | ||
254 | smtp/mailsmtp.c \ | ||
255 | smtp/mailsmtp_helper.c \ | ||
256 | smtp/mailsmtp_socket.c \ | ||
257 | smtp/mailsmtp_ssl.c \ | ||
258 | tools/base64.c \ | ||
259 | tools/carray.c \ | ||
260 | tools/charconv.c \ | ||
261 | tools/chash.c \ | ||
262 | tools/cinthash.c \ | ||
263 | tools/clist.c \ | ||
264 | tools/connect.c \ | ||
265 | tools/mail_cache_db.c \ | ||
266 | tools/maillock.c \ | ||
267 | tools/mailstream.c \ | ||
268 | tools/mailstream_helper.c \ | ||
269 | tools/mailstream_low.c \ | ||
270 | tools/mailstream_socket.c \ | ||
271 | tools/mailstream_ssl.c \ | ||
272 | tools/mapping.c \ | ||
273 | tools/md5.c \ | ||
274 | tools/mmapstring.c | ||
diff --git a/kmicromail/libmailwrapper/generatemail.h b/kmicromail/libmailwrapper/generatemail.h index a767b61..b9f8285 100644 --- a/kmicromail/libmailwrapper/generatemail.h +++ b/kmicromail/libmailwrapper/generatemail.h | |||
@@ -1,16 +1,17 @@ | |||
1 | #ifndef __GENERATE_MAIL_H | 1 | #ifndef __GENERATE_MAIL_H |
2 | #define __GENERATE_MAIL_H | 2 | #define __GENERATE_MAIL_H |
3 | 3 | ||
4 | #include <qpe/applnk.h> | 4 | //#include <qpe/applnk.h> |
5 | 5 | ||
6 | #include <qobject.h> | 6 | #include <qobject.h> |
7 | #include <libetpan/clist.h> | 7 | #include <libetpan/clist.h> |
8 | #include "mailwrapper.h" | ||
8 | 9 | ||
9 | #include <opie2/osmartpointer.h> | 10 | #include <opie2/osmartpointer.h> |
10 | 11 | ||
11 | class Mail; | 12 | class Mail; |
12 | class RecMail; | 13 | class RecMail; |
13 | class Attachment; | 14 | |
14 | struct mailimf_fields; | 15 | struct mailimf_fields; |
15 | struct mailimf_field; | 16 | struct mailimf_field; |
16 | struct mailimf_mailbox; | 17 | struct mailimf_mailbox; |
diff --git a/kmicromail/libmailwrapper/libmailwrapper.pro b/kmicromail/libmailwrapper/libmailwrapper.pro new file mode 100644 index 0000000..2b005d8 --- a/dev/null +++ b/kmicromail/libmailwrapper/libmailwrapper.pro | |||
@@ -0,0 +1,64 @@ | |||
1 | TEMPLATE = lib | ||
2 | CONFIG += qt warn_on | ||
3 | |||
4 | HEADERS = 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 | statusmail.h \ | ||
16 | mhwrapper.h \ | ||
17 | nntpwrapper.h \ | ||
18 | generatemail.h \ | ||
19 | storemail.h \ | ||
20 | ../qpe/global.h | ||
21 | |||
22 | SOURCES = imapwrapper.cpp \ | ||
23 | mailwrapper.cpp \ | ||
24 | mailtypes.cpp \ | ||
25 | pop3wrapper.cpp \ | ||
26 | abstractmail.cpp \ | ||
27 | smtpwrapper.cpp \ | ||
28 | genericwrapper.cpp \ | ||
29 | mboxwrapper.cpp \ | ||
30 | settings.cpp \ | ||
31 | logindialog.cpp \ | ||
32 | sendmailprogress.cpp \ | ||
33 | statusmail.cpp \ | ||
34 | mhwrapper.cpp \ | ||
35 | nntpwrapper.cpp \ | ||
36 | generatemail.cpp \ | ||
37 | storemail.cpp \ | ||
38 | ../qpe/global.cpp | ||
39 | |||
40 | INTERFACES = logindialogui.ui \ | ||
41 | sendmailprogressui.ui | ||
42 | |||
43 | INCLUDEPATH += .. ../../microkde ../../microkde/kdecore ../libetpan/include | ||
44 | LIBS += -lssl -lcrypto | ||
45 | |||
46 | #-lqpe -letpan | ||
47 | |||
48 | DESTDIR = ../../bin | ||
49 | TARGET = micromailwrapper | ||
50 | |||
51 | DEFINES += DESKTOP_VERSION | ||
52 | unix : { | ||
53 | OBJECTS_DIR = obj/unix | ||
54 | MOC_DIR = moc/unix | ||
55 | } | ||
56 | win32: { | ||
57 | DEFINES += _WIN32_ | ||
58 | LIBS += mfc71u.lib | ||
59 | QMAKE_LINK += /NODEFAULTLIB:LIBC | ||
60 | #QMAKE_LINK += /NODEFAULTLIB:MSVCRT | ||
61 | #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib | ||
62 | OBJECTS_DIR = obj/win | ||
63 | MOC_DIR = moc/win | ||
64 | } | ||
diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h index 2ba908b..88f10da 100644 --- a/kmicromail/libmailwrapper/mailwrapper.h +++ b/kmicromail/libmailwrapper/mailwrapper.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef MAILWRAPPER_H | 1 | #ifndef MAILWRAPPER_H |
2 | #define MAILWRAPPER_H | 2 | #define MAILWRAPPER_H |
3 | 3 | ||
4 | #include <qpe/applnk.h> | 4 | //#include <qpe/applnk.h> |
5 | 5 | ||
6 | #include <qbitarray.h> | 6 | #include <qbitarray.h> |
7 | #include <qdatetime.h> | 7 | #include <qdatetime.h> |
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp index f4133c0..de6d220 100644 --- a/kmicromail/libmailwrapper/mhwrapper.cpp +++ b/kmicromail/libmailwrapper/mhwrapper.cpp | |||
@@ -7,9 +7,9 @@ | |||
7 | #include <qmessagebox.h> | 7 | #include <qmessagebox.h> |
8 | #include <stdlib.h> | 8 | #include <stdlib.h> |
9 | #include <qpe/global.h> | 9 | #include <qpe/global.h> |
10 | #include <oprocess.h> | ||
11 | #include <klocale.h> | 10 | #include <klocale.h> |
12 | //#include <opie2/odebug.h> | 11 | #include <kglobal.h> |
12 | //#include <opie2/odebug.h> | ||
13 | 13 | ||
14 | using namespace Opie::Core; | 14 | using namespace Opie::Core; |
15 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) | 15 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) |
@@ -315,6 +315,9 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) | |||
315 | qDebug("error deleting mail box "); | 315 | qDebug("error deleting mail box "); |
316 | return 0; | 316 | return 0; |
317 | } | 317 | } |
318 | QString delDir = locateLocal( "apps", "kopiemail")+ "localmail"; | ||
319 | qDebug("*****************\ndel %s %s ", delDir.latin1(),tfolder->getName().latin1() ); | ||
320 | #if 0 | ||
318 | QString cmd = "rm -rf "+tfolder->getName(); | 321 | QString cmd = "rm -rf "+tfolder->getName(); |
319 | QStringList command; | 322 | QStringList command; |
320 | command << "/bin/sh"; | 323 | command << "/bin/sh"; |
@@ -322,32 +325,23 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) | |||
322 | command << cmd.latin1(); | 325 | command << cmd.latin1(); |
323 | OProcess *process = new OProcess(); | 326 | OProcess *process = new OProcess(); |
324 | 327 | ||
328 | /* | ||
325 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), | 329 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), |
326 | this, SLOT( processEnded(Opie::Core::OProcess*))); | 330 | this, SLOT( processEnded(Opie::Core::OProcess*))); |
327 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), | 331 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), |
328 | this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); | 332 | this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); |
329 | 333 | */ | |
330 | *process << command; | 334 | *process << command; |
331 | removeMboxfailed = false; | 335 | removeMboxfailed = false; |
332 | if(!process->start(OProcess::Block, OProcess::All) ) { | 336 | if(!process->start(OProcess::Block, OProcess::All) ) { |
333 | qDebug("could not start process "); | 337 | qDebug("could not start process "); |
334 | return 0; | 338 | return 0; |
335 | } | 339 | } |
340 | #endif | ||
336 | qDebug("mail box deleted "); | 341 | qDebug("mail box deleted "); |
337 | return 1; | 342 | return 1; |
338 | } | 343 | } |
339 | 344 | ||
340 | void MHwrapper::processEnded(OProcess *p) | ||
341 | { | ||
342 | if (p) delete p; | ||
343 | } | ||
344 | |||
345 | void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) | ||
346 | { | ||
347 | QString lineStr = buffer; | ||
348 | QMessageBox::warning( 0, i18n("Error"), lineStr ,i18n("Ok") ); | ||
349 | removeMboxfailed = true; | ||
350 | } | ||
351 | 345 | ||
352 | void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) | 346 | void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) |
353 | { | 347 | { |
diff --git a/kmicromail/libmailwrapper/mhwrapper.h b/kmicromail/libmailwrapper/mhwrapper.h index d1b7d1f..87f8ca1 100644 --- a/kmicromail/libmailwrapper/mhwrapper.h +++ b/kmicromail/libmailwrapper/mhwrapper.h | |||
@@ -9,8 +9,6 @@ | |||
9 | 9 | ||
10 | class encodedString; | 10 | class encodedString; |
11 | struct mailmbox_folder; | 11 | struct mailmbox_folder; |
12 | namespace Opie {namespace Core {class OProcess;}} | ||
13 | |||
14 | class MHwrapper : public Genericwrapper | 12 | class MHwrapper : public Genericwrapper |
15 | { | 13 | { |
16 | Q_OBJECT | 14 | Q_OBJECT |
@@ -45,9 +43,7 @@ public: | |||
45 | virtual Account* getAccount() { return 0; }; | 43 | virtual Account* getAccount() { return 0; }; |
46 | 44 | ||
47 | public slots: | 45 | public slots: |
48 | /* for deleting maildirs we are using a system call */ | 46 | |
49 | virtual void oprocessStderr(Opie::Core::OProcess*, char *buffer, int ); | ||
50 | virtual void processEnded(Opie::Core::OProcess *); | ||
51 | protected: | 47 | protected: |
52 | QString buildPath(const QString&p); | 48 | QString buildPath(const QString&p); |
53 | QString MHPath; | 49 | QString MHPath; |
diff --git a/kmicromail/libmailwrapper/settings.h b/kmicromail/libmailwrapper/settings.h index 61051dd..79567ef 100644 --- a/kmicromail/libmailwrapper/settings.h +++ b/kmicromail/libmailwrapper/settings.h | |||
@@ -8,6 +8,7 @@ | |||
8 | /* QT */ | 8 | /* QT */ |
9 | #include <qobject.h> | 9 | #include <qobject.h> |
10 | #include <qlist.h> | 10 | #include <qlist.h> |
11 | #include <qstringlist.h> | ||
11 | #include <qdatetime.h> | 12 | #include <qdatetime.h> |
12 | 13 | ||
13 | class Account | 14 | class Account |
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp index dee1477..eb07ef1 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.cpp +++ b/kmicromail/libmailwrapper/smtpwrapper.cpp | |||
@@ -10,11 +10,14 @@ | |||
10 | #include <qapplication.h> | 10 | #include <qapplication.h> |
11 | #include <qmessagebox.h> | 11 | #include <qmessagebox.h> |
12 | #include <stdlib.h> | 12 | #include <stdlib.h> |
13 | #include <qpe/config.h> | 13 | #ifndef DESKTOP_VERSION |
14 | //#include <qpe/config.h> | ||
14 | #include <qpe/qcopenvelope_qws.h> | 15 | #include <qpe/qcopenvelope_qws.h> |
15 | 16 | #endif | |
16 | #include <libetpan/libetpan.h> | 17 | #include <libetpan/libetpan.h> |
17 | #include <klocale.h> | 18 | #include <klocale.h> |
19 | #include <kglobal.h> | ||
20 | #include <kconfig.h> | ||
18 | 21 | ||
19 | 22 | ||
20 | using namespace Opie::Core; | 23 | using namespace Opie::Core; |
@@ -24,7 +27,7 @@ SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) | |||
24 | : Generatemail() | 27 | : Generatemail() |
25 | { | 28 | { |
26 | m_SmtpAccount = aSmtp; | 29 | m_SmtpAccount = aSmtp; |
27 | Config cfg( "mail" ); | 30 | KConfig cfg( locateLocal("config", "kopiemail" ) ); |
28 | cfg.setGroup( "Status" ); | 31 | cfg.setGroup( "Status" ); |
29 | m_queuedMail = cfg.readNumEntry( "outgoing", 0 ); | 32 | m_queuedMail = cfg.readNumEntry( "outgoing", 0 ); |
30 | emit queuedMails( m_queuedMail ); | 33 | emit queuedMails( m_queuedMail ); |
@@ -38,8 +41,10 @@ SMTPwrapper::~SMTPwrapper() | |||
38 | } | 41 | } |
39 | 42 | ||
40 | void SMTPwrapper::emitQCop( int queued ) { | 43 | void SMTPwrapper::emitQCop( int queued ) { |
44 | #ifndef DESKTOP_VERSION | ||
41 | QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); | 45 | QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); |
42 | env << queued; | 46 | env << queued; |
47 | #endif | ||
43 | } | 48 | } |
44 | 49 | ||
45 | QString SMTPwrapper::mailsmtpError( int errnum ) { | 50 | QString SMTPwrapper::mailsmtpError( int errnum ) { |
@@ -127,7 +132,7 @@ bool SMTPwrapper::smtpSend( mailmime *mail,bool later) { | |||
127 | storeMail(data,size,"Outgoing"); | 132 | storeMail(data,size,"Outgoing"); |
128 | if (data) | 133 | if (data) |
129 | free( data ); | 134 | free( data ); |
130 | Config cfg( "mail" ); | 135 | KConfig cfg( locateLocal("config", "kopiemail" ) ); |
131 | cfg.setGroup( "Status" ); | 136 | cfg.setGroup( "Status" ); |
132 | cfg.writeEntry( "outgoing", ++m_queuedMail ); | 137 | cfg.writeEntry( "outgoing", ++m_queuedMail ); |
133 | emit queuedMails( m_queuedMail ); | 138 | emit queuedMails( m_queuedMail ); |
@@ -447,7 +452,7 @@ bool SMTPwrapper::flushOutbox() { | |||
447 | m_SmtpAccount->setUser(oldUser); | 452 | m_SmtpAccount->setUser(oldUser); |
448 | m_SmtpAccount->setPassword(oldPw); | 453 | m_SmtpAccount->setPassword(oldPw); |
449 | } | 454 | } |
450 | Config cfg( "mail" ); | 455 | KConfig cfg( locateLocal("config", "kopiemail" ) ); |
451 | cfg.setGroup( "Status" ); | 456 | cfg.setGroup( "Status" ); |
452 | m_queuedMail = 0; | 457 | m_queuedMail = 0; |
453 | cfg.writeEntry( "outgoing", m_queuedMail ); | 458 | cfg.writeEntry( "outgoing", m_queuedMail ); |
diff --git a/kmicromail/libmailwrapper/smtpwrapper.h b/kmicromail/libmailwrapper/smtpwrapper.h index ec42b56..bdca000 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.h +++ b/kmicromail/libmailwrapper/smtpwrapper.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #ifndef SMTPwrapper_H | 2 | #ifndef SMTPwrapper_H |
3 | #define SMTPwrapper_H | 3 | #define SMTPwrapper_H |
4 | 4 | ||
5 | #include <qpe/applnk.h> | 5 | //#include <qpe/applnk.h> |
6 | 6 | ||
7 | #include <qbitarray.h> | 7 | #include <qbitarray.h> |
8 | #include <qdatetime.h> | 8 | #include <qdatetime.h> |
diff --git a/kmicromail/libmailwrapper/storemail.h b/kmicromail/libmailwrapper/storemail.h index 4433de0..e449f57 100644 --- a/kmicromail/libmailwrapper/storemail.h +++ b/kmicromail/libmailwrapper/storemail.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __STORE_MAIL_H | 1 | #ifndef __STORE_MAIL_H |
2 | #define __STORE_MAIL_H | 2 | #define __STORE_MAIL_H |
3 | 3 | ||
4 | #include <qpe/applnk.h> | 4 | //#include <qpe/applnk.h> |
5 | 5 | ||
6 | #include "generatemail.h" | 6 | #include "generatemail.h" |
7 | 7 | ||
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index c77345b..b19dbbe 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -9,7 +9,9 @@ | |||
9 | #include <kiconloader.h> | 9 | #include <kiconloader.h> |
10 | #include <kapplication.h> | 10 | #include <kapplication.h> |
11 | 11 | ||
12 | #ifndef DESKTOP_VERSION | 12 | #ifdef DESKTOP_VERSION |
13 | #include <qapplication.h> | ||
14 | #else | ||
13 | #include <qpe/qpeapplication.h> | 15 | #include <qpe/qpeapplication.h> |
14 | #endif | 16 | #endif |
15 | #include "defines.h" | 17 | #include "defines.h" |
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h index 35b9c8c..f5ab69b 100644 --- a/kmicromail/mainwindow.h +++ b/kmicromail/mainwindow.h | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <qtoolbar.h> | 10 | #include <qtoolbar.h> |
11 | #ifdef DESKTOP_VERSION | 11 | #ifdef DESKTOP_VERSION |
12 | #include <qmenubar.h> | 12 | #include <qmenubar.h> |
13 | #define QPEMenuBar QMenuBar | ||
13 | #else | 14 | #else |
14 | #include <qpe/qpemenubar.h> | 15 | #include <qpe/qpemenubar.h> |
15 | #endif | 16 | #endif |
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index a32983c..153c7c0 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -15,10 +15,16 @@ | |||
15 | 15 | ||
16 | #include <qmessagebox.h> | 16 | #include <qmessagebox.h> |
17 | #include <qtimer.h> | 17 | #include <qtimer.h> |
18 | #include <qcursor.h> | ||
19 | #include <qregexp.h> | ||
18 | #include <libkdepim/externalapphandler.h> | 20 | #include <libkdepim/externalapphandler.h> |
19 | #include <libkdepim/kpimglobalprefs.h> | 21 | #include <libkdepim/kpimglobalprefs.h> |
20 | 22 | ||
23 | #ifdef DESKTOP_VERSION | ||
24 | #include <qapplication.h> | ||
25 | #else | ||
21 | #include <qpe/qpeapplication.h> | 26 | #include <qpe/qpeapplication.h> |
27 | #endif | ||
22 | #include <libmailwrapper/smtpwrapper.h> | 28 | #include <libmailwrapper/smtpwrapper.h> |
23 | #include <libmailwrapper/mailtypes.h> | 29 | #include <libmailwrapper/mailtypes.h> |
24 | #include <libmailwrapper/abstractmail.h> | 30 | #include <libmailwrapper/abstractmail.h> |
diff --git a/kmicromail/qpe/global.cpp b/kmicromail/qpe/global.cpp new file mode 100644 index 0000000..f4c6f60 --- a/dev/null +++ b/kmicromail/qpe/global.cpp | |||
@@ -0,0 +1,12 @@ | |||
1 | |||
2 | #include "global.h" | ||
3 | |||
4 | namespace Global{ | ||
5 | |||
6 | void statusMessage(QString message) | ||
7 | { | ||
8 | |||
9 | qDebug("statusMessage %s ", message.latin1()); | ||
10 | } | ||
11 | } | ||
12 | |||
diff --git a/kmicromail/qpe/global.h b/kmicromail/qpe/global.h new file mode 100644 index 0000000..ecc5b1b --- a/dev/null +++ b/kmicromail/qpe/global.h | |||
@@ -0,0 +1,12 @@ | |||
1 | #ifndef __GLOBAL_H__ | ||
2 | #define __GLOBAL_H__ | ||
3 | |||
4 | #include <qstring.h> | ||
5 | |||
6 | namespace Global{ | ||
7 | |||
8 | void statusMessage(QString message); | ||
9 | |||
10 | } | ||
11 | |||
12 | #endif | ||
diff --git a/kmicromail/qpe/qpeapplication.h b/kmicromail/qpe/qpeapplication.h new file mode 100644 index 0000000..0eadfd1 --- a/dev/null +++ b/kmicromail/qpe/qpeapplication.h | |||
@@ -0,0 +1,5 @@ | |||
1 | |||
2 | #include <qapplication.h> | ||
3 | #include <qcursor.h> | ||
4 | #include <qregexp.h> | ||
5 | |||
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp index 7cf5c8e..0b4c322 100644 --- a/kmicromail/viewmail.cpp +++ b/kmicromail/viewmail.cpp | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | #include "koprefs.h" | 28 | #include "koprefs.h" |
29 | #include <klocale.h> | 29 | #include <klocale.h> |
30 | #include <kglobal.h> | ||
30 | 31 | ||
31 | //using namespace Opie::Ui; | 32 | //using namespace Opie::Ui; |
32 | //using namespace Opie::Core; | 33 | //using namespace Opie::Core; |