author | zautrix <zautrix> | 2004-09-08 02:21:24 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-08 02:21:24 (UTC) |
commit | 6650dd66dd13498a6d28844770d9d8c291335ad4 (patch) (unidiff) | |
tree | 249b157ae88e869e7dde6f9a1d3b74d2d804aa06 /kmicromail/opiemail.cpp | |
parent | 858de54fa69a6e93072652a9cb33783ad10a9f0a (diff) | |
download | kdepimpi-6650dd66dd13498a6d28844770d9d8c291335ad4.zip kdepimpi-6650dd66dd13498a6d28844770d9d8c291335ad4.tar.gz kdepimpi-6650dd66dd13498a6d28844770d9d8c291335ad4.tar.bz2 |
Some more fixes
-rw-r--r-- | kmicromail/opiemail.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index a1c5645..0c581c0 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -2,51 +2,51 @@ | |||
2 | // CHANGED 2004-08-06 Lutz Rogowski | 2 | // CHANGED 2004-08-06 Lutz Rogowski |
3 | 3 | ||
4 | #include "settingsdialog.h" | 4 | #include "settingsdialog.h" |
5 | #include "opiemail.h" | 5 | #include "opiemail.h" |
6 | #include "editaccounts.h" | 6 | #include "editaccounts.h" |
7 | #include "composemail.h" | 7 | #include "composemail.h" |
8 | #include "mailistviewitem.h" | 8 | #include "mailistviewitem.h" |
9 | #include "viewmail.h" | 9 | #include "viewmail.h" |
10 | #include "selectstore.h" | 10 | #include "selectstore.h" |
11 | #include "selectsmtp.h" | 11 | #include "selectsmtp.h" |
12 | 12 | ||
13 | #include <qmessagebox.h> | 13 | #include <qmessagebox.h> |
14 | #include <libkdepim/externalapphandler.h> | 14 | #include <libkdepim/externalapphandler.h> |
15 | 15 | ||
16 | #include <qpe/qpeapplication.h> | 16 | #include <qpe/qpeapplication.h> |
17 | #include <libmailwrapper/smtpwrapper.h> | 17 | #include <libmailwrapper/smtpwrapper.h> |
18 | #include <libmailwrapper/mailtypes.h> | 18 | #include <libmailwrapper/mailtypes.h> |
19 | #include <libmailwrapper/abstractmail.h> | 19 | #include <libmailwrapper/abstractmail.h> |
20 | /* OPIE */ | 20 | /* OPIE */ |
21 | //#include <qpe/resource.h> | 21 | //#include <qpe/resource.h> |
22 | //#include <qpe/qpeapplication.h> | 22 | //#include <qpe/qpeapplication.h> |
23 | 23 | ||
24 | /* QT */ | 24 | /* QT */ |
25 | 25 | ||
26 | using namespace Opie::Core; | 26 | //using namespace Opie::Core; |
27 | 27 | ||
28 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) | 28 | OpieMail::OpieMail( QWidget *parent, const char *name ) |
29 | : MainWindow( parent, name) //, WStyle_ContextHelp ) | 29 | : MainWindow( parent, name) //, WStyle_ContextHelp ) |
30 | { | 30 | { |
31 | settings = new Settings(); | 31 | settings = new Settings(); |
32 | 32 | ||
33 | folderView->populate( settings->getAccounts() ); | 33 | folderView->populate( settings->getAccounts() ); |
34 | 34 | ||
35 | } | 35 | } |
36 | 36 | ||
37 | OpieMail::~OpieMail() | 37 | OpieMail::~OpieMail() |
38 | { | 38 | { |
39 | if (settings) delete settings; | 39 | if (settings) delete settings; |
40 | } | 40 | } |
41 | 41 | ||
42 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | 42 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) |
43 | { | 43 | { |
44 | 44 | ||
45 | } | 45 | } |
46 | #include <stdlib.h> | 46 | #include <stdlib.h> |
47 | void OpieMail::message(const QCString &msg, const QByteArray &data) | 47 | void OpieMail::message(const QCString &msg, const QByteArray &data) |
48 | { | 48 | { |
49 | // copied from old mail2 | 49 | // copied from old mail2 |
50 | static int ii = 0; | 50 | static int ii = 0; |
51 | qDebug("call ############################# %d ", ii); | 51 | qDebug("call ############################# %d ", ii); |
52 | // block second call | 52 | // block second call |
@@ -92,49 +92,49 @@ void OpieMail::slotwriteMail2(const QString& namemail ) | |||
92 | if ( !namemail.isEmpty() ) { | 92 | if ( !namemail.isEmpty() ) { |
93 | QString to = namemail; | 93 | QString to = namemail; |
94 | if ( namemail.find( " <") > 1 ) { | 94 | if ( namemail.find( " <") > 1 ) { |
95 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; | 95 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; |
96 | } else | 96 | } else |
97 | if ( namemail.find( "<") > 1 ) { | 97 | if ( namemail.find( "<") > 1 ) { |
98 | to = "\"" +to.replace( QRegExp( "<"), "\" <") ; | 98 | to = "\"" +to.replace( QRegExp( "<"), "\" <") ; |
99 | } | 99 | } |
100 | int sub = to.find( ">:"); | 100 | int sub = to.find( ">:"); |
101 | if ( sub > 0 ) { | 101 | if ( sub > 0 ) { |
102 | compose.setTo( to.left(sub+1) ); | 102 | compose.setTo( to.left(sub+1) ); |
103 | compose.setSubject( to.mid(sub+2) ); | 103 | compose.setSubject( to.mid(sub+2) ); |
104 | } else | 104 | } else |
105 | compose.setTo( to ); | 105 | compose.setTo( to ); |
106 | } | 106 | } |
107 | compose.slotAdjustColumns(); | 107 | compose.slotAdjustColumns(); |
108 | compose.showMaximized(); | 108 | compose.showMaximized(); |
109 | compose.exec(); | 109 | compose.exec(); |
110 | raise(); | 110 | raise(); |
111 | //qDebug("retttich "); | 111 | //qDebug("retttich "); |
112 | } | 112 | } |
113 | void OpieMail::slotwriteMail(const QString&name,const QString&email) | 113 | void OpieMail::slotwriteMail(const QString&name,const QString&email) |
114 | { | 114 | { |
115 | // qDebug("OpieMail::slotwriteMail "); | 115 | // qDebug("OpieMail::slotwriteMail "); |
116 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); | 116 | ComposeMail compose( settings, this, 0, true ); |
117 | if (!email.isEmpty()) | 117 | if (!email.isEmpty()) |
118 | { | 118 | { |
119 | if (!name.isEmpty()) | 119 | if (!name.isEmpty()) |
120 | { | 120 | { |
121 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); | 121 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); |
122 | } | 122 | } |
123 | else | 123 | else |
124 | { | 124 | { |
125 | compose.setTo(email); | 125 | compose.setTo(email); |
126 | } | 126 | } |
127 | } | 127 | } |
128 | compose.slotAdjustColumns(); | 128 | compose.slotAdjustColumns(); |
129 | compose.showMaximized(); | 129 | compose.showMaximized(); |
130 | compose.exec(); | 130 | compose.exec(); |
131 | } | 131 | } |
132 | 132 | ||
133 | void OpieMail::slotComposeMail() | 133 | void OpieMail::slotComposeMail() |
134 | { | 134 | { |
135 | slotwriteMail2( QString () ); | 135 | slotwriteMail2( QString () ); |
136 | //slotwriteMail(0l,0l); | 136 | //slotwriteMail(0l,0l); |
137 | } | 137 | } |
138 | 138 | ||
139 | void OpieMail::slotSendQueued() | 139 | void OpieMail::slotSendQueued() |
140 | { | 140 | { |
@@ -396,30 +396,30 @@ void OpieMail::slotMoveCopyAllMail() | |||
396 | targetMail = sels.currentMail(); | 396 | targetMail = sels.currentMail(); |
397 | targetFolder = sels.currentFolder(); | 397 | targetFolder = sels.currentFolder(); |
398 | if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) || | 398 | if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) || |
399 | targetFolder.isEmpty()) | 399 | targetFolder.isEmpty()) |
400 | { | 400 | { |
401 | return; | 401 | return; |
402 | } | 402 | } |
403 | if (sels.newFolder() && !targetMail->createMbox(targetFolder)) | 403 | if (sels.newFolder() && !targetMail->createMbox(targetFolder)) |
404 | { | 404 | { |
405 | QMessageBox::critical(0,tr("Error creating new Folder"), | 405 | QMessageBox::critical(0,tr("Error creating new Folder"), |
406 | tr("<center>Error while creating<br>new folder - breaking.</center>")); | 406 | tr("<center>Error while creating<br>new folder - breaking.</center>")); |
407 | return; | 407 | return; |
408 | } | 408 | } |
409 | sels.hide(); | 409 | sels.hide(); |
410 | qApp->processEvents(); | 410 | qApp->processEvents(); |
411 | //qDebug("hiding sels "); | 411 | //qDebug("hiding sels "); |
412 | mail->Wrapper()->mvcpMailList(t,targetFolder,targetMail,sels.moveMails()); | 412 | mail->Wrapper()->mvcpMailList(t,targetFolder,targetMail,sels.moveMails()); |
413 | folderView->refreshCurrent(); | 413 | folderView->refreshCurrent(); |
414 | } | 414 | } |
415 | 415 | ||
416 | void OpieMail::reEditMail() | 416 | void OpieMail::reEditMail() |
417 | { | 417 | { |
418 | if (!mailView->currentItem()) return; | 418 | if (!mailView->currentItem()) return; |
419 | 419 | ||
420 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); | 420 | ComposeMail compose( settings, this, 0, true ); |
421 | compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data()); | 421 | compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data()); |
422 | compose.slotAdjustColumns(); | 422 | compose.slotAdjustColumns(); |
423 | compose.showMaximized(); | 423 | compose.showMaximized(); |
424 | compose.exec(); | 424 | compose.exec(); |
425 | } | 425 | } |